diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 000000000..6b6114114 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/firmware-bruce.slnx/FileContentIndex/86a2a2a8-207a-438d-9380-fe51cb081ac6.vsidx b/.vs/firmware-bruce.slnx/FileContentIndex/86a2a2a8-207a-438d-9380-fe51cb081ac6.vsidx new file mode 100644 index 000000000..c403b3fcd Binary files /dev/null and b/.vs/firmware-bruce.slnx/FileContentIndex/86a2a2a8-207a-438d-9380-fe51cb081ac6.vsidx differ diff --git a/.vs/firmware-bruce.slnx/FileContentIndex/f61f9d04-26e6-4adf-a42a-4651e90c499b.vsidx b/.vs/firmware-bruce.slnx/FileContentIndex/f61f9d04-26e6-4adf-a42a-4651e90c499b.vsidx new file mode 100644 index 000000000..48cded610 Binary files /dev/null and b/.vs/firmware-bruce.slnx/FileContentIndex/f61f9d04-26e6-4adf-a42a-4651e90c499b.vsidx differ diff --git a/.vs/firmware-bruce.slnx/v18/.wsuo b/.vs/firmware-bruce.slnx/v18/.wsuo new file mode 100644 index 000000000..6a095d908 Binary files /dev/null and b/.vs/firmware-bruce.slnx/v18/.wsuo differ diff --git a/.vs/firmware-bruce.slnx/v18/DocumentLayout.backup.json b/.vs/firmware-bruce.slnx/v18/DocumentLayout.backup.json new file mode 100644 index 000000000..c6a963f8e --- /dev/null +++ b/.vs/firmware-bruce.slnx/v18/DocumentLayout.backup.json @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\Dontay\\firmware-bruce\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git a/.vs/firmware-bruce.slnx/v18/DocumentLayout.json b/.vs/firmware-bruce.slnx/v18/DocumentLayout.json new file mode 100644 index 000000000..c6a963f8e --- /dev/null +++ b/.vs/firmware-bruce.slnx/v18/DocumentLayout.json @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\Dontay\\firmware-bruce\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git a/.vs/firmware-bruce/v18/workspaceFileList.bin b/.vs/firmware-bruce/v18/workspaceFileList.bin new file mode 100644 index 000000000..76da25bba Binary files /dev/null and b/.vs/firmware-bruce/v18/workspaceFileList.bin differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 000000000..6ebd805d6 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/boards/lilygo-t-embed-cc1101/lilygo-t-embed-cc1101.ini b/boards/lilygo-t-embed-cc1101/lilygo-t-embed-cc1101.ini index afda9124b..2a554df61 100644 --- a/boards/lilygo-t-embed-cc1101/lilygo-t-embed-cc1101.ini +++ b/boards/lilygo-t-embed-cc1101/lilygo-t-embed-cc1101.ini @@ -10,6 +10,8 @@ build_flags = -O2 -DMIC_SPM1423 -DCORE_DEBUG_LEVEL=1 + -DARDUINO_USB_MODE=0 + -DARDUINO_USB_CDC_ON_BOOT=0 -DRF_TX_PINS='{{"Pin 43", 43}, {"Pin 44", 44}}' -DRF_RX_PINS='{{"Pin 43", 43}, {"Pin 44", 44}}' diff --git a/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp b/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp index 71117c681..8c7a650ae 100644 --- a/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp +++ b/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp @@ -39,7 +39,7 @@ static const uint8_t report_descriptor[] = { }; USBHIDKeyboard::USBHIDKeyboard() - : hid(HID_ITF_PROTOCOL_KEYBOARD), _asciimap(KeyboardLayout_en_US), shiftKeyReports(false), + : hid(HID_ITF_PROTOCOL_NONE), _asciimap(KeyboardLayout_en_US), shiftKeyReports(false), _cacheValid(false) { static bool initialized = false; if (!initialized) { @@ -254,3 +254,4 @@ void USBHIDKeyboard::_buildShiftCache() { } #endif /* CONFIG_TINYUSB_HID_ENABLED */ + diff --git a/platformio.ini b/platformio.ini index 16dd3ec4f..8ca5101dd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,9 +10,10 @@ [platformio] default_envs = - ;m5stack-cardputer + + ;m5stack-cardputer ;m5stack-sticks3 - m5stack-cplus2 + ;m5stack-cplus2 ;m5stack-cplus1_1 ;LAUNCHER_m5stack-cplus1_1 ;m5stack-core2 @@ -33,7 +34,7 @@ default_envs = ;LAUNCHER_CYD-2432W328C ;LAUNCHER_CYD-3248S035R ;LAUNCHER_CYD-3248S035C - ;lilygo-t-embed-cc1101 + lilygo-t-embed-cc1101 ;lilygo-t-embed ;lilygo-t-deck ;lilygo-t-watch-s3 @@ -83,8 +84,8 @@ platform = https://github.com/pioarduino/platform-espressif32/releases/download/ ;https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip ; Arduino 3.3.4 ;https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip ; Last Version platform_packages = - framework-arduinoespressif32-libs @ https://github.com/bmorcelli/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/bruce_esp32-arduino-libs-20260123-153546.zip ; Arduino 3.3.6 - ;framework-arduinoespressif32-libs @ https://github.com/bmorcelli/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/bruce_esp32-arduino-libs-20251205-131242.zip ; Arduino 3.3.4 + ;framework-arduinoespressif32-libs @ https://github.com/bmorcelli/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/bruce_esp32-arduino-libs-20260123-153546.zip ; Arduino 3.3.6 + framework-arduinoespressif32-libs @ https://github.com/bmorcelli/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/bruce_esp32-arduino-libs-20251205-131242.zip ; Arduino 3.3.4 ;framework-arduinoespressif32-libs @ https://github.com/bmorcelli/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-20250919-170356.zip ; Arduino 3.3.1 monitor_filters = esp32_exception_decoder, send_on_enter, colorize diff --git a/src/modules/others/u2f.cpp b/src/modules/others/u2f.cpp index 627ca8cd5..23059d9cb 100644 --- a/src/modules/others/u2f.cpp +++ b/src/modules/others/u2f.cpp @@ -79,6 +79,7 @@ static const uint8_t U2F_REPORT_DESCRIPTOR[] = { 0x06, 0xD0, 0xF1, // USAGE_PAGE (FIDO Alliance) 0x09, 0x01, // USAGE (U2F Authenticator Device) 0xA1, 0x01, // COLLECTION (Application) + 0x85, 0x06, // REPORT_ID (6) 0x09, 0x20, // USAGE (Input Report Data) 0x15, 0x00, // LOGICAL_MINIMUM (0) 0x26, 0xFF, 0x00, // LOGICAL_MAXIMUM (255) @@ -1718,3 +1719,4 @@ void u2f_setup() { void u2f_setup() { displayError("USB HID disabled"); } #endif +