Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Chameleon Lite PID to 0x8787 #103

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...

## [unreleased][unreleased]
- Changed Chameleon Lite PID to `0x8787` (@Foxushka)
- Security BLE implemented (@xianglin1998)
- Added `hw settings blekey` to get and set ble connect key (@xianglin1998)
- Added `hw ble bonds clear` to delete all ble bonds (@xianglin1998)
Expand Down
2 changes: 1 addition & 1 deletion firmware/application/src/sdk_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions firmware/common/device_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion resource/tools/enter_dfu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions software/script/chameleon_cli_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+ |"
Expand Down
Loading