webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-18 20:35:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix when setting options and taking VIDPID values.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-06-21 22:07:28 +02:00
parent f8480291fe
commit 246ed5cf19
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fs/file.h
View File

@@ -76,6 +76,11 @@
#define PHY_OPTS 0x6 #define PHY_OPTS 0x6
#define PHY_OPT_WCID 0x1 #define PHY_OPT_WCID 0x1
#define PHY_OPT_VPID 0x2
#define PHY_OPT_GPIO 0x4
#define PHY_OPT_LED 0x8
#define PHY_OPT_MASK 0x1
#define PHY_MAX_SIZE 8 #define PHY_MAX_SIZE 8

2
src/main.c
View File

@@ -432,8 +432,10 @@ int main(void) {
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
uint8_t gpio = GPIO_NUM_48; uint8_t gpio = GPIO_NUM_48;
if (file_has_data(ef_phy)) { if (file_has_data(ef_phy)) {
if (file_read_uint8_offset(ef_phy, PHY_OPTS + 1) & PHY_OPT_GPIO) {
gpio = file_get_data(ef_phy)[PHY_LED_GPIO]; gpio = file_get_data(ef_phy)[PHY_LED_GPIO];
} }
}
neopixel = neopixel_Init(1, gpio); neopixel = neopixel_Init(1, gpio);
#endif #endif

11
src/usb/usb.c
View File

@@ -169,16 +169,17 @@ void usb_init() {
uint16_t usb_vid = USB_VID, usb_pid = USB_PID; uint16_t usb_vid = USB_VID, usb_pid = USB_PID;
if (file_has_data(ef_phy)) { if (file_has_data(ef_phy)) {
uint8_t *data = file_get_data(ef_phy); uint8_t *data = file_get_data(ef_phy);
if (file_get_size(ef_phy) >= 4) { uint16_t opts = 0;
usb_vid = (data[PHY_VID] << 8) | data[PHY_VID+1];
usb_pid = (data[PHY_PID] << 8) | data[PHY_PID+1];
}
if (file_get_size(ef_phy) >= 8) { if (file_get_size(ef_phy) >= 8) {
uint16_t opts = (data[PHY_OPTS] << 8) | data[PHY_OPTS+1]; opts = (data[PHY_OPTS] << 8) | data[PHY_OPTS+1];
if (opts & PHY_OPT_WCID) { if (opts & PHY_OPT_WCID) {
enable_wcid = true; enable_wcid = true;
} }
} }
if (file_get_size(ef_phy) >= 4 && opts & PHY_OPT_VPID) {
usb_vid = (data[PHY_VID] << 8) | data[PHY_VID+1];
usb_pid = (data[PHY_PID] << 8) | data[PHY_PID+1];
}
} }
desc_device.idVendor = usb_vid; desc_device.idVendor = usb_vid;
desc_device.idProduct = usb_pid; desc_device.idProduct = usb_pid;