diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 7b61020..7d28267 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -1,27 +1,31 @@ -menu "Example Configuration" +menu "TQ Cat Configuration" - choice LCD_TYPE - prompt "LCD module type" - default LCD_TYPE_AUTO - help - The type of LCD on the evaluation board. + menu "Legacy LCD Driver Options" - config LCD_TYPE_AUTO - bool "Auto detect" - config LCD_TYPE_ST7789V - bool "ST7789V (WROVER Kit v2 or v3)" - config LCD_TYPE_ILI9341 - bool "ILI9341 (WROVER Kit v1 or DevKitJ v1)" - endchoice + choice LCD_TYPE + prompt "LCD module type" + default LCD_TYPE_AUTO + help + The type of LCD on the evaluation board. - config LCD_OVERCLOCK - bool - prompt "Run LCD at higher clock speed than allowed" - default "n" - help - The ILI9341 and ST7789 specify that the maximum clock speed for the SPI interface is 10MHz. However, - in practice the driver chips work fine with a higher clock rate, and using that gives a better framerate. - Select this to try using the out-of-spec clock rate. + config LCD_TYPE_AUTO + bool "Auto detect" + config LCD_TYPE_ST7789V + bool "ST7789V (WROVER Kit v2 or v3)" + config LCD_TYPE_ILI9341 + bool "ILI9341 (WROVER Kit v1 or DevKitJ v1)" + endchoice + + config LCD_OVERCLOCK + bool + prompt "Run LCD at higher clock speed than allowed" + default "n" + help + The ILI9341 and ST7789 specify that the maximum clock speed for the SPI interface is 10MHz. However, + in practice the driver chips work fine with a higher clock rate, and using that gives a better framerate. + Select this to try using the out-of-spec clock rate. + + endmenu menu "Wi-Fi Stability" @@ -57,6 +61,8 @@ menu "Example Configuration" POSIX TZ string used for local wall-clock display and daily scheduling. For China Standard Time use "CST-8". + endmenu + menu "OTA Firmware Update" config TQ_OTA_ENABLE @@ -152,8 +158,6 @@ menu "Example Configuration" endmenu - endmenu - menu "Mini Program Wi-Fi Provisioning" config TQ_MINI_PROGRAM_PROVISIONING_ENABLE @@ -340,7 +344,9 @@ menu "Example Configuration" help Stack size in bytes for the control-plane system event task. - menu "Light Standby" + endmenu + + menu "Power Saving & Light Standby" config TQ_LIGHT_STANDBY_ENABLE bool "Enable light-standby state coordinator" @@ -460,7 +466,7 @@ menu "Example Configuration" endmenu - menu "Remote Logging" + menu "Remote Logging" config TQ_REMOTE_LOG_ENABLE bool "Enable remote log upload" @@ -542,6 +548,8 @@ menu "Example Configuration" endmenu + menu "Buttons & Input" + config TQ_KEY_INPUT_ENABLE bool "Enable interrupt-driven key input task" default y @@ -688,7 +696,7 @@ menu "Example Configuration" endmenu - menu "TQ Screen" + menu "Display & Screen" config TQ_SCREEN_ENABLE bool "Enable LCD screen runtime" @@ -826,16 +834,14 @@ menu "Example Configuration" endmenu - menu "TQ Slot Machine" + menu "Slot Machine" config TQ_SLOT_SWITCH_GPIO int "Slot feature switch GPIO" - default 6 + default 13 range 0 48 help - GPIO used for the rocker microswitch that triggers the slot - machine feature. The new board reuses the unconnected TP_SCL - contact on IO6 for the original SW2 function. + GPIO used by the input that triggers the slot machine feature. config TQ_SLOT_SWITCH_ACTIVE_LEVEL int "Slot feature switch active level" @@ -843,7 +849,6 @@ menu "Example Configuration" range 0 1 help Logic level that means the slot machine feature switch is active. - The rocker microswitch shorts IO6 to ground when pressed. config TQ_SLOT_SWITCH_PULLUP bool "Enable slot feature switch pull-up" @@ -866,7 +871,7 @@ menu "Example Configuration" endmenu - menu "TQ Calibration" + menu "Motor & Calibration" config TQ_STEPPER_ENABLE bool "Enable turntable stepper driver" @@ -939,7 +944,7 @@ menu "Example Configuration" endmenu - menu "TQ Power" + menu "Power & Battery" config TQ_POWER_HOLD_GPIO int "Power hold GPIO (-1 to disable)" @@ -1097,7 +1102,7 @@ menu "Example Configuration" endmenu - menu "Wi-Fi Provisioning" + menu "Network Identity & Wi-Fi Provisioning" config MULTIMODAL_WIFI_SSID string "Seed Wi-Fi SSID" @@ -1170,7 +1175,7 @@ menu "Example Configuration" endmenu - menu "Daily Fortune" + menu "Daily Fortune & User Configuration" config FORTUNE_ENABLE bool "Enable device-side daily fortune refresh" @@ -1228,7 +1233,7 @@ menu "Example Configuration" endmenu - menu "WebSocket / Multimodal" + menu "Voice, Authentication & Multimodal" config ENABLE_MULTIMODAL_INTERACTION bool "Enable multimodal interaction module" @@ -1244,6 +1249,8 @@ menu "Example Configuration" help Stack size in bytes for the multimodal session watchdog task. + menu "Credentials & Device Authentication" + config MULTIMODAL_USE_STATIC_CREDENTIALS bool "Use static WebSocket credentials (skip token request)" default n @@ -1393,6 +1400,10 @@ menu "Example Configuration" help Random jitter added to each auth retry backoff. + endmenu + + menu "Interaction & Local Wake" + config MULTIMODAL_UPSTREAM_MODE string "Upstream mode for Start directive" default "push2talk" @@ -1402,11 +1413,10 @@ menu "Example Configuration" config MULTIMODAL_PTT_BUTTON_GPIO int "Push-to-talk button GPIO" - default 13 + default 3 range 0 48 help GPIO used for the push-to-talk button. - Default from docs/gpio-map.md (Button 2 on the SW2/IO13 net). config MULTIMODAL_PTT_BUTTON_ACTIVE_LEVEL int "Push-to-talk button active level" @@ -1414,20 +1424,18 @@ menu "Example Configuration" range 0 1 help Logic level that means the push-to-talk button is pressed. - Button 2 is active-low through the board pull-up. config MULTIMODAL_PTT_BUTTON_PULLUP bool "Enable push-to-talk button pull-up" default y help - Enable the internal pull-up for the default active-low Button 2 - wiring in addition to the board pull-up. + Enable the internal pull-up when required by the button wiring. config MULTIMODAL_PTT_BUTTON_PULLDOWN bool "Enable push-to-talk button pull-down" default n help - Leave disabled for the default active-low Button 2 wiring. + Enable the internal pull-down when required by the button wiring. config TQ_LOCAL_WAKE_ENABLE bool "Enable local wake-word listener" @@ -1530,6 +1538,10 @@ menu "Example Configuration" help Initial threshold is 0.12 and must be tuned with device audio. + endmenu + + menu "Session & Opus Codec" + config MULTIMODAL_HEARTBEAT_INTERVAL_MS int "Heartbeat interval (ms)" default 50000 @@ -1597,7 +1609,9 @@ menu "Example Configuration" bool "Enable self-delimited raw-opus decode" default n - menu "Runtime ES8311 Audio Path" + endmenu + + menu "Audio Codec & Streaming" config MULTIMODAL_AUDIO_ENABLE_CODEC_PATH bool "Enable runtime ES8311 init/capture/playback" @@ -1991,6 +2005,8 @@ menu "Example Configuration" endmenu + menu "Downstream TTS" + config MULTIMODAL_TTS_VOICE string "Default downstream TTS voice" default "" @@ -2032,6 +2048,10 @@ menu "Example Configuration" parameters. Audio downlink is still streamed through binary WebSocket frames when this is disabled. + endmenu + + menu "WebSocket Transport" + config MULTIMODAL_WEBSOCKET_TASK_STACK_BYTES int "WebSocket task stack (bytes)" default 32768 @@ -2150,6 +2170,8 @@ menu "Example Configuration" help Delay between reconnect attempts if auto-reconnect is enabled. + endmenu + endmenu endmenu diff --git a/sdkconfig.defaults b/sdkconfig.defaults index add5a87..130b0ca 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -182,8 +182,8 @@ CONFIG_MULTIMODAL_DEVICE_ID="" CONFIG_MULTIMODAL_SERIAL_NUMBER="" CONFIG_MULTIMODAL_WIFI_SSID="" CONFIG_MULTIMODAL_WIFI_PASSWORD="" -CONFIG_ESPTOOLPY_MONITOR_BAUD=921600 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 +CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 CONFIG_MULTIMODAL_DEVICE_TOKEN_URL="https://gz.api.talkingq.com/token/api/device/token" CONFIG_FORTUNE_ENABLE=y CONFIG_FORTUNE_API_URL="https://gz.api.talkingq.com/token/api/device/fortune/daily-wealth" @@ -200,7 +200,7 @@ CONFIG_AUTH_V2_ENABLE=y CONFIG_TQ_FACTORY_CLI_ENABLE=y CONFIG_TQ_FACTORY_CLI_TASK_STACK_BYTES=10240 CONFIG_MULTIMODAL_UPSTREAM_MODE="push2talk" -CONFIG_MULTIMODAL_PTT_BUTTON_GPIO=13 +CONFIG_MULTIMODAL_PTT_BUTTON_GPIO=3 CONFIG_MULTIMODAL_PTT_BUTTON_ACTIVE_LEVEL=0 CONFIG_MULTIMODAL_PTT_BUTTON_PULLUP=y # CONFIG_MULTIMODAL_PTT_BUTTON_PULLDOWN is not set @@ -311,7 +311,7 @@ CONFIG_TQ_SCREEN_SPI_CS_GPIO=15 CONFIG_TQ_SCREEN_DC_GPIO=16 CONFIG_TQ_SCREEN_BACKLIGHT_GPIO=7 CONFIG_TQ_SCREEN_SPI_PIXEL_CLOCK_HZ=20000000 -CONFIG_TQ_SLOT_SWITCH_GPIO=6 +CONFIG_TQ_SLOT_SWITCH_GPIO=13 CONFIG_TQ_SLOT_SWITCH_ACTIVE_LEVEL=0 CONFIG_TQ_SLOT_SWITCH_PULLUP=y # CONFIG_TQ_SLOT_SWITCH_PULLDOWN is not set