Merge branch 'main' of github.com:OrbTools/OrbCommon

devices/orbweaver/orbweaver.go

@@ -60,22 +60,22 @@ var GUI = &gui.GUI{
 					KeyName: "13",
 				}, {
 					KeyID:   13,
-					KeyName: "11",
+					KeyName: "14",
 				}, {
 					KeyID:   14,
-					KeyName: "11",
+					KeyName: "15",
 				}, {
 					KeyID:   15,
-					KeyName: "11",
+					KeyName: "16",
 				}, {
 					KeyID:   16,
-					KeyName: "11",
+					KeyName: "17",
 				}, {
 					KeyID:   17,
-					KeyName: "11",
+					KeyName: "18",
 				}, {
 					KeyID:   18,
-					KeyName: "11",
+					KeyName: "19",
 				}, {
 					KeyID:   19,
 					KeyName: "20",

hid/generator/gen.go

@@ -58,11 +58,21 @@ func main() {
 			Mac:   uint16(M),
 			Code:  string(bar[6]),
 		}
-		KeyMaps.Usb[uint16(U)] = Keys
-		KeyMaps.Evdev[uint16(E)] = Keys
-		KeyMaps.Xkb[uint16(X)] = Keys
-		KeyMaps.Win[uint16(W)] = Keys
-		KeyMaps.Mac[uint16(M)] = Keys
+		if _, ok := KeyMaps.Usb[uint16(U)]; !ok {
+			KeyMaps.Usb[uint16(U)] = Keys
+		}
+		if _, ok := KeyMaps.Evdev[uint16(E)]; !ok {
+			KeyMaps.Evdev[uint16(E)] = Keys
+		}
+		if _, ok := KeyMaps.Xkb[uint16(X)]; !ok {
+			KeyMaps.Xkb[uint16(X)] = Keys
+		}
+		if _, ok := KeyMaps.Win[uint16(W)]; !ok {
+			KeyMaps.Win[uint16(W)] = Keys
+		}
+		if _, ok := KeyMaps.Mac[uint16(M)]; !ok {
+			KeyMaps.Mac[uint16(M)] = Keys
+		}
 		KeyMaps.Code[string(bar[6])] = Keys
 		Arr = append(Arr, Keys)
 	}