Change Chameleon Lite PID to 0x8787

Foxushka · Aug 27, 2023 · df1e876 · df1e876
1 parent ae6df05
commit df1e876
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/firmware/application/src/sdk_config.h b/firmware/application/src/sdk_config.h
@@ -6420,7 +6420,7 @@
 // <i> Selected Product ID
 
 #ifndef APP_USBD_PID
-#define APP_USBD_PID 0x8686
+#define APP_USBD_PID DEVICE_PID
 #endif
 
 // <o> APP_USBD_DEVICE_VER_MAJOR - Major device version  <0-99>

diff --git a/firmware/common/device_info.h b/firmware/common/device_info.h
@@ -5,9 +5,11 @@
 #if defined(PROJECT_CHAMELEON_ULTRA)
 #define DEVICE_NAME_STR         "ChameleonUltra"
 #define DEVICE_NAME_STR_SHORT   "CU"
+#define DEVICE_PID              0x8686
 #elif defined(PROJECT_CHAMELEON_LITE)
 #define DEVICE_NAME_STR         "ChameleonLite"
 #define DEVICE_NAME_STR_SHORT   "CL"
+#define DEVICE_PID              0x8787
 #else
 #error "Unknown device name?"
 #endif

diff --git a/resource/driver/79-chameleon-usb-device-blacklist-dialout.rules b/resource/driver/79-chameleon-usb-device-blacklist-dialout.rules
@@ -11,8 +11,10 @@ ACTION!="add|change", GOTO="chameleon_usb_device_blacklist_end"
 SUBSYSTEM!="tty", GOTO="chameleon_ignore"
 
 ATTRS{idVendor}=="6868" ATTRS{idProduct}=="8686", ENV{ID_MM_DEVICE_IGNORE}="1" SYMLINK+="ultra-%n" MODE="660" GROUP="dialout"
+ATTRS{idVendor}=="6868" ATTRS{idProduct}=="8787", ENV{ID_MM_DEVICE_IGNORE}="1" SYMLINK+="lite-%n" MODE="660" GROUP="dialout"
+
 
 LABEL="chameleon_ignore"
 ATTRS{idVendor}=="2d2d" ATTRS{idProduct}=="504d", ENV{ID_MM_DEVICE_IGNORE}="1"
 
-LABEL="chameleon_usb_device_blacklist_end"
+LABEL="chameleon_usb_device_blacklist_end"
diff --git a/resource/tools/enter_dfu.py b/resource/tools/enter_dfu.py
@@ -10,7 +10,7 @@
     if comport.vid == 0x1915 and comport.pid == 0x521f:
         print("Chameleon already in DFU mode")
         exit(0)
-    if comport.vid == 0x6868 and comport.pid == 0x8686:
+    if comport.vid == 0x6868 and (comport.pid == 0x8686 or comport.pid == 0x8787):
         port = comport.device
         break
 

diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py
@@ -210,10 +210,10 @@ def on_exec(self, args: argparse.Namespace):
                             break
                     if PSHEXE:
                         # process = subprocess.Popen([PSHEXE,"Get-CimInstance -ClassName Win32_serialport |"
-                        # " Where-Object {$_.PNPDeviceID -like '*VID_6868&PID_8686*'} |"
+                        # " Where-Object {$_.PNPDeviceID -like '*VID_6868&PID_*'} |"
                         # " Select -expandproperty DeviceID"],stdout=subprocess.PIPE);
                         process = subprocess.Popen([PSHEXE, "Get-PnPDevice -Class Ports -PresentOnly |"
-                                                    " where {$_.DeviceID -like '*VID_6868&PID_8686*'} |"
+                                                    " where {$_.DeviceID -like '*VID_6868&PID_*'} |"
                                                     " Select-Object -First 1 FriendlyName |"
                                                     " % FriendlyName |"
                                                     " select-string COM\d+ |"