GPII-771: two more device configurations

New lines for two additional device configurations; see https://github.com/cstrobbe/universal/tree/patch-2 and https://github.com/cstrobbe/universal/tree/patch-3.