-
Notifications
You must be signed in to change notification settings - Fork 782
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix/keyboard_bug_fix' into 'master'
feat(keyboard): upgrade version to v0.2.0 Closes AEG-1823 See merge request ae_group/esp-iot-solution!1063
- Loading branch information
Showing
12 changed files
with
172 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,26 @@ | ||
menu "ESP KeyBoard Example" | ||
|
||
config TUSB_VID | ||
hex "USB Device VID" | ||
default 0x303A | ||
config TUSB_PID | ||
hex "USB Device PID" | ||
default 0x8000 | ||
config TUSB_MANUFACTURER | ||
string "USB Device Manufacture" | ||
default "Espressif" | ||
config TUSB_PRODUCT | ||
string "Product Name" | ||
default "HID Demo" | ||
menu "USB Configuration" | ||
config TUSB_VID | ||
hex "USB Device VID" | ||
default 0x303A | ||
config TUSB_PID | ||
hex "USB Device PID" | ||
default 0x8000 | ||
config TUSB_MANUFACTURER | ||
string "USB Device Manufacture" | ||
default "Espressif" | ||
config TUSB_PRODUCT | ||
string "Product Name" | ||
default "HID Demo" | ||
endmenu | ||
|
||
menu "Wireless Configuration" | ||
config LIGHT_SLEEP_TIMEOUT_MS | ||
int "Light Sleep Timeout" | ||
default 60000 | ||
help | ||
"Time to enter light sleep mode and close all light when no key is pressed" | ||
endmenu | ||
|
||
endmenu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
version: 0.2.0 | ||
dependencies: | ||
idf: ">=5.2" | ||
espressif/tinyusb: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,46 @@ | ||
# This file was generated using idf.py save-defconfig. It can be edited manually. | ||
# Espressif IoT Development Framework (ESP-IDF) 5.2.1 Project Minimal Configuration | ||
# Espressif IoT Development Framework (ESP-IDF) 5.2.2 Project Minimal Configuration | ||
# | ||
CONFIG_IDF_TARGET="esp32s3" | ||
CONFIG_BT_ENABLED=y | ||
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y | ||
CONFIG_BT_CTRL_MODEM_SLEEP=y | ||
CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP=y | ||
CONFIG_ESP_PHY_MAC_BB_PD=y | ||
CONFIG_PM_ENABLE=y | ||
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y | ||
CONFIG_FREERTOS_HZ=1000 | ||
CONFIG_FREERTOS_USE_TICKLESS_IDLE=y | ||
CONFIG_MATRIX_ROWS=6 | ||
CONFIG_MATRIX_COLS=15 | ||
CONFIG_MATRIX_LED_COUNT=82 | ||
CONFIG_ENABLE_RGB_MATRIX_TYPING_HEATMAP=y | ||
CONFIG_ENABLE_RGB_MATRIX_DIGITAL_RAIN=y | ||
CONFIG_ENABLE_RGB_MATRIX_SPLASH=y | ||
CONFIG_ENABLE_RGB_MATRIX_MULTISPLASH=y | ||
CONFIG_ENABLE_RGB_MATRIX_SOLID_SPLASH=y | ||
CONFIG_ENABLE_RGB_MATRIX_SOLID_MULTISPLASH=y | ||
CONFIG_ENABLE_RGB_MATRIX_BREATHING=y | ||
CONFIG_ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT=y | ||
CONFIG_ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL=y | ||
CONFIG_ENABLE_RGB_MATRIX_BAND_SAT=y | ||
CONFIG_ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT=y | ||
CONFIG_ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL=y | ||
CONFIG_ENABLE_RGB_MATRIX_CYCLE_OUT_IN=y | ||
CONFIG_ENABLE_RGB_MATRIX_HUE_BREATHING=y | ||
|
||
CONFIG_BT_ENABLED=y | ||
CONFIG_BT_BLUEDROID_ENABLED=y | ||
CONFIG_BT_BLE_ENABLED=y | ||
CONFIG_BT_HID_ENABLED=y | ||
CONFIG_BT_HID_DEVICE_ENABLED=y | ||
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y | ||
|
||
# Enable support for power management | ||
CONFIG_PM_ENABLE=y | ||
# Enable tickless idle mode | ||
CONFIG_FREERTOS_USE_TICKLESS_IDLE=y | ||
# Minimum number of ticks to enter sleep mode for | ||
CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 | ||
CONFIG_BT_CTRL_MODEM_SLEEP=y | ||
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y | ||
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y | ||
CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP=y | ||
CONFIG_ESP_PHY_MAC_BB_PD=y | ||
CONFIG_ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL=y | ||
CONFIG_ENABLE_RGB_MATRIX_CYCLE_PINWHEEL=y | ||
CONFIG_ENABLE_RGB_MATRIX_CYCLE_SPIRAL=y | ||
CONFIG_ENABLE_RGB_MATRIX_CYCLE_UP_DOWN=y | ||
CONFIG_ENABLE_RGB_MATRIX_DUAL_BEACON=y | ||
CONFIG_ENABLE_RGB_MATRIX_FLOWER_BLOOMING=y | ||
CONFIG_ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT=y | ||
CONFIG_ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN=y | ||
CONFIG_ENABLE_RGB_MATRIX_HUE_WAVE=y | ||
CONFIG_ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS=y | ||
CONFIG_ENABLE_RGB_MATRIX_PIXEL_RAIN=y | ||
CONFIG_ENABLE_RGB_MATRIX_RAINBOW_BEACON=y | ||
CONFIG_ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON=y | ||
CONFIG_ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS=y | ||
CONFIG_ENABLE_RGB_MATRIX_RIVERFLOW=y | ||
CONFIG_ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE=y | ||
CONFIG_ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT=y |