Make BLE PIDs larger by 0x8000 than USB PIDs.

device/Kconfig

@@ -17,3 +17,9 @@ config KEYBOARD_MAX_SCANCODE
         The default is set so Android devices (which don't exchange the MTU from the default 23)
         still receive the "NKRO" report layout. If a higher scancode is used, the report size will exceed this size,
         causing a fallback to 6KRO report layout on Android.
+
+config USB_PID
+    hex "USB product ID"
+    range 0x0000 0xFFFF
+    help
+        The USB product ID is used to identify the specific UHK device.

device/prj.conf.overlays/uhk-80-left.prj.conf

@@ -11,4 +11,5 @@ CONFIG_SHELL_PROMPT_UART="uhk80:left$ "
 CONFIG_SHELL_PROMPT_RTT="uhk80:left$ "
 
 CONFIG_BT_DIS_MODEL="UHK 80 left half"
-CONFIG_BT_DIS_PNP_PID=0x0007
+CONFIG_BT_DIS_PNP_PID=0x8007
+CONFIG_USB_PID=0x0007

device/prj.conf.overlays/uhk-80-right.prj.conf

@@ -15,4 +15,5 @@ CONFIG_SHELL_PROMPT_UART="uhk80:right$ "
 CONFIG_SHELL_PROMPT_RTT="uhk80:right$ "
 
 CONFIG_BT_DIS_MODEL="UHK 80 right half"
-CONFIG_BT_DIS_PNP_PID=0x0009
+CONFIG_BT_DIS_PNP_PID=0x8009
+CONFIG_USB_PID=0x0009

device/prj.conf.overlays/uhk-dongle.prj.conf

@@ -8,4 +8,5 @@ CONFIG_SHELL_PROMPT_UART="uhk-dongle$ "
 CONFIG_SHELL_PROMPT_RTT="uhk-dongle$ "
 
 CONFIG_BT_DIS_MODEL="UHK dongle"
-CONFIG_BT_DIS_PNP_PID=0x0005
+CONFIG_BT_DIS_PNP_PID=0x8005
+CONFIG_USB_PID=0x0005

device/src/usb/usb.cpp

@@ -40,7 +40,7 @@ static_assert(CONFIG_BT_DIS_PNP_VID_SRC == 2);
 uint8_t UsbSerialNumber[5];
 
 constexpr usb::product_info product_info{CONFIG_BT_DIS_PNP_VID, CONFIG_BT_DIS_MANUF,
-    CONFIG_BT_DIS_PNP_PID, CONFIG_BT_DIS_MODEL,
+    CONFIG_USB_PID, CONFIG_BT_DIS_MODEL,
     usb::version(CONFIG_BT_DIS_PNP_VER >> 8, CONFIG_BT_DIS_PNP_VER), UsbSerialNumber};
 
 template <typename... Args>

right/Makefile

@@ -36,7 +36,7 @@ CPU = -mcpu=cortex-m4
 FPU = -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 
 # Command for flashing the right half of the keyboard.
-FLASH_CMD = ../../lib/agent/node_modules/.bin/tsx ../../lib/agent/packages/usb/update-device-firmware.ts $(PROJECT_OBJ:.axf=.hex)
+FLASH_CMD = ../../lib/agent/node_modules/.bin/tsx ../../lib/agent/packages/usb/update-device-firmware.ts --vid=14248 --pid=$(DEVICE_PID) --usb-interface=4 $(PROJECT_OBJ:.axf=.hex)
 
 # Path to the JLink script used for the right half.
 JLINK_SCRIPT = ../../scripts/flash-right.jlink

right/src/config_parser/parse_config.c

@@ -38,7 +38,8 @@ void readRgbColor(config_buffer_t *buffer, rgb_t* keyActionColors, key_action_co
     color->blue = ReadUInt8(buffer);
 }
 
-parser_error_t ParseConfig(config_buffer_t *buffer)
+
+parser_error_t parseConfig(config_buffer_t *buffer)
 {
     // Miscellaneous properties
 
@@ -338,3 +339,13 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
 
     return ParserError_Success;
 }
+
+
+parser_error_t ParseConfig(config_buffer_t *buffer) {
+    version_t oldModelVersion = DataModelVersion;
+    parser_error_t errorCode = parseConfig(buffer);
+    if (errorCode != ParserError_Success || ParserRunDry) {
+        DataModelVersion = oldModelVersion;
+    }
+    return errorCode;
+}

right/uhk60v1/Makefile

@@ -1,3 +1,4 @@
 PROJECT_NAME = uhk60v1
 DEVICE_ID = DEVICE_ID_UHK60V1
+DEVICE_PID = 1
 include ../Makefile

right/uhk60v2/Makefile

@@ -1,3 +1,4 @@
 PROJECT_NAME = uhk60v2
 DEVICE_ID = DEVICE_ID_UHK60V2
+DEVICE_PID = 3
 include ../Makefile