From f2920675f8fabb5206a0985b744e240f90c60dc9 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Fri, 7 Feb 2020 10:19:53 -0800 Subject: [PATCH 01/23] config file clean-up --- build-scripts/16M-sdkconfig.defaults | 147 --- build-scripts/ESP32-A1S-sdkconfig.defaults | 4 +- build-scripts/I2S-16MFlash-sdkconfig.defaults | 20 +- build-scripts/I2S-4MFlash-sdkconfig.defaults | 18 +- build-scripts/NonOTA-16M-sdkconfig.defaults | 143 -- .../NonOTA-I2S-16MFlash-sdkconfig.defaults | 1140 ---------------- .../NonOTA-I2S-4MFlash-sdkconfig.defaults | 24 +- .../NonOTA-SqueezeAmp-sdkconfig.defaults | 9 +- .../SqueezeAmp4MBFlash-sdkconfig.defaults | 4 +- .../SqueezeAmp8MBFlash-sdkconfig.defaults | 565 +++++++- .../squeezelite-esp32-16M-sdkconfig.defaults | 141 -- ...lite-esp32-I2S-16MFlash-sdkconfig.defaults | 1139 ---------------- ...2-I2S-4MFlash-NOAirplay-sdkconfig.defaults | 1134 ---------------- ...elite-esp32-I2S-4MFlash-sdkconfig.defaults | 1168 ----------------- ...p-sdkconfig.defaults => sdkconfig.defaults | 18 +- 15 files changed, 609 insertions(+), 5065 deletions(-) delete mode 100644 build-scripts/16M-sdkconfig.defaults delete mode 100644 build-scripts/NonOTA-16M-sdkconfig.defaults delete mode 100644 build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults delete mode 100644 build-scripts/squeezelite-esp32-16M-sdkconfig.defaults delete mode 100644 build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults delete mode 100644 build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults delete mode 100644 build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults rename build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults => sdkconfig.defaults (98%) diff --git a/build-scripts/16M-sdkconfig.defaults b/build-scripts/16M-sdkconfig.defaults deleted file mode 100644 index a20ceb7f..00000000 --- a/build-scripts/16M-sdkconfig.defaults +++ /dev/null @@ -1,147 +0,0 @@ -CONFIG_ESPTOOLPY_BAUD_2MB=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_ESPTOOLPY_FLASHFREQ="80m" -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_WIFI_FAST_SCAN=y -CONFIG_WIFI_CONNECT_AP_BY_SIGNAL=y -CONFIG_FAST_SCAN_THRESHOLD=y -CONFIG_FAST_SCAN_MINIMUM_SIGNAL=-127 -CONFIG_EXAMPLE_OPEN=y -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y -CONFIG_OTA_ALLOW_HTTP=y -CONFIG_WL_SECTOR_SIZE_512=y -#CONFIG_WL_SECTOR_SIZE_4096 is not defined -CONFIG_WL_SECTOR_SIZE=512 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - -CONFIG_BTAUDIO=y -CONFIG_OUTPUT_NAME="" -CONFIG_OUTPUT_RATES="44100" -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_ACL_CONNECTIONS=4 -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c -CONFIG_SPI_MASTER_ISR_IN_IRAM=y -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=n -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 -CONFIG_ESP32_PANIC_PRINT_REBOOT=y -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y -CONFIG_ESP32_XTAL_FREQ=40 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n -CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 -CONFIG_FREERTOS_HZ=100 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - -# wifi-manager -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index 8d6298f6..932fbd51 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y diff --git a/build-scripts/I2S-16MFlash-sdkconfig.defaults b/build-scripts/I2S-16MFlash-sdkconfig.defaults index 1f6bdeca..26777840 100644 --- a/build-scripts/I2S-16MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-16MFlash-sdkconfig.defaults @@ -13,8 +13,8 @@ CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_COMPILE_TIME_DATE=y -CONFIG_OTA_ALLOW_HTTP=y +CONFIG_OTA_ALLOW_HTTP=y CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -84,18 +86,12 @@ CONFIG_INCLUDE_ALAC=y CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 +CONFIG_SPDIF_BCK_IO=-1 +CONFIG_SPDIF_WS_IO=-1 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index 9379b3c9..2e13b46c 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -84,18 +86,12 @@ CONFIG_INCLUDE_ALAC=y CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 +CONFIG_SPDIF_BCK_IO=-1 +CONFIG_SPDIF_WS_IO=-1 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 diff --git a/build-scripts/NonOTA-16M-sdkconfig.defaults b/build-scripts/NonOTA-16M-sdkconfig.defaults deleted file mode 100644 index f58dbbaf..00000000 --- a/build-scripts/NonOTA-16M-sdkconfig.defaults +++ /dev/null @@ -1,143 +0,0 @@ -CONFIG_ESPTOOLPY_BAUD_2MB=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_ESPTOOLPY_FLASHFREQ="80m" -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_WIFI_FAST_SCAN=y -CONFIG_WIFI_CONNECT_AP_BY_SIGNAL=y -CONFIG_FAST_SCAN_THRESHOLD=y -CONFIG_FAST_SCAN_MINIMUM_SIGNAL=-127 -CONFIG_EXAMPLE_OPEN=y -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y -CONFIG_OTA_ALLOW_HTTP=y - -CONFIG_BTAUDIO=y -CONFIG_OUTPUT_NAME="" -CONFIG_OUTPUT_RATES="44100" -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="non-ota-partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="non-ota-partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_ACL_CONNECTIONS=4 -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c -CONFIG_SPI_MASTER_ISR_IN_IRAM=y -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=n -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 -CONFIG_ESP32_PANIC_PRINT_REBOOT=y -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y -CONFIG_ESP32_XTAL_FREQ=40 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n -CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 -CONFIG_FREERTOS_HZ=100 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - -# wifi-manager -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" diff --git a/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults deleted file mode 100644 index 1a1db3e7..00000000 --- a/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults +++ /dev/null @@ -1,1140 +0,0 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) Project Configuration -# -CONFIG_IDF_TARGET_ESP32=y -CONFIG_IDF_TARGET="esp32" - -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y -CONFIG_APP_COMPILE_TIME_DATE=y - - -CONFIG_OTA_ALLOW_HTTP=y - - - -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y - - -CONFIG_BOOTLOADER_LOG_LEVEL=3 -CONFIG_BOOTLOADER_SPI_WP_PIN=7 -CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y - - -CONFIG_BOOTLOADER_WDT_ENABLE=y - -CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - - - - -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - - - -CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y - - - -CONFIG_ESPTOOLPY_FLASHFREQ="80m" - - - - -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_ESPTOOLPY_BEFORE_RESET=y - -CONFIG_ESPTOOLPY_BEFORE="default_reset" -CONFIG_ESPTOOLPY_AFTER_RESET=y - -CONFIG_ESPTOOLPY_AFTER="hard_reset" - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y - - - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 - - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="non-ota-partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="non-ota-partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_LOGGING_SLIMPROTO="info" -CONFIG_LOGGING_STREAM="info" -CONFIG_LOGGING_DECODE="info" -CONFIG_LOGGING_OUTPUT="info" -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y - - -CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 - -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 -CONFIG_A2DP_SINK_NAME="SMSL BT4.2" -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_BT_SINK=y -CONFIG_BT_SINK_NAME="ESP32-BT" -CONFIG_BT_SINK_PIN=1234 -CONFIG_AIRPLAY_SINK=y -CONFIG_AIRPLAY_NAME="ESP32-AirPlay" -CONFIG_AIRPLAY_PORT="5000" -CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 -CONFIG_WIFI_MANAGER_MAX_RETRY=2 -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 -CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y - - - -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y - - - - - - - -CONFIG_ESP32_APPTRACE_DEST_NONE=y - -CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BT_ENABLED=y - -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 - -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y - -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y - -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y - -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y - -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 - -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 - - -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_BLE_ENABLED=y -CONFIG_BT_GATTS_ENABLE=y - -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_BT_GATTC_ENABLE=y - -CONFIG_BT_BLE_SMP_ENABLE=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HID_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 -CONFIG_BT_ACL_CONNECTIONS=4 - - - -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c - - -CONFIG_ADC_DISABLE_DAC=y - -CONFIG_SPI_MASTER_ISR_IN_IRAM=y - -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y - - - -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y - -CONFIG_EFUSE_MAX_BLK_LEN=192 - - - -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y - - -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y - - -CONFIG_SPIRAM_SIZE=-1 - -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y - -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 - - - -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 - -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 - -CONFIG_ESP32_PANIC_PRINT_REBOOT=y - - -CONFIG_ESP32_DEBUG_OCDAWARE=y - -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y - - - -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y - - - -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y - - -CONFIG_ESP32_XTAL_FREQ=40 - - - - -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y - -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y - - -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y - -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y - -CONFIG_ETH_RMII_CLK_INPUT=y - -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_SMI_MDC_GPIO=23 -CONFIG_ETH_SMI_MDIO_GPIO=18 -CONFIG_ETH_PHY_USE_RST=y -CONFIG_ETH_PHY_RST_GPIO=5 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 - -CONFIG_ESP_EVENT_POST_FROM_ISR=y -CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y -CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y - -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 -CONFIG_HTTPD_ERR_RESP_NO_DELAY=y -CONFIG_HTTPD_PURGE_BUF_LEN=32 - - - -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y - - -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 - - - -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y - -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 - -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y - -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 - - -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y - - -CONFIG_FATFS_CODEPAGE_437=y - - - - - - - - - - - - - - - - - - - - -CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y - - -CONFIG_FATFS_FS_LOCK=0 -CONFIG_FATFS_TIMEOUT_MS=10000 -CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_TASK_PRIO=10 - -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 - -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y - -CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y - - -CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y - -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y - - -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 - -CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 - - - -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - -CONFIG_HEAP_POISONING_DISABLED=y - - -CONFIG_HEAP_TRACING_OFF=y - - - -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y - - - -CONFIG_LOG_DEFAULT_LEVEL_INFO=y - - -CONFIG_LOG_DEFAULT_LEVEL=3 -CONFIG_LOG_COLORS=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif" - - -CONFIG_LWIP_TIMERS_ONDEMAND=y -CONFIG_LWIP_MAX_SOCKETS=16 - -CONFIG_LWIP_SO_REUSE=y -CONFIG_LWIP_SO_REUSE_RXTOALL=y - - - - - -CONFIG_LWIP_ESP_GRATUITOUS_ARP=y -CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y - -CONFIG_LWIP_DHCPS_LEASE_UNIT=60 -CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 - -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 -CONFIG_LWIP_MAX_ACTIVE_TCP=16 -CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 -CONFIG_LWIP_TCP_MSS=1440 -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCP_QUEUE_OOSEQ=y - -CONFIG_LWIP_TCP_OVERSIZE_MSS=y - - -CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF - - - -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 -CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 - -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y - - -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 - - -CONFIG_MBEDTLS_HARDWARE_AES=y - - -CONFIG_MBEDTLS_HAVE_TIME=y - -CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y - - - -CONFIG_MBEDTLS_TLS_SERVER=y -CONFIG_MBEDTLS_TLS_CLIENT=y -CONFIG_MBEDTLS_TLS_ENABLED=y - -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y -CONFIG_MBEDTLS_SSL_RENEGOTIATION=y - -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y - -CONFIG_MBEDTLS_SSL_ALPN=y -CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_AES_C=y - - -CONFIG_MBEDTLS_RC4_DISABLED=y - - - - -CONFIG_MBEDTLS_CCM_C=y -CONFIG_MBEDTLS_GCM_C=y - -CONFIG_MBEDTLS_PEM_PARSE_C=y -CONFIG_MBEDTLS_PEM_WRITE_C=y -CONFIG_MBEDTLS_X509_CRL_PARSE_C=y -CONFIG_MBEDTLS_X509_CSR_PARSE_C=y -CONFIG_MBEDTLS_ECP_C=y -CONFIG_MBEDTLS_ECDH_C=y -CONFIG_MBEDTLS_ECDSA_C=y -CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y -CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y - - - -CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y - - - - -CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y - - -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y - -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 - - -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" - - -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - - - -CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y -CONFIG_SPIFFS_MAX_PARTITIONS=3 -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y - -CONFIG_SPIFFS_PAGE_CHECK=y -CONFIG_SPIFFS_GC_MAX_RUNS=10 - -CONFIG_SPIFFS_PAGE_SIZE=256 -CONFIG_SPIFFS_OBJ_NAME_LEN=32 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y -CONFIG_SPIFFS_META_LENGTH=4 -CONFIG_SPIFFS_USE_MTIME=y - - - - - - -CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y -CONFIG_UNITY_ENABLE_FLOAT=y -CONFIG_UNITY_ENABLE_DOUBLE=y - -CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y - - -CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_VFS_SUPPORT_TERMIOS=y -CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - - - -# Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y - - - -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y - - -CONFIG_LOG_BOOTLOADER_LEVEL=3 - - -CONFIG_FLASHMODE_QIO=y - - - - - -CONFIG_MONITOR_BAUD_115200B=y - - - - -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 - -CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y - - - -CONFIG_STACK_CHECK_NONE=y - - - - - - - -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y - -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BLUEDROID_ENABLED=y -CONFIG_BTC_TASK_STACK_SIZE=3072 -CONFIG_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BTU_TASK_STACK_SIZE=4096 - -CONFIG_CLASSIC_BT_ENABLED=y -CONFIG_A2DP_ENABLE=y -CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 - -CONFIG_GATTS_ENABLE=y - -CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_GATTC_ENABLE=y - -CONFIG_BLE_SMP_ENABLE=y - - - -CONFIG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HCI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GAP_INITIAL_TRACE_LEVEL=2 -CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_PAN_INITIAL_TRACE_LEVEL=2 - - -CONFIG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_A2D_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_MCA_INITIAL_TRACE_LEVEL=2 - - -CONFIG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HID_INITIAL_TRACE_LEVEL=2 - - -CONFIG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_APPL_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GATT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_SMP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_OSI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 - -CONFIG_SMP_ENABLE=y -CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 -CONFIG_ADC2_DISABLE_DAC=y -CONFIG_SPIRAM_SUPPORT=y - - - -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 - -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y - - - - - -CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 -CONFIG_IPC_TASK_STACK_SIZE=1024 -CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART_DEFAULT=y - - -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 -CONFIG_INT_WDT=y -CONFIG_INT_WDT_TIMEOUT_MS=800 -CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y - -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y - -CONFIG_POST_EVENTS_FROM_ISR=y -CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_SW_COEXIST_ENABLE=y - - -CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 - -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -CONFIG_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_TIMER_QUEUE_LENGTH=10 - - -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=32 -CONFIG_TCP_MAXRTX=12 -CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1440 -CONFIG_TCP_MSL=60000 -CONFIG_TCP_SND_BUF_DEFAULT=8192 -CONFIG_TCP_WND_DEFAULT=32768 -CONFIG_TCP_RECVMBOX_SIZE=32 -CONFIG_TCP_QUEUE_OOSEQ=y - -CONFIG_TCP_OVERSIZE_MSS=y - - -CONFIG_UDP_RECVMBOX_SIZE=32 -CONFIG_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF - -CONFIG_PTHREAD_STACK_MIN=768 -CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y - - -CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y -# End of deprecated options diff --git a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults index 6cf46920..8aff6e8d 100644 --- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -84,18 +86,12 @@ CONFIG_INCLUDE_ALAC=y CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 +CONFIG_SPDIF_BCK_IO=-1 +CONFIG_SPDIF_WS_IO=-1 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 @@ -387,6 +383,7 @@ CONFIG_SPIRAM_SIZE=-1 CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_CACHE_WORKAROUND=y + CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y @@ -792,8 +789,9 @@ CONFIG_VFS_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 +CONFIG_WL_SECTOR_SIZE_512=y +#CONFIG_WL_SECTOR_SIZE_4096 is not defined +CONFIG_WL_SECTOR_SIZE=512 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 diff --git a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults index 554740b2..7fb4b8dd 100644 --- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -781,8 +783,9 @@ CONFIG_VFS_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 +CONFIG_WL_SECTOR_SIZE_512=y +#CONFIG_WL_SECTOR_SIZE_4096 is not defined +CONFIG_WL_SECTOR_SIZE=512 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index 0282d8f4..07ccf4c3 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -29,10 +29,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index 1104c151..6a9cf85f 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -4,38 +4,67 @@ # CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" + # # SDK tool configuration # CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_COMPILE_TIME_DATE=y + + + CONFIG_OTA_ALLOW_HTTP=y + + CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y + + CONFIG_BOOTLOADER_LOG_LEVEL=3 CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y + + CONFIG_BOOTLOADER_WDT_ENABLE=y + CONFIG_BOOTLOADER_WDT_TIME_MS=9000 -CONFIG_ESPTOOLPY_PORT="com6" + CONFIG_ESPTOOLPY_BAUD_2MB=y + + CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=2000000 CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y + + + CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y + + + CONFIG_ESPTOOLPY_FLASHFREQ="80m" CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y CONFIG_ESPTOOLPY_FLASHSIZE="8MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_BEFORE_RESET=y + CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y + CONFIG_ESPTOOLPY_AFTER="hard_reset" + + CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y + + + + CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 + + CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" @@ -72,133 +101,337 @@ CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" + CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y + + + CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y + + + + + + + CONFIG_ESP32_APPTRACE_DEST_NONE=y + CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y CONFIG_BT_ENABLED=y + CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y + CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 + CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y + CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y + CONFIG_BTDM_MODEM_SLEEP=y CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y + CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 CONFIG_BT_BLUEDROID_ENABLED=y + CONFIG_BT_BTC_TASK_STACK_SIZE=3072 CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y + CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BT_BTU_TASK_STACK_SIZE=4096 + CONFIG_BT_CLASSIC_ENABLED=y CONFIG_BT_A2DP_ENABLE=y CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 + + CONFIG_BT_SSP_ENABLED=y CONFIG_BT_BLE_ENABLED=y CONFIG_BT_GATTS_ENABLE=y + CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 CONFIG_BT_GATTC_ENABLE=y + CONFIG_BT_BLE_SMP_ENABLE=y + + + + CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 + + CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 + + CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 + + CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 + + CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 + + CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 + + CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 + + CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 + + CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 + + CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 + + CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 + + CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 + + CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 + + CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_HID_TRACE_LEVEL=2 + + CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 + + CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 + + CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 + + CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 + + CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 + + CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 + + CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y + + + + CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 CONFIG_BT_ACL_CONNECTIONS=4 + + + CONFIG_BT_SMP_ENABLE=y CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 CONFIG_BT_RESERVE_DRAM=0xdb5c + + CONFIG_ADC_DISABLE_DAC=y + CONFIG_SPI_MASTER_ISR_IN_IRAM=y + CONFIG_SPI_SLAVE_ISR_IN_IRAM=y + + + CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y + CONFIG_EFUSE_MAX_BLK_LEN=192 + + + CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 CONFIG_ESP32_SPIRAM_SUPPORT=y CONFIG_SPIRAM_BOOT_INIT=y + + CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_TYPE_AUTO=y + + CONFIG_SPIRAM_SIZE=-1 + CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_CACHE_WORKAROUND=y + CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y + + CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y CONFIG_D0WD_PSRAM_CLK_IO=17 CONFIG_D0WD_PSRAM_CS_IO=16 CONFIG_D2WD_PSRAM_CLK_IO=9 CONFIG_D2WD_PSRAM_CS_IO=10 CONFIG_PICO_PSRAM_CS_IO=10 + + + CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 + CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 + CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 + CONFIG_ESP32_PANIC_PRINT_REBOOT=y + + CONFIG_ESP32_DEBUG_OCDAWARE=y + CONFIG_ESP32_BROWNOUT_DET=y CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y + + + + + + + CONFIG_ESP32_BROWNOUT_DET_LVL=0 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y + + + CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y + + + CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 CONFIG_ESP32_XTAL_FREQ_40=y + + CONFIG_ESP32_XTAL_FREQ=40 + + + + CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y CONFIG_ADC_CAL_LUT_ENABLE=y + CONFIG_ESP_ERR_TO_NAME_LOOKUP=y CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 @@ -206,18 +439,23 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP_CONSOLE_UART_DEFAULT=y + + CONFIG_ESP_CONSOLE_UART_NUM=0 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_ESP_INT_WDT_CHECK_CPU1=y CONFIG_ESP_TASK_WDT=y + CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y CONFIG_ETH_USE_ESP32_EMAC=y CONFIG_ETH_PHY_INTERFACE_RMII=y + CONFIG_ETH_RMII_CLK_INPUT=y + CONFIG_ETH_RMII_CLK_IN_GPIO=0 CONFIG_ETH_SMI_MDC_GPIO=23 CONFIG_ETH_SMI_MDIO_GPIO=18 @@ -226,14 +464,21 @@ CONFIG_ETH_PHY_RST_GPIO=5 CONFIG_ETH_DMA_BUFFER_SIZE=512 CONFIG_ETH_DMA_RX_BUFFER_NUM=10 CONFIG_ETH_DMA_TX_BUFFER_NUM=10 + CONFIG_ESP_EVENT_POST_FROM_ISR=y CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y + CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 CONFIG_HTTPD_MAX_URI_LEN=512 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y CONFIG_HTTPD_PURGE_BUF_LEN=32 + + + CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y + + CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 @@ -241,18 +486,50 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 + + + CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y + CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 + CONFIG_ESP32_WIFI_IRAM_OPT=y CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y + CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 + + CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y + + CONFIG_FATFS_CODEPAGE_437=y + + + + + + + + + + + + + + + + + + + + CONFIG_FATFS_CODEPAGE=437 CONFIG_FATFS_LFN_NONE=y + + CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 CONFIG_FATFS_PER_FILE_CACHE=y @@ -263,6 +540,7 @@ CONFIG_FMB_QUEUE_LENGTH=20 CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 CONFIG_FMB_SERIAL_BUF_SIZE=256 CONFIG_FMB_SERIAL_TASK_PRIO=10 + CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 @@ -270,40 +548,73 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FMB_TIMER_GROUP=0 CONFIG_FMB_TIMER_INDEX=0 + CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF CONFIG_FREERTOS_CORETIMER_0=y + CONFIG_FREERTOS_HZ=100 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y + + CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y + CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y + + CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 CONFIG_FREERTOS_ISR_STACKSIZE=1536 + CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y + CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 + + + CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y + CONFIG_HEAP_POISONING_DISABLED=y + + CONFIG_HEAP_TRACING_OFF=y + + + CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y + + + CONFIG_LOG_DEFAULT_LEVEL_INFO=y + + CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_LOG_COLORS=y CONFIG_LWIP_LOCAL_HOSTNAME="espressif" + + CONFIG_LWIP_TIMERS_ONDEMAND=y CONFIG_LWIP_MAX_SOCKETS=16 + CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE_RXTOALL=y + + + + + CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y + CONFIG_LWIP_DHCPS_LEASE_UNIT=60 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 + CONFIG_LWIP_NETIF_LOOPBACK=y CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 CONFIG_LWIP_MAX_ACTIVE_TCP=16 @@ -316,23 +627,43 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 CONFIG_LWIP_TCP_WND_DEFAULT=32768 CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y + CONFIG_LWIP_TCP_OVERSIZE_MSS=y + + CONFIG_LWIP_MAX_UDP_PCBS=16 CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y + + CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF + + + CONFIG_LWIP_MAX_RAW_PCBS=16 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 + CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y + + CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 + + CONFIG_MBEDTLS_HARDWARE_AES=y + + CONFIG_MBEDTLS_HAVE_TIME=y + CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y + + + CONFIG_MBEDTLS_TLS_SERVER=y CONFIG_MBEDTLS_TLS_CLIENT=y CONFIG_MBEDTLS_TLS_ENABLED=y + CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y @@ -341,16 +672,25 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y CONFIG_MBEDTLS_SSL_RENEGOTIATION=y + CONFIG_MBEDTLS_SSL_PROTO_TLS1=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y + CONFIG_MBEDTLS_SSL_ALPN=y CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y CONFIG_MBEDTLS_AES_C=y + + CONFIG_MBEDTLS_RC4_DISABLED=y + + + + CONFIG_MBEDTLS_CCM_C=y CONFIG_MBEDTLS_GCM_C=y + CONFIG_MBEDTLS_PEM_PARSE_C=y CONFIG_MBEDTLS_PEM_WRITE_C=y CONFIG_MBEDTLS_X509_CRL_PARSE_C=y @@ -376,55 +716,115 @@ CONFIG_MQTT_PROTOCOL_311=y CONFIG_MQTT_TRANSPORT_SSL=y CONFIG_MQTT_TRANSPORT_WEBSOCKET=y CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y + + + CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y + + + + CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y + + CONFIG_OPENSSL_ASSERT_DO_NOTHING=y + CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 CONFIG_ESP32_PTHREAD_STACK_MIN=768 + + CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" + + CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y + + + CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y CONFIG_SPIFFS_MAX_PARTITIONS=3 CONFIG_SPIFFS_CACHE=y CONFIG_SPIFFS_CACHE_WR=y + CONFIG_SPIFFS_PAGE_CHECK=y CONFIG_SPIFFS_GC_MAX_RUNS=10 + CONFIG_SPIFFS_PAGE_SIZE=256 CONFIG_SPIFFS_OBJ_NAME_LEN=32 CONFIG_SPIFFS_USE_MAGIC=y CONFIG_SPIFFS_USE_MAGIC_LENGTH=y CONFIG_SPIFFS_META_LENGTH=4 CONFIG_SPIFFS_USE_MTIME=y + + + + + + CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 CONFIG_TCPIP_LWIP=y CONFIG_UNITY_ENABLE_FLOAT=y CONFIG_UNITY_ENABLE_DOUBLE=y + CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y + + CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_VFS_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 + CONFIG_WL_SECTOR_SIZE_512=y #CONFIG_WL_SECTOR_SIZE_4096 is not defined CONFIG_WL_SECTOR_SIZE=512 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 + + + # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y + + + CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y + + CONFIG_LOG_BOOTLOADER_LEVEL=3 + + CONFIG_FLASHMODE_QIO=y + + + + + CONFIG_MONITOR_BAUD_115200B=y + + + + CONFIG_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_MONITOR_BAUD=115200 + CONFIG_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y + + + CONFIG_STACK_CHECK_NONE=y + + + + + + + CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y + CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 @@ -432,93 +832,244 @@ CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y + CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y CONFIG_BLUEDROID_ENABLED=y CONFIG_BTC_TASK_STACK_SIZE=3072 CONFIG_BLUEDROID_PINNED_TO_CORE_0=y + CONFIG_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BTU_TASK_STACK_SIZE=4096 + CONFIG_CLASSIC_BT_ENABLED=y CONFIG_A2DP_ENABLE=y CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 + CONFIG_GATTS_ENABLE=y + CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 CONFIG_GATTC_ENABLE=y + CONFIG_BLE_SMP_ENABLE=y + + + CONFIG_HCI_TRACE_LEVEL_WARNING=y + + + + CONFIG_HCI_INITIAL_TRACE_LEVEL=2 + + CONFIG_BTM_TRACE_LEVEL_WARNING=y + + + + CONFIG_BTM_INITIAL_TRACE_LEVEL=2 + + CONFIG_L2CAP_TRACE_LEVEL_WARNING=y + + + + CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 + + CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y + + + + CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 + + CONFIG_SDP_TRACE_LEVEL_WARNING=y + + + + CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 + + CONFIG_GAP_TRACE_LEVEL_WARNING=y + + + + CONFIG_GAP_INITIAL_TRACE_LEVEL=2 CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 + + CONFIG_PAN_TRACE_LEVEL_WARNING=y + + + + CONFIG_PAN_INITIAL_TRACE_LEVEL=2 + + CONFIG_A2D_TRACE_LEVEL_WARNING=y + + + + CONFIG_A2D_INITIAL_TRACE_LEVEL=2 + + CONFIG_AVDT_TRACE_LEVEL_WARNING=y + + + + CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 + + CONFIG_AVCT_TRACE_LEVEL_WARNING=y + + + + CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 + + CONFIG_AVRC_TRACE_LEVEL_WARNING=y + + + + CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 + + CONFIG_MCA_TRACE_LEVEL_WARNING=y + + + + CONFIG_MCA_INITIAL_TRACE_LEVEL=2 + + CONFIG_HID_TRACE_LEVEL_WARNING=y + + + + CONFIG_HID_INITIAL_TRACE_LEVEL=2 + + CONFIG_APPL_TRACE_LEVEL_WARNING=y + + + + CONFIG_APPL_INITIAL_TRACE_LEVEL=2 + + CONFIG_GATT_TRACE_LEVEL_WARNING=y + + + + CONFIG_GATT_INITIAL_TRACE_LEVEL=2 + + CONFIG_SMP_TRACE_LEVEL_WARNING=y + + + + CONFIG_SMP_INITIAL_TRACE_LEVEL=2 + + CONFIG_BTIF_TRACE_LEVEL_WARNING=y + + + + CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 + + CONFIG_BTC_TRACE_LEVEL_WARNING=y + + + + CONFIG_BTC_INITIAL_TRACE_LEVEL=2 + + CONFIG_OSI_TRACE_LEVEL_WARNING=y + + + + CONFIG_OSI_INITIAL_TRACE_LEVEL=2 + + CONFIG_BLUFI_TRACE_LEVEL_WARNING=y + + + + CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 + CONFIG_SMP_ENABLE=y CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 CONFIG_ADC2_DISABLE_DAC=y CONFIG_SPIRAM_SUPPORT=y + + + CONFIG_TRACEMEM_RESERVE_DRAM=0x0 + CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 + CONFIG_ULP_COPROC_RESERVE_MEM=0 CONFIG_BROWNOUT_DET=y CONFIG_BROWNOUT_DET_LVL_SEL_0=y + + + + + + + CONFIG_BROWNOUT_DET_LVL=0 CONFIG_REDUCE_PHY_TX_POWER=y CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y + + + + + CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=8192 CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 CONFIG_CONSOLE_UART_DEFAULT=y + + CONFIG_CONSOLE_UART_NUM=0 CONFIG_CONSOLE_UART_BAUDRATE=115200 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=800 CONFIG_INT_WDT_CHECK_CPU1=y CONFIG_TASK_WDT=y + CONFIG_TASK_WDT_TIMEOUT_S=5 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y + CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y CONFIG_SW_COEXIST_ENABLE=y + + CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 @@ -527,6 +1078,7 @@ CONFIG_MB_QUEUE_LENGTH=20 CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 CONFIG_MB_SERIAL_BUF_SIZE=256 CONFIG_MB_SERIAL_TASK_PRIO=10 + CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 CONFIG_MB_CONTROLLER_STACK_SIZE=4096 @@ -535,9 +1087,12 @@ CONFIG_MB_TIMER_PORT_ENABLED=y CONFIG_MB_TIMER_GROUP=0 CONFIG_MB_TIMER_INDEX=0 CONFIG_SUPPORT_STATIC_ALLOCATION=y + CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_QUEUE_LENGTH=10 + + CONFIG_ESP_GRATUITOUS_ARP=y CONFIG_GARP_TMR_INTERVAL=60 CONFIG_TCPIP_RECVMBOX_SIZE=32 @@ -549,13 +1104,21 @@ CONFIG_TCP_SND_BUF_DEFAULT=8192 CONFIG_TCP_WND_DEFAULT=32768 CONFIG_TCP_RECVMBOX_SIZE=32 CONFIG_TCP_QUEUE_OOSEQ=y + CONFIG_TCP_OVERSIZE_MSS=y + + CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y + + CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF + CONFIG_PTHREAD_STACK_MIN=768 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y + + CONFIG_IP_LOST_TIMER_INTERVAL=120 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_SUPPORT_TERMIOS=y diff --git a/build-scripts/squeezelite-esp32-16M-sdkconfig.defaults b/build-scripts/squeezelite-esp32-16M-sdkconfig.defaults deleted file mode 100644 index 762373f5..00000000 --- a/build-scripts/squeezelite-esp32-16M-sdkconfig.defaults +++ /dev/null @@ -1,141 +0,0 @@ -CONFIG_ESPTOOLPY_BAUD_2MB=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_ESPTOOLPY_FLASHFREQ="80m" -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_WIFI_FAST_SCAN=y -CONFIG_WIFI_CONNECT_AP_BY_SIGNAL=y -CONFIG_FAST_SCAN_THRESHOLD=y -CONFIG_FAST_SCAN_MINIMUM_SIGNAL=-127 -CONFIG_EXAMPLE_OPEN=y -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y -CONFIG_BTAUDIO=y -CONFIG_OUTPUT_NAME="" -CONFIG_OUTPUT_RATES="44100" -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 -CONFIG_I2S_BITS_PER_CHANNEL_16=y -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_ACL_CONNECTIONS=4 -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c -CONFIG_SPI_MASTER_ISR_IN_IRAM=y -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=n -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 -CONFIG_ESP32_PANIC_PRINT_REBOOT=y -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y -CONFIG_ESP32_XTAL_FREQ=40 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n -CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 -CONFIG_FREERTOS_HZ=100 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - -# wifi-manager -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info" diff --git a/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults deleted file mode 100644 index 14870371..00000000 --- a/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults +++ /dev/null @@ -1,1139 +0,0 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) Project Configuration -# -CONFIG_IDF_TARGET_ESP32=y -CONFIG_IDF_TARGET="esp32" - -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y -CONFIG_APP_COMPILE_TIME_DATE=y - - - - - -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y - - -CONFIG_BOOTLOADER_LOG_LEVEL=3 -CONFIG_BOOTLOADER_SPI_WP_PIN=7 -CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y - - -CONFIG_BOOTLOADER_WDT_ENABLE=y - -CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - - - - -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - - - -CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y - - - -CONFIG_ESPTOOLPY_FLASHFREQ="80m" - - - - -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_ESPTOOLPY_BEFORE_RESET=y - -CONFIG_ESPTOOLPY_BEFORE="default_reset" -CONFIG_ESPTOOLPY_AFTER_RESET=y - -CONFIG_ESPTOOLPY_AFTER="hard_reset" - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y - - - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 - - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_LOGGING_SLIMPROTO="info" -CONFIG_LOGGING_STREAM="info" -CONFIG_LOGGING_DECODE="info" -CONFIG_LOGGING_OUTPUT="info" -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y - - -CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 - -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 -CONFIG_A2DP_SINK_NAME="SMSL BT4.2" -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_BT_SINK=y -CONFIG_BT_SINK_NAME="ESP32-BT" -CONFIG_BT_SINK_PIN=1234 -CONFIG_AIRPLAY_SINK=y -CONFIG_AIRPLAY_NAME="ESP32-AirPlay" -CONFIG_AIRPLAY_PORT="5000" -CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 -CONFIG_WIFI_MANAGER_MAX_RETRY=2 -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 -CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y - - - -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y - - - - - - - -CONFIG_ESP32_APPTRACE_DEST_NONE=y - -CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BT_ENABLED=y - -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 - -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y - -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y - -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y - -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y - -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 - -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 - - -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_BLE_ENABLED=y -CONFIG_BT_GATTS_ENABLE=y - -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_BT_GATTC_ENABLE=y - -CONFIG_BT_BLE_SMP_ENABLE=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HID_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 -CONFIG_BT_ACL_CONNECTIONS=4 - - - -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c - - -CONFIG_ADC_DISABLE_DAC=y - -CONFIG_SPI_MASTER_ISR_IN_IRAM=y - -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y - - - -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y - -CONFIG_EFUSE_MAX_BLK_LEN=192 - - - -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y - - -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y - - -CONFIG_SPIRAM_SIZE=-1 - -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y - -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 - - - -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 - -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 - -CONFIG_ESP32_PANIC_PRINT_REBOOT=y - - -CONFIG_ESP32_DEBUG_OCDAWARE=y - -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y - - - -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y - - - -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y - - -CONFIG_ESP32_XTAL_FREQ=40 - - - - -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y - -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y - - -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y - -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y - -CONFIG_ETH_RMII_CLK_INPUT=y - -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_SMI_MDC_GPIO=23 -CONFIG_ETH_SMI_MDIO_GPIO=18 -CONFIG_ETH_PHY_USE_RST=y -CONFIG_ETH_PHY_RST_GPIO=5 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 - -CONFIG_ESP_EVENT_POST_FROM_ISR=y -CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y -CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y - -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 -CONFIG_HTTPD_ERR_RESP_NO_DELAY=y -CONFIG_HTTPD_PURGE_BUF_LEN=32 - - - -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y - - -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 - - - -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y - -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 - -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y - -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 - - -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y - - -CONFIG_FATFS_CODEPAGE_437=y - - - - - - - - - - - - - - - - - - - - -CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y - - -CONFIG_FATFS_FS_LOCK=0 -CONFIG_FATFS_TIMEOUT_MS=10000 -CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_TASK_PRIO=10 - -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 - -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y - -CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y - - -CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y - -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y - - -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 - -CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 - - - -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - -CONFIG_HEAP_POISONING_DISABLED=y - - -CONFIG_HEAP_TRACING_OFF=y - - - -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y - - - -CONFIG_LOG_DEFAULT_LEVEL_INFO=y - - -CONFIG_LOG_DEFAULT_LEVEL=3 -CONFIG_LOG_COLORS=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif" - - -CONFIG_LWIP_TIMERS_ONDEMAND=y -CONFIG_LWIP_MAX_SOCKETS=16 - -CONFIG_LWIP_SO_REUSE=y -CONFIG_LWIP_SO_REUSE_RXTOALL=y - - - - - -CONFIG_LWIP_ESP_GRATUITOUS_ARP=y -CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y - -CONFIG_LWIP_DHCPS_LEASE_UNIT=60 -CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 - -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 -CONFIG_LWIP_MAX_ACTIVE_TCP=16 -CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 -CONFIG_LWIP_TCP_MSS=1440 -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCP_QUEUE_OOSEQ=y - -CONFIG_LWIP_TCP_OVERSIZE_MSS=y - - -CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF - - - -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 -CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 - -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y - - -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 - - -CONFIG_MBEDTLS_HARDWARE_AES=y - - -CONFIG_MBEDTLS_HAVE_TIME=y - -CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y - - - -CONFIG_MBEDTLS_TLS_SERVER=y -CONFIG_MBEDTLS_TLS_CLIENT=y -CONFIG_MBEDTLS_TLS_ENABLED=y - -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y -CONFIG_MBEDTLS_SSL_RENEGOTIATION=y - -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y - -CONFIG_MBEDTLS_SSL_ALPN=y -CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_AES_C=y - - -CONFIG_MBEDTLS_RC4_DISABLED=y - - - - -CONFIG_MBEDTLS_CCM_C=y -CONFIG_MBEDTLS_GCM_C=y - -CONFIG_MBEDTLS_PEM_PARSE_C=y -CONFIG_MBEDTLS_PEM_WRITE_C=y -CONFIG_MBEDTLS_X509_CRL_PARSE_C=y -CONFIG_MBEDTLS_X509_CSR_PARSE_C=y -CONFIG_MBEDTLS_ECP_C=y -CONFIG_MBEDTLS_ECDH_C=y -CONFIG_MBEDTLS_ECDSA_C=y -CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y -CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y - - - -CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y - - - - -CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y - - -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y - -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 - - -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" - - -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - - - -CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y -CONFIG_SPIFFS_MAX_PARTITIONS=3 -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y - -CONFIG_SPIFFS_PAGE_CHECK=y -CONFIG_SPIFFS_GC_MAX_RUNS=10 - -CONFIG_SPIFFS_PAGE_SIZE=256 -CONFIG_SPIFFS_OBJ_NAME_LEN=32 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y -CONFIG_SPIFFS_META_LENGTH=4 -CONFIG_SPIFFS_USE_MTIME=y - - - - - - -CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y -CONFIG_UNITY_ENABLE_FLOAT=y -CONFIG_UNITY_ENABLE_DOUBLE=y - -CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y - - -CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_VFS_SUPPORT_TERMIOS=y -CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - - - -# Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y - - - -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y - - -CONFIG_LOG_BOOTLOADER_LEVEL=3 - - -CONFIG_FLASHMODE_QIO=y - - - - - -CONFIG_MONITOR_BAUD_115200B=y - - - - -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 - -CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y - - - -CONFIG_STACK_CHECK_NONE=y - - - - - - - -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y - -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BLUEDROID_ENABLED=y -CONFIG_BTC_TASK_STACK_SIZE=3072 -CONFIG_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BTU_TASK_STACK_SIZE=4096 - -CONFIG_CLASSIC_BT_ENABLED=y -CONFIG_A2DP_ENABLE=y -CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 - -CONFIG_GATTS_ENABLE=y - -CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_GATTC_ENABLE=y - -CONFIG_BLE_SMP_ENABLE=y - - - -CONFIG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HCI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GAP_INITIAL_TRACE_LEVEL=2 -CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_PAN_INITIAL_TRACE_LEVEL=2 - - -CONFIG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_A2D_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_MCA_INITIAL_TRACE_LEVEL=2 - - -CONFIG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HID_INITIAL_TRACE_LEVEL=2 - - -CONFIG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_APPL_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GATT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_SMP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_OSI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 - -CONFIG_SMP_ENABLE=y -CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 -CONFIG_ADC2_DISABLE_DAC=y -CONFIG_SPIRAM_SUPPORT=y - - - -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 - -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y - - - - - -CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 -CONFIG_IPC_TASK_STACK_SIZE=1024 -CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART_DEFAULT=y - - -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 -CONFIG_INT_WDT=y -CONFIG_INT_WDT_TIMEOUT_MS=800 -CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y - -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y - -CONFIG_POST_EVENTS_FROM_ISR=y -CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_SW_COEXIST_ENABLE=y - - -CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 - -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -CONFIG_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_TIMER_QUEUE_LENGTH=10 - - -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=32 -CONFIG_TCP_MAXRTX=12 -CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1440 -CONFIG_TCP_MSL=60000 -CONFIG_TCP_SND_BUF_DEFAULT=8192 -CONFIG_TCP_WND_DEFAULT=32768 -CONFIG_TCP_RECVMBOX_SIZE=32 -CONFIG_TCP_QUEUE_OOSEQ=y - -CONFIG_TCP_OVERSIZE_MSS=y - - -CONFIG_UDP_RECVMBOX_SIZE=32 -CONFIG_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF - -CONFIG_PTHREAD_STACK_MIN=768 -CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y - - -CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y -# End of deprecated options diff --git a/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults deleted file mode 100644 index 3cf20999..00000000 --- a/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults +++ /dev/null @@ -1,1134 +0,0 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) Project Configuration -# -CONFIG_IDF_TARGET_ESP32=y -CONFIG_IDF_TARGET="esp32" - -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y -CONFIG_APP_COMPILE_TIME_DATE=y - - - - - -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y - - -CONFIG_BOOTLOADER_LOG_LEVEL=3 -CONFIG_BOOTLOADER_SPI_WP_PIN=7 -CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y - - -CONFIG_BOOTLOADER_WDT_ENABLE=y - -CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - - - - -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - - - -CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y - - - -CONFIG_ESPTOOLPY_FLASHFREQ="80m" - - -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y - - -CONFIG_ESPTOOLPY_FLASHSIZE="4MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_ESPTOOLPY_BEFORE_RESET=y - -CONFIG_ESPTOOLPY_BEFORE="default_reset" -CONFIG_ESPTOOLPY_AFTER_RESET=y - -CONFIG_ESPTOOLPY_AFTER="hard_reset" - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y - - - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 - - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_LOGGING_SLIMPROTO="info" -CONFIG_LOGGING_STREAM="info" -CONFIG_LOGGING_DECODE="info" -CONFIG_LOGGING_OUTPUT="info" -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y - - -CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 - -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 -CONFIG_A2DP_SINK_NAME="SMSL BT4.2" -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_BT_SINK=y -CONFIG_BT_SINK_NAME="ESP32-BT" -CONFIG_BT_SINK_PIN=1234 -CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 -CONFIG_WIFI_MANAGER_MAX_RETRY=2 -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 -CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y - - - -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y - - - - - - - -CONFIG_ESP32_APPTRACE_DEST_NONE=y - -CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BT_ENABLED=y - -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 - -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y - -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y - -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y - -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y - -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 - -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 - - -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_BLE_ENABLED=y -CONFIG_BT_GATTS_ENABLE=y - -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_BT_GATTC_ENABLE=y - -CONFIG_BT_BLE_SMP_ENABLE=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HID_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 -CONFIG_BT_ACL_CONNECTIONS=4 - - - -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c - - -CONFIG_ADC_DISABLE_DAC=y - -CONFIG_SPI_MASTER_ISR_IN_IRAM=y - -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y - - - -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y - -CONFIG_EFUSE_MAX_BLK_LEN=192 - - - -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y - - -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y - - -CONFIG_SPIRAM_SIZE=-1 - -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 - - - -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 - -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 - -CONFIG_ESP32_PANIC_PRINT_REBOOT=y - - -CONFIG_ESP32_DEBUG_OCDAWARE=y - -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y - - - -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y - - - -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y - - -CONFIG_ESP32_XTAL_FREQ=40 - - - - -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y - -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y - - -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y - -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y - -CONFIG_ETH_RMII_CLK_INPUT=y - -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_SMI_MDC_GPIO=23 -CONFIG_ETH_SMI_MDIO_GPIO=18 -CONFIG_ETH_PHY_USE_RST=y -CONFIG_ETH_PHY_RST_GPIO=5 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 - -CONFIG_ESP_EVENT_POST_FROM_ISR=y -CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y -CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y - -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 -CONFIG_HTTPD_ERR_RESP_NO_DELAY=y -CONFIG_HTTPD_PURGE_BUF_LEN=32 - - - -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y - - -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 - - - -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y - -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 - -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y - -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 - - -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y - - -CONFIG_FATFS_CODEPAGE_437=y - - - - - - - - - - - - - - - - - - - - -CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y - - -CONFIG_FATFS_FS_LOCK=0 -CONFIG_FATFS_TIMEOUT_MS=10000 -CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_TASK_PRIO=10 - -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 - -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y - -CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y - - -CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y - -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y - - -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 - -CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 - - - -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - -CONFIG_HEAP_POISONING_DISABLED=y - - -CONFIG_HEAP_TRACING_OFF=y - - - -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y - - - -CONFIG_LOG_DEFAULT_LEVEL_INFO=y - - -CONFIG_LOG_DEFAULT_LEVEL=3 -CONFIG_LOG_COLORS=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif" - - -CONFIG_LWIP_TIMERS_ONDEMAND=y -CONFIG_LWIP_MAX_SOCKETS=16 - -CONFIG_LWIP_SO_REUSE=y -CONFIG_LWIP_SO_REUSE_RXTOALL=y - - - - - -CONFIG_LWIP_ESP_GRATUITOUS_ARP=y -CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y - -CONFIG_LWIP_DHCPS_LEASE_UNIT=60 -CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 - -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 -CONFIG_LWIP_MAX_ACTIVE_TCP=16 -CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 -CONFIG_LWIP_TCP_MSS=1440 -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCP_QUEUE_OOSEQ=y - -CONFIG_LWIP_TCP_OVERSIZE_MSS=y - - -CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF - - - -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 -CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 - -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y - - -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 - - -CONFIG_MBEDTLS_HARDWARE_AES=y - - -CONFIG_MBEDTLS_HAVE_TIME=y - -CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y - - - -CONFIG_MBEDTLS_TLS_SERVER=y -CONFIG_MBEDTLS_TLS_CLIENT=y -CONFIG_MBEDTLS_TLS_ENABLED=y - -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y -CONFIG_MBEDTLS_SSL_RENEGOTIATION=y - -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y - -CONFIG_MBEDTLS_SSL_ALPN=y -CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_AES_C=y - - -CONFIG_MBEDTLS_RC4_DISABLED=y - - - - -CONFIG_MBEDTLS_CCM_C=y -CONFIG_MBEDTLS_GCM_C=y - -CONFIG_MBEDTLS_PEM_PARSE_C=y -CONFIG_MBEDTLS_PEM_WRITE_C=y -CONFIG_MBEDTLS_X509_CRL_PARSE_C=y -CONFIG_MBEDTLS_X509_CSR_PARSE_C=y -CONFIG_MBEDTLS_ECP_C=y -CONFIG_MBEDTLS_ECDH_C=y -CONFIG_MBEDTLS_ECDSA_C=y -CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y -CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y - - - -CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y - - - - -CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y - - -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y - -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 - - -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" - - -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - - - -CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y -CONFIG_SPIFFS_MAX_PARTITIONS=3 -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y - -CONFIG_SPIFFS_PAGE_CHECK=y -CONFIG_SPIFFS_GC_MAX_RUNS=10 - -CONFIG_SPIFFS_PAGE_SIZE=256 -CONFIG_SPIFFS_OBJ_NAME_LEN=32 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y -CONFIG_SPIFFS_META_LENGTH=4 -CONFIG_SPIFFS_USE_MTIME=y - - - - - - -CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y -CONFIG_UNITY_ENABLE_FLOAT=y -CONFIG_UNITY_ENABLE_DOUBLE=y - -CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y - - -CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_VFS_SUPPORT_TERMIOS=y -CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - - - -# Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y - - - -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y - - -CONFIG_LOG_BOOTLOADER_LEVEL=3 - - -CONFIG_FLASHMODE_QIO=y - - - - - -CONFIG_MONITOR_BAUD_115200B=y - - - - -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 - -CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y - - - -CONFIG_STACK_CHECK_NONE=y - - - - - - - -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y - -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BLUEDROID_ENABLED=y -CONFIG_BTC_TASK_STACK_SIZE=3072 -CONFIG_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BTU_TASK_STACK_SIZE=4096 - -CONFIG_CLASSIC_BT_ENABLED=y -CONFIG_A2DP_ENABLE=y -CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 - -CONFIG_GATTS_ENABLE=y - -CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_GATTC_ENABLE=y - -CONFIG_BLE_SMP_ENABLE=y - - - -CONFIG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HCI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GAP_INITIAL_TRACE_LEVEL=2 -CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_PAN_INITIAL_TRACE_LEVEL=2 - - -CONFIG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_A2D_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_MCA_INITIAL_TRACE_LEVEL=2 - - -CONFIG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HID_INITIAL_TRACE_LEVEL=2 - - -CONFIG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_APPL_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GATT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_SMP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_OSI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 - -CONFIG_SMP_ENABLE=y -CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 -CONFIG_ADC2_DISABLE_DAC=y -CONFIG_SPIRAM_SUPPORT=y - - - -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 - -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y - - - - - -CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 -CONFIG_IPC_TASK_STACK_SIZE=1024 -CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART_DEFAULT=y - - -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 -CONFIG_INT_WDT=y -CONFIG_INT_WDT_TIMEOUT_MS=800 -CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y - -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y - -CONFIG_POST_EVENTS_FROM_ISR=y -CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_SW_COEXIST_ENABLE=y - - -CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 - -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -CONFIG_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_TIMER_QUEUE_LENGTH=10 - - -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=32 -CONFIG_TCP_MAXRTX=12 -CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1440 -CONFIG_TCP_MSL=60000 -CONFIG_TCP_SND_BUF_DEFAULT=8192 -CONFIG_TCP_WND_DEFAULT=32768 -CONFIG_TCP_RECVMBOX_SIZE=32 -CONFIG_TCP_QUEUE_OOSEQ=y - -CONFIG_TCP_OVERSIZE_MSS=y - - -CONFIG_UDP_RECVMBOX_SIZE=32 -CONFIG_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF - -CONFIG_PTHREAD_STACK_MIN=768 -CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y - - -CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y -# End of deprecated options diff --git a/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults deleted file mode 100644 index 90cf3dd7..00000000 --- a/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults +++ /dev/null @@ -1,1168 +0,0 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) Project Configuration -# -CONFIG_IDF_TARGET_ESP32=y -CONFIG_IDF_TARGET="esp32" - -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" - -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y -CONFIG_APP_COMPILE_TIME_DATE=y - - - - - -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y - - -CONFIG_BOOTLOADER_LOG_LEVEL=3 -CONFIG_BOOTLOADER_SPI_WP_PIN=7 -CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y - - -CONFIG_BOOTLOADER_WDT_ENABLE=y - -CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - - - - -CONFIG_ESPTOOLPY_PORT="com6" -CONFIG_ESPTOOLPY_BAUD_2MB=y - - - - -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_BAUD=2000000 -CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - - - -CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y - - - -CONFIG_ESPTOOLPY_FLASHFREQ="80m" - - -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y - - -CONFIG_ESPTOOLPY_FLASHSIZE="4MB" - -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_ESPTOOLPY_BEFORE_RESET=y - -CONFIG_ESPTOOLPY_BEFORE="default_reset" -CONFIG_ESPTOOLPY_AFTER_RESET=y - -CONFIG_ESPTOOLPY_AFTER="hard_reset" - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y - - - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 - - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_LOGGING_SLIMPROTO="info" -CONFIG_LOGGING_STREAM="info" -CONFIG_LOGGING_DECODE="info" -CONFIG_LOGGING_OUTPUT="info" -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y - - -CONFIG_BASIC_I2C_BT=y -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=26 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=22 - -CONFIG_I2S_BITS_PER_CHANNEL_16=y - -CONFIG_I2S_BITS_PER_CHANNEL=16 -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=26 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=15 -CONFIG_A2DP_SINK_NAME="SMSL BT4.2" -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_BT_SINK=y -CONFIG_BT_SINK_NAME="ESP32-BT" -CONFIG_BT_SINK_PIN=1234 -CONFIG_AIRPLAY_SINK=y -CONFIG_AIRPLAY_NAME="ESP32-AirPlay" -CONFIG_AIRPLAY_PORT="5000" - - - - - - - -CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 -CONFIG_WIFI_MANAGER_MAX_RETRY=2 -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 -CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y - - - -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y - - - - - - - -CONFIG_ESP32_APPTRACE_DEST_NONE=y - -CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BT_ENABLED=y - -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 - -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y - -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y - -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y - -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y - -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 - -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 - - -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_BLE_ENABLED=y -CONFIG_BT_GATTS_ENABLE=y - -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_BT_GATTC_ENABLE=y - -CONFIG_BT_BLE_SMP_ENABLE=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HID_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 -CONFIG_BT_ACL_CONNECTIONS=4 - - - -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c - - -CONFIG_ADC_DISABLE_DAC=y - -CONFIG_SPI_MASTER_ISR_IN_IRAM=y - -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y - - - -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y - -CONFIG_EFUSE_MAX_BLK_LEN=192 - - - -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y - - -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y - - -CONFIG_SPIRAM_SIZE=-1 - -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y - -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 - -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 - - - -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 - -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 - -CONFIG_ESP32_PANIC_PRINT_REBOOT=y - - -CONFIG_ESP32_DEBUG_OCDAWARE=y - -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y - - - -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y - - - -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y - - -CONFIG_ESP32_XTAL_FREQ=40 - - - - -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y - -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y - - -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y - -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y - -CONFIG_ETH_RMII_CLK_INPUT=y - -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_SMI_MDC_GPIO=23 -CONFIG_ETH_SMI_MDIO_GPIO=18 -CONFIG_ETH_PHY_USE_RST=y -CONFIG_ETH_PHY_RST_GPIO=5 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 - -CONFIG_ESP_EVENT_POST_FROM_ISR=y -CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y -CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y - -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 -CONFIG_HTTPD_ERR_RESP_NO_DELAY=y -CONFIG_HTTPD_PURGE_BUF_LEN=32 - - - -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y - - -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 - - - - - -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y - -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 - -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y - -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 - - -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y - - - - - - -CONFIG_FATFS_CODEPAGE_437=y - - - - - - - - - - - - - - - - - - - - -CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y - - -CONFIG_FATFS_FS_LOCK=0 -CONFIG_FATFS_TIMEOUT_MS=10000 -CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_TASK_PRIO=10 - -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 - -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y - -CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y - - -CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y - -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y - - -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 - -CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 - - - -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - -CONFIG_HEAP_POISONING_DISABLED=y - - -CONFIG_HEAP_TRACING_OFF=y - - - -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y - - - -CONFIG_LOG_DEFAULT_LEVEL_INFO=y - - -CONFIG_LOG_DEFAULT_LEVEL=3 -CONFIG_LOG_COLORS=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif" - - -CONFIG_LWIP_TIMERS_ONDEMAND=y -CONFIG_LWIP_MAX_SOCKETS=16 - -CONFIG_LWIP_SO_REUSE=y -CONFIG_LWIP_SO_REUSE_RXTOALL=y - - - - - -CONFIG_LWIP_ESP_GRATUITOUS_ARP=y -CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y - -CONFIG_LWIP_DHCPS_LEASE_UNIT=60 -CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 - -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 -CONFIG_LWIP_MAX_ACTIVE_TCP=16 -CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 -CONFIG_LWIP_TCP_MSS=1440 -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCP_QUEUE_OOSEQ=y - -CONFIG_LWIP_TCP_OVERSIZE_MSS=y - - -CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF - - - -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 -CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 - -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y - - -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 - - -CONFIG_MBEDTLS_HARDWARE_AES=y - - -CONFIG_MBEDTLS_HAVE_TIME=y - -CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y - - - -CONFIG_MBEDTLS_TLS_SERVER=y -CONFIG_MBEDTLS_TLS_CLIENT=y -CONFIG_MBEDTLS_TLS_ENABLED=y - -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y -CONFIG_MBEDTLS_SSL_RENEGOTIATION=y - -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y - -CONFIG_MBEDTLS_SSL_ALPN=y -CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_AES_C=y - - -CONFIG_MBEDTLS_RC4_DISABLED=y - - - - -CONFIG_MBEDTLS_CCM_C=y -CONFIG_MBEDTLS_GCM_C=y - -CONFIG_MBEDTLS_PEM_PARSE_C=y -CONFIG_MBEDTLS_PEM_WRITE_C=y -CONFIG_MBEDTLS_X509_CRL_PARSE_C=y -CONFIG_MBEDTLS_X509_CSR_PARSE_C=y -CONFIG_MBEDTLS_ECP_C=y -CONFIG_MBEDTLS_ECDH_C=y -CONFIG_MBEDTLS_ECDSA_C=y -CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y -CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y - - - -CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y - - - - -CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y - - -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y - -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 - - -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" - - -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - - - -CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y -CONFIG_SPIFFS_MAX_PARTITIONS=3 -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y - -CONFIG_SPIFFS_PAGE_CHECK=y -CONFIG_SPIFFS_GC_MAX_RUNS=10 - -CONFIG_SPIFFS_PAGE_SIZE=256 -CONFIG_SPIFFS_OBJ_NAME_LEN=32 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y -CONFIG_SPIFFS_META_LENGTH=4 -CONFIG_SPIFFS_USE_MTIME=y - - - - - - -CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y -CONFIG_UNITY_ENABLE_FLOAT=y -CONFIG_UNITY_ENABLE_DOUBLE=y - -CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y - - -CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_VFS_SUPPORT_TERMIOS=y -CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 - - - - -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - - - -# Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" - -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y - - - -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y - - -CONFIG_LOG_BOOTLOADER_LEVEL=3 - - -CONFIG_FLASHMODE_QIO=y - - - - - -CONFIG_MONITOR_BAUD_115200B=y - - - - -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 - -CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y - - - -CONFIG_STACK_CHECK_NONE=y - - - - - - - -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y - -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BLUEDROID_ENABLED=y -CONFIG_BTC_TASK_STACK_SIZE=3072 -CONFIG_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BTU_TASK_STACK_SIZE=4096 - -CONFIG_CLASSIC_BT_ENABLED=y -CONFIG_A2DP_ENABLE=y -CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 - -CONFIG_GATTS_ENABLE=y - -CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_GATTC_ENABLE=y - -CONFIG_BLE_SMP_ENABLE=y - - - -CONFIG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HCI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GAP_INITIAL_TRACE_LEVEL=2 -CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_PAN_INITIAL_TRACE_LEVEL=2 - - -CONFIG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_A2D_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_MCA_INITIAL_TRACE_LEVEL=2 - - -CONFIG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HID_INITIAL_TRACE_LEVEL=2 - - -CONFIG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_APPL_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GATT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_SMP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_OSI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 - -CONFIG_SMP_ENABLE=y -CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 -CONFIG_ADC2_DISABLE_DAC=y -CONFIG_SPIRAM_SUPPORT=y - - - -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 - -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y - - - - - -CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 -CONFIG_IPC_TASK_STACK_SIZE=1024 -CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART_DEFAULT=y - - -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 -CONFIG_INT_WDT=y -CONFIG_INT_WDT_TIMEOUT_MS=800 -CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y - -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y - -CONFIG_POST_EVENTS_FROM_ISR=y -CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_SW_COEXIST_ENABLE=y - - -CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 - -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -CONFIG_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_TIMER_QUEUE_LENGTH=10 - - -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=32 -CONFIG_TCP_MAXRTX=12 -CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1440 -CONFIG_TCP_MSL=60000 -CONFIG_TCP_SND_BUF_DEFAULT=8192 -CONFIG_TCP_WND_DEFAULT=32768 -CONFIG_TCP_RECVMBOX_SIZE=32 -CONFIG_TCP_QUEUE_OOSEQ=y - -CONFIG_TCP_OVERSIZE_MSS=y - - -CONFIG_UDP_RECVMBOX_SIZE=32 -CONFIG_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF - -CONFIG_PTHREAD_STACK_MIN=768 -CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y - - -CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y -# End of deprecated options diff --git a/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults b/sdkconfig.defaults similarity index 98% rename from build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults rename to sdkconfig.defaults index d2035933..a556b39c 100644 --- a/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults +++ b/sdkconfig.defaults @@ -11,11 +11,7 @@ CONFIG_IDF_TARGET="esp32" CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_COMPILE_TIME_DATE=y - - - - - +CONFIG_OTA_ALLOW_HTTP=y CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y @@ -28,10 +24,12 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - +CONFIG_ESPTOOLPY_BAUD_2MB=y CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -104,7 +102,6 @@ CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y @@ -602,7 +599,6 @@ CONFIG_LWIP_LOCAL_HOSTNAME="espressif" CONFIG_LWIP_TIMERS_ONDEMAND=y CONFIG_LWIP_MAX_SOCKETS=16 - CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE_RXTOALL=y @@ -779,9 +775,9 @@ CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_VFS_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_4096=y -CONFIG_WL_SECTOR_SIZE=4096 +CONFIG_WL_SECTOR_SIZE_512=y +#CONFIG_WL_SECTOR_SIZE_4096 is not defined +CONFIG_WL_SECTOR_SIZE=512 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 From 9b3d5dbfa7db3ccc1bbc01c136fc0d4ae9be81ae Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sat, 8 Feb 2020 15:13:25 -0800 Subject: [PATCH 02/23] Update README.md --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 50e12390..44b8206b 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,17 @@ To access NVS, in the webUI, go to credits and select "shows nvs editor". Go int ### I2C The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g. display). Leave it blank to disable I2C usage. Note that on SqueezeAMP, port must be 1. Syntax is ``` -bck=,ws=,do= +sda=,scl=,port=0|1 +``` +### SPI +The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The D/C parameter is needed for displays. Syntax is +``` +data=,clk=[,d/c=][,host=0|1|2] ``` ### DAC/I2S The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can also define these at compile time but nvs parameter takes precedence. Note that on SqueezeAMP and A1S, these are forced at runtime, so this parameter does not matter. If your DAC also requires i2c, then you must go the re-compile route. Syntax is ``` -sda=,scl=,port=0|1 +bck=,ws=,do= ``` ### SPDIF The NVS parameter "spdif_config" sets the i2s's gpio needed for SPDIF. @@ -53,7 +58,8 @@ bck=,ws=,do= ## Display The NVS parameter "display_config" sets the parameters for an optional display. Syntax is ``` -I2C|SPI,width=,height=[,address=][,HFlip][,VFlip] +I2C,width=,height=[address=][,HFlip][,VFlip] +SPI,width=,height=,cs=[,HFlip][,VFlip] ``` - VFlip and HFlip are optional can be used to change display orientation @@ -79,8 +85,9 @@ Finally, if you have an audio jack that supports insertion (set to GND when inse Syntax is: ``` -=Vcc|GND|amp|jack[,=Vcc|GND|amp|jack] +=Vcc|GND|amp|jack_h|jack_l[,=Vcc|GND|amp|jack_h|jack_l] ``` +NB: jack_h is for jack inserted sets GPIO to 1 and jack_l is for 0 ### Rotary Encoder One rotary encoder is supported, quadrature shift with press. Such encoders usually have 2 pins for encoders (A and B), and common C that must be set to ground and an optional SW pin for press. A, B and SW must be pulled up, so automatic pull-up is provided by ESP32, but you can add your own resistors. A bit of filtering on A and B (~470nF) helps for debouncing which is not made by software. From 0c27235cb417bf92972e67d08d39a918b1747c09 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sat, 8 Feb 2020 15:13:58 -0800 Subject: [PATCH 03/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 44b8206b..8391ff1d 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Leave it blank to disable SPDIF usage, you can also define them at compile time ``` bck=,ws=,do= ``` -## Display +### Display The NVS parameter "display_config" sets the parameters for an optional display. Syntax is ``` I2C,width=,height=[address=][,HFlip][,VFlip] From f4c3dd1e6e142682806f58dae92c3a2005416abe Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sat, 8 Feb 2020 23:55:42 -0800 Subject: [PATCH 04/23] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8391ff1d..7e8bc947 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,12 @@ Below is a difficult but functional 2-buttons interface for your decoding pleasu "longshifted":{"pressed":"BCTRLS_LEFT"}} ] ``` +### Battery / ADC +The NVS parameter "bat_config" sets the ADC1 channel used to measure battery/DC voltage. Scale is a float ratio applied to every sample of the 12 bits ADC. A measure is taken every 10s and an average is made every 5 minutes (not a sliding window). Syntax is +``` +channel=0..7,scale= +``` +NB: Set parameter to empty to disable battery reading ## Setting up ESP-IDF ### Docker You can use docker to build squeezelite-esp32 From cfae996fd3b75c5dde6cb8da50d757e03990f966 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 00:25:50 -0800 Subject: [PATCH 05/23] Refactoring - Add SPI display - Add SSD1326 (not fully tested) - Remove all but one dependecies to HW (#define) - Cleanup KProjectBuild - Update .defaults --- build-scripts/ESP32-A1S-sdkconfig.defaults | 22 ++ build-scripts/I2S-16MFlash-sdkconfig.defaults | 20 ++ build-scripts/I2S-4MFlash-sdkconfig.defaults | 20 ++ .../NonOTA-I2S-4MFlash-sdkconfig.defaults | 20 ++ .../NonOTA-SqueezeAmp-sdkconfig.defaults | 26 ++ .../SqueezeAmp4MBFlash-sdkconfig.defaults | 26 ++ .../SqueezeAmp8MBFlash-sdkconfig.defaults | 26 ++ components/cmd_i2c/cmd_i2ctools.c | 2 +- components/services/accessors.c | 28 +- components/services/accessors.h | 8 +- components/services/battery.c | 41 ++- components/services/component.mk | 4 +- components/services/display.c | 8 +- .../{driver_SSD1306.c => driver_SSD13x6.c} | 163 +++++----- components/services/globdefs.h | 18 +- components/services/monitor.c | 23 +- components/services/services.c | 31 +- .../tarablessd1306/ifaces/default_if_spi.c | 139 -------- components/services/tarablessd1306/ssd1306.c | 272 ---------------- components/services/tarablessd1306/ssd1306.h | 117 ------- .../tarablessd1306/ssd1306_default_if.h | 36 --- .../services/tarablessd1306/ssd1306_font.h | 91 ------ .../.gitignore | 0 .../CMakeLists.txt | 0 .../Kconfig | 0 .../LICENSE | 0 .../README.md | 0 .../component.mk | 0 .../fonts/LICENSE-apache | 0 .../fonts/LICENSE-liberation-mono | 0 .../fonts/font_droid_sans_fallback_11x13.c | 4 +- .../fonts/font_droid_sans_fallback_15x17.c | 4 +- .../fonts/font_droid_sans_fallback_24x28.c | 4 +- .../fonts/font_droid_sans_mono_13x24.c | 4 +- .../fonts/font_droid_sans_mono_16x31.c | 4 +- .../fonts/font_droid_sans_mono_7x13.c | 4 +- .../fonts/font_liberation_mono_13x21.c | 4 +- .../fonts/font_liberation_mono_17x30.c | 4 +- .../fonts/font_liberation_mono_9x15.c | 4 +- .../fonts/font_line_1.c | 4 +- .../fonts/font_line_2.c | 4 +- .../fonts/font_tarable7seg_16x32.c | 4 +- .../fonts/font_tarable7seg_32x64.c | 4 +- .../ifaces/default_if_i2c.c | 55 ++-- .../tarablessd13x6/ifaces/default_if_spi.c | 122 +++++++ components/services/tarablessd13x6/ssd13x6.c | 298 ++++++++++++++++++ components/services/tarablessd13x6/ssd13x6.h | 94 ++++++ .../tarablessd13x6/ssd13x6_default_if.h | 18 ++ .../ssd13x6_draw.c} | 50 +-- .../ssd13x6_draw.h} | 30 +- .../ssd13x6_err.h} | 12 +- .../ssd13x6_font.c} | 58 ++-- .../services/tarablessd13x6/ssd13x6_font.h | 91 ++++++ components/squeezelite/a1s/ac101.c | 4 +- .../squeezelite/external/dac_external.c | 8 +- components/squeezelite/output_i2s.c | 30 +- components/squeezelite/tas57xx/dac_57xx.c | 4 +- components/wifi-manager/index.html | 1 + main/Kconfig.projbuild | 172 ++++++---- main/esp_app_main.c | 34 +- 60 files changed, 1257 insertions(+), 1017 deletions(-) rename components/services/{driver_SSD1306.c => driver_SSD13x6.c} (71%) delete mode 100644 components/services/tarablessd1306/ifaces/default_if_spi.c delete mode 100644 components/services/tarablessd1306/ssd1306.c delete mode 100644 components/services/tarablessd1306/ssd1306.h delete mode 100644 components/services/tarablessd1306/ssd1306_default_if.h delete mode 100644 components/services/tarablessd1306/ssd1306_font.h rename components/services/{tarablessd1306 => tarablessd13x6}/.gitignore (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/CMakeLists.txt (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/Kconfig (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/LICENSE (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/README.md (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/component.mk (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/LICENSE-apache (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/LICENSE-liberation-mono (100%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_fallback_11x13.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_fallback_15x17.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_fallback_24x28.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_mono_13x24.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_mono_16x31.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_droid_sans_mono_7x13.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_liberation_mono_13x21.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_liberation_mono_17x30.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_liberation_mono_9x15.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_line_1.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_line_2.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_tarable7seg_16x32.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/fonts/font_tarable7seg_32x64.c (99%) rename components/services/{tarablessd1306 => tarablessd13x6}/ifaces/default_if_i2c.c (66%) create mode 100644 components/services/tarablessd13x6/ifaces/default_if_spi.c create mode 100644 components/services/tarablessd13x6/ssd13x6.c create mode 100644 components/services/tarablessd13x6/ssd13x6.h create mode 100644 components/services/tarablessd13x6/ssd13x6_default_if.h rename components/services/{tarablessd1306/ssd1306_draw.c => tarablessd13x6/ssd13x6_draw.c} (75%) rename components/services/{tarablessd1306/ssd1306_draw.h => tarablessd13x6/ssd13x6_draw.h} (55%) rename components/services/{tarablessd1306/ssd1306_err.h => tarablessd13x6/ssd13x6_err.h} (81%) rename components/services/{tarablessd1306/ssd1306_font.c => tarablessd13x6/ssd13x6_font.c} (80%) create mode 100644 components/services/tarablessd13x6/ssd13x6_font.h diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index 932fbd51..b26123a5 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -2,6 +2,28 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +# ESP32-A1S defaults (with AC101 codec) +CONFIG_I2S_NUM=0 +CONFIG_I2C_LOCKED=y +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_RED_GPIO=-1 +CONFIG_JACK_GPIO=-1 +CONFIG_BAT_CONFIG="" +CONFIG_I2S_BCK_IO=27 +CONFIG_I2S_WS_IO=26 +CONFIG_I2S_DO_IO=25 +CONFIG_I2S_DI_IO=35 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=27 +CONFIG_SPDIF_WS_IO=26 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/I2S-16MFlash-sdkconfig.defaults b/build-scripts/I2S-16MFlash-sdkconfig.defaults index 26777840..8767d5ec 100644 --- a/build-scripts/I2S-16MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-16MFlash-sdkconfig.defaults @@ -2,6 +2,26 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_RED_GPIO=-1 +CONFIG_JACK_GPIO=-1 +CONFIG_BAT_CONFIG="" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index 2e13b46c..d61358ce 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -2,6 +2,26 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_RED_GPIO=-1 +CONFIG_JACK_GPIO=-1 +CONFIG_BAT_CONFIG="" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults index 8aff6e8d..29b8b12d 100644 --- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults @@ -2,6 +2,26 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_RED_GPIO=-1 +CONFIG_JACK_GPIO=-1 +CONFIG_BAT_CONFIG="" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=-1 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults index 7fb4b8dd..020404b6 100644 --- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults @@ -2,6 +2,32 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +# SqueezeAMP defaults +CONFIG_JACK_LOCKED=y +CONFIG_BAT_LOCKED=y +CONFIG_I2C_LOCKED=y +CONFIG_SPDIF_LOCKED=y +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_RED_GPIO=13 +CONFIG_JACK_GPIO=34 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=15 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index 07ccf4c3..67329f92 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -2,6 +2,32 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +# SqueezeAMP defaults +CONFIG_JACK_LOCKED=y +CONFIG_BAT_LOCKED=y +CONFIG_I2C_LOCKED=y +CONFIG_SPDIF_LOCKED=y +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_RED_GPIO=13 +CONFIG_JACK_GPIO=34 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=15 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index 6a9cf85f..4681bb66 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -2,6 +2,32 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # + +# SqueezeAMP defaults +CONFIG_JACK_LOCKED=y +CONFIG_BAT_LOCKED=y +CONFIG_I2C_LOCKED=y +CONFIG_SPDIF_LOCKED=y +CONFIG_DISPLAY_CONFIG="" +CONFIG_I2C_CONFIG="" +CONFIG_SPI_CONFIG="" +CONFIG_SET_GPIO="" +CONFIG_ROTARY_ENCODER="" +CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_RED_GPIO=13 +CONFIG_JACK_GPIO=34 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_I2S_NUM=0 +CONFIG_I2S_BCK_IO=33 +CONFIG_I2S_WS_IO=25 +CONFIG_I2S_DO_IO=32 +CONFIG_I2S_DI_IO=-1 +CONFIG_SDIF_NUM=0 +CONFIG_SPDIF_BCK_IO=33 +CONFIG_SPDIF_WS_IO=25 +CONFIG_SPDIF_DO_IO=15 + CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" diff --git a/components/cmd_i2c/cmd_i2ctools.c b/components/cmd_i2c/cmd_i2ctools.c index 6a8d5662..a71f378a 100644 --- a/components/cmd_i2c/cmd_i2ctools.c +++ b/components/cmd_i2c/cmd_i2ctools.c @@ -32,7 +32,7 @@ static const char *TAG = "cmd_i2ctools"; static gpio_num_t i2c_gpio_sda = 19; static gpio_num_t i2c_gpio_scl = 18; static uint32_t i2c_frequency = 100000; -#ifdef CONFIG_SQUEEZEAMP +#ifdef I2C_LOCKED static i2c_port_t i2c_port = I2C_NUM_1; #else static i2c_port_t i2c_port = I2C_NUM_0; diff --git a/components/services/accessors.c b/components/services/accessors.c index cd12279e..1c2fe786 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -9,7 +9,8 @@ #include #include "esp_log.h" #include "driver/gpio.h" -#include +#include "driver/i2c.h" +#include "driver/spi_master.h" #include "config.h" #include "accessors.h" #include "globdefs.h" @@ -59,6 +60,31 @@ const i2c_config_t * config_i2c_get(int * i2c_port) { return &i2c; } +/**************************************************************************************** + * + */ +const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) { + char *nvs_item, *p; + static spi_bus_config_t spi = { + .mosi_io_num = -1, + .sclk_io_num = -1, + .miso_io_num = -1, + .quadwp_io_num = -1, + .quadhd_io_num = -1 + }; + + nvs_item = config_alloc_get(NVS_TYPE_STR, "spi_config"); + if (nvs_item) { + if ((p = strcasestr(nvs_item, "data")) != NULL) spi.mosi_io_num = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "clk")) != NULL) spi.sclk_io_num = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "d/c")) != NULL) spi_system_dc_gpio = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "host")) != NULL) spi_system_host = atoi(strchr(p, '=') + 1); + free(nvs_item); + } + if(spi_host) *spi_host = spi_system_host; + return &spi; +} + /**************************************************************************************** * */ diff --git a/components/services/accessors.h b/components/services/accessors.h index d5daada7..94775e22 100644 --- a/components/services/accessors.h +++ b/components/services/accessors.h @@ -10,7 +10,9 @@ #include "esp_system.h" #include "driver/i2c.h" +#include "driver/spi_master.h" -esp_err_t config_i2c_set(const i2c_config_t * config, int port); -const i2c_config_t * config_i2c_get(int * i2c_port); -void parse_set_GPIO(void (*cb)(int gpio, char *value)); +esp_err_t config_i2c_set(const i2c_config_t * config, int port); +const i2c_config_t * config_i2c_get(int * i2c_port); +const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host); +void parse_set_GPIO(void (*cb)(int gpio, char *value)); diff --git a/components/services/battery.c b/components/services/battery.c index d9a3e681..e3ab43fa 100644 --- a/components/services/battery.c +++ b/components/services/battery.c @@ -16,6 +16,7 @@ #include "esp_log.h" #include "driver/adc.h" #include "battery.h" +#include "config.h" /* There is a bug in esp32 which causes a spurious interrupt on gpio 36/39 when @@ -29,7 +30,8 @@ static const char *TAG = "battery"; static struct { - float sum, avg; + int channel; + float sum, avg, scale; int count; TimerHandle_t timer; } battery; @@ -37,23 +39,21 @@ static struct { /**************************************************************************************** * */ - int battery_value_svc(void) { +int battery_value_svc(void) { return battery.avg; } /**************************************************************************************** * */ -#ifdef CONFIG_SQUEEZEAMP +#ifdef CONFIG_BAT_CONFIG static void battery_callback(TimerHandle_t xTimer) { - - battery.sum += adc1_get_raw(ADC1_CHANNEL_7) / 4095. * (10+174)/10. * 1.1; + battery.sum += adc1_get_raw(battery.channel) * battery.scale / 4095.0; if (++battery.count == 30) { battery.avg = battery.sum / battery.count; battery.sum = battery.count = 0; ESP_LOGI(TAG, "Voltage %.2fV", battery.avg); } - } #endif @@ -61,13 +61,30 @@ static void battery_callback(TimerHandle_t xTimer) { * */ void battery_svc_init(void) { -#ifdef CONFIG_SQUEEZEAMP - ESP_LOGI(TAG, "Initializing battery"); +#ifdef CONFIG_BAT_CONFIG + char *p; + if ((p = strcasestr(CONFIG_BAT_CONFIG, "channel")) != NULL) battery.channel = atof(strchr(p, '=') + 1); + if ((p = strcasestr(CONFIG_BAT_CONFIG, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1); - adc1_config_width(ADC_WIDTH_BIT_12); - adc1_config_channel_atten(ADC1_CHANNEL_7, ADC_ATTEN_DB_0); +#ifndef BAT_LOCKED + char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0); + if (nvs_item) { + if ((p = strcasestr(nvs_item, "channel")) != NULL) battery.channel = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1); + free(nvs_item); + } +#endif - battery.timer = xTimerCreate("battery", BATTERY_TIMER / portTICK_RATE_MS, pdTRUE, NULL, battery_callback); - xTimerStart(battery.timer, portMAX_DELAY); + if (battery.scale) { + ESP_LOGI(TAG, "Battery measure channel: %u, scale %f", battery.channel, battery.scale); + + adc1_config_width(ADC_WIDTH_BIT_12); + adc1_config_channel_atten(battery.channel, ADC_ATTEN_DB_0); + + battery.timer = xTimerCreate("battery", BATTERY_TIMER / portTICK_RATE_MS, pdTRUE, NULL, battery_callback); + xTimerStart(battery.timer, portMAX_DELAY); + } else { + ESP_LOGI(TAG, "No battery"); + } #endif } diff --git a/components/services/component.mk b/components/services/component.mk index 501d3b4b..295c75c4 100644 --- a/components/services/component.mk +++ b/components/services/component.mk @@ -7,6 +7,6 @@ # please read the SDK documents if you need to do this. # -COMPONENT_SRCDIRS := . tarablessd1306 tarablessd1306/fonts tarablessd1306/ifaces +COMPONENT_SRCDIRS := . tarablessd13x6 tarablessd13x6/fonts tarablessd13x6/ifaces COMPONENT_ADD_INCLUDEDIRS := . -COMPONENT_ADD_INCLUDEDIRS += ./tarablessd1306 \ No newline at end of file +COMPONENT_ADD_INCLUDEDIRS += ./tarablessd13x6 \ No newline at end of file diff --git a/components/services/display.c b/components/services/display.c index 7dd7050f..1b938117 100644 --- a/components/services/display.c +++ b/components/services/display.c @@ -27,7 +27,7 @@ #include "display.h" // here we should include all possible drivers -extern struct display_s SSD1306_display; +extern struct display_s SSD13x6_display; struct display_s *display = NULL; @@ -66,8 +66,8 @@ void display_init(char *welcome) { if (item && *item) { char * drivername=strstr(item,"driver"); - if (!drivername || (drivername && strcasestr(drivername,"SSD1306"))) { - display = &SSD1306_display; + if (!drivername || (drivername && (strcasestr(drivername,"SSD1306") || strcasestr(drivername,"SSD1326")))) { + display = &SSD13x6_display; if (display->init(item, welcome)) { init = true; ESP_LOGI(TAG, "Display initialization successful"); @@ -79,7 +79,7 @@ void display_init(char *welcome) { ESP_LOGE(TAG,"Unknown display driver name in display config: %s",item); } } else { - ESP_LOGW(TAG, "no display"); + ESP_LOGI(TAG, "no display"); } if (init) { diff --git a/components/services/driver_SSD1306.c b/components/services/driver_SSD13x6.c similarity index 71% rename from components/services/driver_SSD1306.c rename to components/services/driver_SSD13x6.c index 963fc66b..3ebfa695 100644 --- a/components/services/driver_SSD1306.c +++ b/components/services/driver_SSD13x6.c @@ -25,10 +25,10 @@ #include "display.h" #include "globdefs.h" -#include "ssd1306.h" -#include "ssd1306_draw.h" -#include "ssd1306_font.h" -#include "ssd1306_default_if.h" +#include "ssd13x6.h" +#include "ssd13x6_draw.h" +#include "ssd13x6_font.h" +#include "ssd13x6_default_if.h" #define I2C_ADDRESS 0x3C @@ -50,13 +50,13 @@ static void on(bool state); static void update(void); // display structure for others to use -struct display_s SSD1306_display = { 0, 0, +struct display_s SSD13x6_display = { 0, 0, init, clear, set_font, on, brightness, text, line, stretch, update, draw, draw_cbr, NULL }; -// SSD1306 specific function -static struct SSD1306_Device Display; -static SSD1306_AddressMode AddressMode = AddressMode_Invalid; +// SSD13x6 specific function +static struct SSD13x6_Device Display; +static SSD13x6_AddressMode AddressMode = AddressMode_Invalid; static const unsigned char BitReverseTable256[] = { @@ -82,7 +82,7 @@ static const unsigned char BitReverseTable256[] = static struct { int y, space; - const struct SSD1306_FontDef *font; + const struct SSD13x6_FontDef *font; } lines[MAX_LINES]; /**************************************************************************************** @@ -90,32 +90,51 @@ static struct { */ static bool init(char *config, char *welcome) { bool res = false; + int width = -1, height = -1, model = SSD1306; + char *p; + + ESP_LOGI(TAG, "Initializing display with config: %s",config); + + // no time for smart parsing - this is for tinkerers + if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(config, "ssd1326")) != NULL) model = SSD1326; + + if (width == -1 || height == -1) { + ESP_LOGW(TAG, "No display configured %s [%d x %d]", config, width, height); + return false; + } if (strstr(config, "I2C")) { - int width = -1, height = -1, address = I2C_ADDRESS; - char *p; - ESP_LOGI(TAG, "Initializing I2C display with config: %s",config); - // no time for smart parsing - this is for tinkerers - if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1); - if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1); + int address = I2C_ADDRESS; + if ((p = strcasestr(config, "address")) != NULL) address = atoi(strchr(p, '=') + 1); - - if (width != -1 && height != -1) { - SSD1306_I2CMasterInitDefault( i2c_system_port, -1, -1 ) ; - SSD1306_I2CMasterAttachDisplayDefault( &Display, width, height, address, -1 ); - SSD1306_SetHFlip( &Display, strcasestr(config, "HFlip") ? true : false); - SSD1306_SetVFlip( &Display, strcasestr(config, "VFlip") ? true : false); - SSD1306_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); - SSD1306_display.width = width; - SSD1306_display.height = height; - text(DISPLAY_FONT_MEDIUM, DISPLAY_CENTERED, DISPLAY_CLEAR | DISPLAY_UPDATE, welcome); - ESP_LOGI(TAG, "Initialized I2C display %dx%d", width, height); - res = true; - } else { - ESP_LOGI(TAG, "Cannot initialized I2C display %s [%dx%d]", config, width, height); - } + + SSD13x6_I2CMasterInitDefault( i2c_system_port, -1, -1 ) ; + SSD13x6_I2CMasterAttachDisplayDefault( &Display, model, width, height, address, -1 ); + SSD13x6_SetHFlip( &Display, strcasestr(config, "HFlip") ? true : false); + SSD13x6_SetVFlip( &Display, strcasestr(config, "VFlip") ? true : false); + SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); + SSD13x6_display.width = width; + SSD13x6_display.height = height; + text(DISPLAY_FONT_MEDIUM, DISPLAY_CENTERED, DISPLAY_CLEAR | DISPLAY_UPDATE, welcome); + ESP_LOGI(TAG, "Display is I2C on port %u", address); + res = true; + } else if (strstr(config, "SPI")) { + int CS_pin = -1; + + if ((p = strcasestr(config, "CS")) != NULL) CS_pin = atoi(strchr(p, '=') + 1); + + SSD13x6_SPIMasterInitDefault( spi_system_host, spi_system_dc_gpio ); + SSD13x6_SPIMasterAttachDisplayDefault( &Display, model, width, height, CS_pin, -1 ); + SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); + SSD13x6_display.width = width; + SSD13x6_display.height = height; + text(DISPLAY_FONT_MEDIUM, DISPLAY_CENTERED, DISPLAY_CLEAR | DISPLAY_UPDATE, welcome); + ESP_LOGI(TAG, "Display is SPI host %u with CS:%d", spi_system_host, CS_pin); + } else { - ESP_LOGE(TAG, "Non-I2C display not supported. Display config %s", config); + ESP_LOGE(TAG, "Unknown display type"); } return res; @@ -125,8 +144,8 @@ static bool init(char *config, char *welcome) { * */ static void clear(void) { - SSD1306_Clear( &Display, SSD_COLOR_BLACK ); - SSD1306_Update( &Display ); + SSD13x6_Clear( &Display, SSD_COLOR_BLACK ); + SSD13x6_Update( &Display ); } /**************************************************************************************** @@ -186,13 +205,13 @@ static bool line(int num, int x, int attribute, char *text) { // always horizontal mode for text display if (AddressMode != AddressMode_Horizontal) { AddressMode = AddressMode_Horizontal; - SSD1306_SetDisplayAddressMode( &Display, AddressMode ); + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); } - SSD1306_SetFont( &Display, lines[num].font ); - if (attribute & DISPLAY_MONOSPACE) SSD1306_FontForceMonospace( &Display, true ); + SSD13x6_SetFont( &Display, lines[num].font ); + if (attribute & DISPLAY_MONOSPACE) SSD13x6_FontForceMonospace( &Display, true ); - width = SSD1306_FontMeasureString( &Display, text ); + width = SSD13x6_FontMeasureString( &Display, text ); // adjusting position, erase only EoL for rigth-justified if (x == DISPLAY_RIGHT) x = Display.Width - width - 1; @@ -202,15 +221,15 @@ static bool line(int num, int x, int attribute, char *text) { if (attribute & DISPLAY_CLEAR) { for (int c = (attribute & DISPLAY_ONLY_EOL) ? x : 0; c < Display.Width; c++) for (int y = lines[num].y; y < lines[num].y + lines[num].font->Height; y++) - SSD1306_DrawPixelFast( &Display, c, y, SSD_COLOR_BLACK ); + SSD13x6_DrawPixelFast( &Display, c, y, SSD_COLOR_BLACK ); } - SSD1306_FontDrawString( &Display, x, lines[num].y, text, SSD_COLOR_WHITE ); + SSD13x6_FontDrawString( &Display, x, lines[num].y, text, SSD_COLOR_WHITE ); ESP_LOGD(TAG, "displaying %s line %u (x:%d, attr:%u)", text, num+1, x, attribute); // update whole display if requested - if (attribute & DISPLAY_UPDATE) SSD1306_Update( &Display ); + if (attribute & DISPLAY_UPDATE) SSD13x6_Update( &Display ); return width + x < Display.Width; } @@ -225,8 +244,8 @@ static int stretch(int num, char *string, int max) { num--; // we might already fit - SSD1306_SetFont( &Display, lines[num].font ); - if (SSD1306_FontMeasureString( &Display, string ) <= Display.Width) return 0; + SSD13x6_SetFont( &Display, lines[num].font ); + if (SSD13x6_FontMeasureString( &Display, string ) <= Display.Width) return 0; // add some space for better visual strncat(string, space, max-len); @@ -234,10 +253,10 @@ static int stretch(int num, char *string, int max) { len = strlen(string); // mark the end of the extended string - boundary = SSD1306_FontMeasureString( &Display, string ); + boundary = SSD13x6_FontMeasureString( &Display, string ); // add a full display width - while (len < max && SSD1306_FontMeasureString( &Display, string ) - boundary < Display.Width) { + while (len < max && SSD13x6_FontMeasureString( &Display, string ) - boundary < Display.Width) { string[len++] = string[extra++]; string[len] = '\0'; } @@ -254,31 +273,31 @@ static void text(enum display_font_e font, enum display_pos_e pos, int attribute va_start(args, text); TextAnchor Anchor = TextAnchor_Center; - if (attribute & DISPLAY_CLEAR) SSD1306_Clear( &Display, SSD_COLOR_BLACK ); + if (attribute & DISPLAY_CLEAR) SSD13x6_Clear( &Display, SSD_COLOR_BLACK ); if (!text) return; switch(font) { case DISPLAY_FONT_LINE_1: - SSD1306_SetFont( &Display, &Font_line_1 ); + SSD13x6_SetFont( &Display, &Font_line_1 ); break; case DISPLAY_FONT_LINE_2: - SSD1306_SetFont( &Display, &Font_line_2 ); + SSD13x6_SetFont( &Display, &Font_line_2 ); break; case DISPLAY_FONT_SMALL: - SSD1306_SetFont( &Display, &Font_droid_sans_fallback_11x13 ); + SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_11x13 ); break; case DISPLAY_FONT_MEDIUM: case DISPLAY_FONT_DEFAULT: default: - SSD1306_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); + SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); break; case DISPLAY_FONT_LARGE: - SSD1306_SetFont( &Display, &Font_droid_sans_fallback_24x28 ); + SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_24x28 ); break; case DISPLAY_FONT_SEGMENT: - if (Display.Height == 32) SSD1306_SetFont( &Display, &Font_Tarable7Seg_16x32 ); - else SSD1306_SetFont( &Display, &Font_Tarable7Seg_32x64 ); + if (Display.Height == 32) SSD13x6_SetFont( &Display, &Font_Tarable7Seg_16x32 ); + else SSD13x6_SetFont( &Display, &Font_Tarable7Seg_32x64 ); break; } @@ -298,15 +317,15 @@ static void text(enum display_font_e font, enum display_pos_e pos, int attribute break; } - ESP_LOGD(TAG, "SSDD1306 displaying %s at %u with attribute %u", text, Anchor, attribute); + ESP_LOGD(TAG, "SSDD13x6 displaying %s at %u with attribute %u", text, Anchor, attribute); if (AddressMode != AddressMode_Horizontal) { AddressMode = AddressMode_Horizontal; - SSD1306_SetDisplayAddressMode( &Display, AddressMode ); + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); } - SSD1306_FontDrawAnchoredString( &Display, Anchor, text, SSD_COLOR_WHITE ); - if (attribute & DISPLAY_UPDATE) SSD1306_Update( &Display ); + SSD13x6_FontDrawAnchoredString( &Display, Anchor, text, SSD_COLOR_WHITE ); + if (attribute & DISPLAY_UPDATE) SSD13x6_Update( &Display ); va_end(args); } @@ -319,7 +338,7 @@ static void draw_cbr(u8_t *data, int height) { // force addressing mode by rows if (AddressMode != AddressMode_Horizontal) { AddressMode = AddressMode_Horizontal; - SSD1306_SetDisplayAddressMode( &Display, AddressMode ); + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); } // try to minimize I2C traffic which is very slow @@ -341,9 +360,9 @@ static void draw_cbr(u8_t *data, int height) { // now update the display by "byte rows" if (first--) { - SSD1306_SetColumnAddress( &Display, first, last ); - SSD1306_SetPageAddress( &Display, r, r); - SSD1306_WriteRawData( &Display, Display.Framebuffer + r*Display.Width + first, last - first + 1); + SSD13x6_SetColumnAddress( &Display, first, last ); + SSD13x6_SetPageAddress( &Display, r, r); + SSD13x6_WriteRawData( &Display, Display.Framebuffer + r*Display.Width + first, last - first + 1); } } #else @@ -354,15 +373,15 @@ static void draw_cbr(u8_t *data, int height) { for (int r = 0; r < height / 8; r++) Display.Framebuffer[c*Display.Height/8 + r] = BitReverseTable256[data[c*height/8 +r]]; - SSD1306_SetPageAddress( &Display, 0, height / 8 - 1); + SSD13x6_SetPageAddress( &Display, 0, height / 8 - 1); // force addressing mode by columns if (AddressMode != AddressMode_Vertical) { AddressMode = AddressMode_Vertical; - SSD1306_SetDisplayAddressMode( &Display, AddressMode ); + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); } - SSD1306_WriteRawData(&Display, Display.Framebuffer, Display.Width * Display.Height/8); + SSD13x6_WriteRawData(&Display, Display.Framebuffer, Display.Width * Display.Height/8); #endif } @@ -386,7 +405,7 @@ static void draw(int x1, int y1, int x2, int y2, bool by_column, u8_t *data) { if (AddressMode != AddressMode_Vertical) { AddressMode = AddressMode_Vertical; - SSD1306_SetDisplayAddressMode( &Display, AddressMode ); + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); } // copy the window and do row/col exchange @@ -405,32 +424,32 @@ static void draw(int x1, int y1, int x2, int y2, bool by_column, u8_t *data) { } } - SSD1306_SetColumnAddress( &Display, x1, x2); - SSD1306_SetPageAddress( &Display, y1/8, y2/8); - SSD1306_WriteRawData( &Display, data, (x2-x1 + 1) * ((y2-y1)/8 + 1)); + SSD13x6_SetColumnAddress( &Display, x1, x2); + SSD13x6_SetPageAddress( &Display, y1/8, y2/8); + SSD13x6_WriteRawData( &Display, data, (x2-x1 + 1) * ((y2-y1)/8 + 1)); } /**************************************************************************************** * Brightness */ static void brightness(u8_t level) { - SSD1306_DisplayOn( &Display ); - SSD1306_SetContrast( &Display, (uint8_t) level); + SSD13x6_DisplayOn( &Display ); + SSD13x6_SetContrast( &Display, (uint8_t) level); } /**************************************************************************************** * Display On/Off */ static void on(bool state) { - if (state) SSD1306_DisplayOn( &Display ); - else SSD1306_DisplayOff( &Display ); + if (state) SSD13x6_DisplayOn( &Display ); + else SSD13x6_DisplayOff( &Display ); } /**************************************************************************************** * Update */ static void update(void) { - SSD1306_Update( &Display ); + SSD13x6_Update( &Display ); } diff --git a/components/services/globdefs.h b/components/services/globdefs.h index 1ec0834f..92c93a42 100644 --- a/components/services/globdefs.h +++ b/components/services/globdefs.h @@ -21,16 +21,18 @@ #pragma once #define I2C_SYSTEM_PORT 1 +#define SPI_SYSTEM_HOST SPI2_HOST + extern int i2c_system_port; +extern int spi_system_host; +extern int spi_system_dc_gpio; extern bool gpio36_39_used; #ifdef CONFIG_SQUEEZEAMP -#define JACK_GPIO 34 -#define SPKFAULT_GPIO 2 // this requires a pull-up, so can't be >34 -#define LED_GREEN_GPIO 12 -#define LED_RED_GPIO 13 -#else -#define LED_GREEN_GPIO CONFIG_LED_GREEN_GPIO -#define LED_RED_GPIO CONFIG_LED_RED_GPIO -#define JACK_GPIO CONFIG_JACK_GPIO +#define SPKFAULT_GPIO 2 // this requires a pull-up, so can't be >34 +#define ADAC dac_tas57xx +#elif defined(CONFIG_A1S) +#define ADAC dac_a1s +#else +#define ADAC dac_external #endif diff --git a/components/services/monitor.c b/components/services/monitor.c index 906df187..75d44357 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -26,11 +26,7 @@ static const char *TAG = "monitor"; static TimerHandle_t monitor_timer; -#ifdef JACK_GPIO -static int jack_gpio = JACK_GPIO; -#else static int jack_gpio = -1; -#endif void (*jack_handler_svc)(bool inserted); bool jack_inserted_svc(void); @@ -68,12 +64,14 @@ bool jack_inserted_svc (void) { /**************************************************************************************** * */ +#ifdef SPKFAULT_GPIO static void spkfault_handler_default(void *id, button_event_e event, button_press_e mode, bool long_press) { ESP_LOGD(TAG, "Speaker status %s", event == BUTTON_PRESSED ? "faulty" : "normal"); if (event == BUTTON_PRESSED) led_on(LED_RED); else led_off(LED_RED); if (spkfault_handler_svc) (*spkfault_handler_svc)(event == BUTTON_PRESSED); } +#endif /**************************************************************************************** * @@ -117,16 +115,17 @@ void set_jack_gpio(int gpio, char *value) { void monitor_svc_init(void) { ESP_LOGI(TAG, "Initializing monitoring"); - // if JACK_GPIO is compiled-time defined set it there - if (jack_gpio != -1) { -#if JACK_GPIO_LEVEL == 1 - set_jack_gpio(JACK_GPIO, "jack_h"); +#ifdef CONFIG_JACK_GPIO + jack_gpio = CONFIG_JACK_GPIO; +#if CONFIG_JACK_GPIO_LEVEL == 1 + set_jack_gpio(CONFIG_JACK_GPIO, "jack_h"); #else - set_jack_gpio(JACK_GPIO, "jack_l"); + set_jack_gpio(CONFIG_JACK_GPIO, "jack_l"); #endif - } else { - parse_set_GPIO(set_jack_gpio); - } +#endif +#ifndef CONFIG_JACK_LOCKED + parse_set_GPIO(set_jack_gpio); +#endif #ifdef SPKFAULT_GPIO gpio_pad_select_gpio(SPKFAULT_GPIO); diff --git a/components/services/services.c b/components/services/services.c index 3f430e59..fc118741 100644 --- a/components/services/services.c +++ b/components/services/services.c @@ -22,6 +22,8 @@ extern void monitor_svc_init(void); extern void led_svc_init(void); int i2c_system_port = I2C_SYSTEM_PORT; +int spi_system_host = SPI_SYSTEM_HOST; +int spi_system_dc_gpio = -1; static const char *TAG = "services"; @@ -48,22 +50,20 @@ void set_power_gpio(int gpio, char *value) { * */ void services_init(void) { - char *nvs_item; - gpio_install_isr_service(0); -#ifdef CONFIG_SQUEEZEAMP +#ifdef CONFIG_I2C_LOCKED if (i2c_system_port == 0) { i2c_system_port = 1; - ESP_LOGE(TAG, "can't use i2c port 0 on SqueezeAMP"); + ESP_LOGE(TAG, "Port 0 is reserved for internal DAC use"); } #endif // set potential power GPIO parse_set_GPIO(set_power_gpio); + // shared I2C bus const i2c_config_t * i2c_config = config_i2c_get(&i2c_system_port); - ESP_LOGI(TAG,"Configuring I2C sda:%d scl:%d port:%u speed:%u", i2c_config->sda_io_num, i2c_config->scl_io_num, i2c_system_port, i2c_config->master.clk_speed); if (i2c_config->sda_io_num != -1 && i2c_config->scl_io_num != -1) { @@ -72,11 +72,26 @@ void services_init(void) { } else { ESP_LOGW(TAG, "no I2C configured"); } + + const spi_bus_config_t * spi_config = config_spi_get((spi_host_device_t*) &spi_system_host); + ESP_LOGI(TAG,"Configuring SPI data:%d clk:%d host:%u d/c:%d", spi_config->mosi_io_num, spi_config->sclk_io_num, spi_system_host, spi_system_dc_gpio); + + if (spi_config->mosi_io_num != -1 && spi_config->sclk_io_num != -1) { + spi_bus_initialize( spi_system_host, spi_config, 1 ); + if (spi_system_dc_gpio != 1) { + gpio_set_direction( spi_system_dc_gpio, GPIO_MODE_OUTPUT ); + gpio_set_level( spi_system_dc_gpio, 0 ); + } else { + ESP_LOGW(TAG, "No D/C GPIO set, SPI display will not work"); + } + } else { + ESP_LOGW(TAG, "no SPI configured"); + } - ESP_LOGD(TAG,"Configuring LEDs"); + ESP_LOGD(TAG,"Configuring LEDs green:%d red:%d", CONFIG_LED_GREEN_GPIO, CONFIG_LED_RED_GPIO); led_svc_init(); - led_config(LED_GREEN, LED_GREEN_GPIO, 0); - led_config(LED_RED, LED_RED_GPIO, 0); + led_config(LED_GREEN, CONFIG_LED_GREEN_GPIO, 0); + led_config(LED_RED, CONFIG_LED_RED_GPIO, 0); battery_svc_init(); monitor_svc_init(); diff --git a/components/services/tarablessd1306/ifaces/default_if_spi.c b/components/services/tarablessd1306/ifaces/default_if_spi.c deleted file mode 100644 index dab9f969..00000000 --- a/components/services/tarablessd1306/ifaces/default_if_spi.c +++ /dev/null @@ -1,139 +0,0 @@ -/** - * Copyright (c) 2017-2018 Tara Keeling - * - * This software is released under the MIT License. - * https://opensource.org/licenses/MIT - */ - -#include -#include -#include -#include -#include -#include -#include -#include "ssd1306.h" -#include "ssd1306_default_if.h" - -/* - * HACKHACKHACK: - * Conditional compiling in component.mk does not seem to be working. - * This workaround looks ugly, but should work. - */ -#if defined CONFIG_SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - -static const spi_host_device_t SPIHost = ( spi_host_device_t ) CONFIG_SSD1306_DEFAULT_SPI_HOST; - -static const int SPIFrequency = CONFIG_SSD1306_DEFAULT_SPI_FREQUENCY; -static const int MOSIPin = CONFIG_SSD1306_DEFAULT_SPI_MOSI_PIN; -static const int SCLKPin = CONFIG_SSD1306_DEFAULT_SPI_SCLK_PIN; -static const int DCPin = CONFIG_SSD1306_DEFAULT_SPI_DC_PIN; - -static const int SSD1306_SPI_Command_Mode = 0; -static const int SSD1306_SPI_Data_Mode = 1; - -static bool SPIDefaultWriteBytes( spi_device_handle_t SPIHandle, int WriteMode, const uint8_t* Data, size_t DataLength ); -static bool SPIDefaultWriteCommand( struct SSD1306_Device* DeviceHandle, SSDCmd Command ); -static bool SPIDefaultWriteData( struct SSD1306_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ); -static bool SPIDefaultReset( struct SSD1306_Device* DeviceHandle ); - -bool SSD1306_SPIMasterInitDefault( void ) { - spi_bus_config_t BusConfig = { - .sclk_io_num = SCLKPin, - .mosi_io_num = MOSIPin, - .miso_io_num = -1, - .quadwp_io_num = -1, - .quadhd_io_num = -1 - }; - - ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( DCPin, GPIO_MODE_OUTPUT ), return false ); - ESP_ERROR_CHECK_NONFATAL( gpio_set_level( DCPin, 0 ), return false ); - - ESP_ERROR_CHECK_NONFATAL( spi_bus_initialize( SPIHost, &BusConfig, 1 ), return false ); - return true; -} - -bool SSD1306_SPIMasterAttachDisplayDefault( struct SSD1306_Device* DeviceHandle, int Width, int Height, int CSForThisDisplay, int RSTForThisDisplay ) { - spi_device_interface_config_t SPIDeviceConfig; - spi_device_handle_t SPIDeviceHandle; - - NullCheck( DeviceHandle, return false ); - - ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( CSForThisDisplay, GPIO_MODE_OUTPUT ), return false ); - ESP_ERROR_CHECK_NONFATAL( gpio_set_level( CSForThisDisplay, 0 ), return false ); - - memset( &SPIDeviceConfig, 0, sizeof( spi_device_interface_config_t ) ); - - SPIDeviceConfig.clock_speed_hz = SPIFrequency; - SPIDeviceConfig.spics_io_num = CSForThisDisplay; - SPIDeviceConfig.queue_size = 1; - - if ( RSTForThisDisplay >= 0 ) { - ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( RSTForThisDisplay, GPIO_MODE_OUTPUT ), return false ); - ESP_ERROR_CHECK_NONFATAL( gpio_set_level( RSTForThisDisplay, 0 ), return false ); - } - - ESP_ERROR_CHECK_NONFATAL( spi_bus_add_device( SPIHost, &SPIDeviceConfig, &SPIDeviceHandle ), return false ); - - return SSD1306_Init_SPI( DeviceHandle, - Width, - Height, - RSTForThisDisplay, - CSForThisDisplay, - SPIDeviceHandle, - SPIDefaultWriteCommand, - SPIDefaultWriteData, - SPIDefaultReset - ); -} - -static bool SPIDefaultWriteBytes( spi_device_handle_t SPIHandle, int WriteMode, const uint8_t* Data, size_t DataLength ) { - spi_transaction_t SPITransaction; - - NullCheck( SPIHandle, return false ); - NullCheck( Data, return false ); - - if ( DataLength > 0 ) { - memset( &SPITransaction, 0, sizeof( spi_transaction_t ) ); - - SPITransaction.length = DataLength * 8; - SPITransaction.tx_buffer = Data; - - gpio_set_level( DCPin, WriteMode ); - ESP_ERROR_CHECK_NONFATAL( spi_device_transmit( SPIHandle, &SPITransaction ), return false ); - } - - return true; -} - -static bool SPIDefaultWriteCommand( struct SSD1306_Device* DeviceHandle, SSDCmd Command ) { - static uint8_t CommandByte = 0; - - NullCheck( DeviceHandle, return false ); - NullCheck( DeviceHandle->SPIHandle, return false ); - - CommandByte = Command; - - return SPIDefaultWriteBytes( DeviceHandle->SPIHandle, SSD1306_SPI_Command_Mode, &CommandByte, 1 ); -} - -static bool SPIDefaultWriteData( struct SSD1306_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ) { - NullCheck( DeviceHandle, return false ); - NullCheck( DeviceHandle->SPIHandle, return false ); - - return SPIDefaultWriteBytes( DeviceHandle->SPIHandle, SSD1306_SPI_Data_Mode, Data, DataLength ); -} - -static bool SPIDefaultReset( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return false ); - - if ( DeviceHandle->RSTPin >= 0 ) { - ESP_ERROR_CHECK_NONFATAL( gpio_set_level( DeviceHandle->RSTPin, 0 ), return false ); - vTaskDelay( pdMS_TO_TICKS( 100 ) ); - ESP_ERROR_CHECK_NONFATAL( gpio_set_level( DeviceHandle->RSTPin, 1 ), return false ); - } - - return true; -} - -#endif diff --git a/components/services/tarablessd1306/ssd1306.c b/components/services/tarablessd1306/ssd1306.c deleted file mode 100644 index 739cb975..00000000 --- a/components/services/tarablessd1306/ssd1306.c +++ /dev/null @@ -1,272 +0,0 @@ -/** - * Copyright (c) 2017-2018 Tara Keeling - * - * This software is released under the MIT License. - * https://opensource.org/licenses/MIT - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "ssd1306.h" - -#define COM_Disable_LR_Remap 0 -#define COM_Enable_LR_Remap BIT( 5 ) - -#define COM_Pins_Sequential 0 -#define COM_Pins_Alternative BIT( 4 ) - -#define COM_ScanDir_LR 0 -#define COM_ScanDir_RL 1 - -static bool SSD1306_Init( struct SSD1306_Device* DeviceHandle, int Width, int Height ); - -bool SSD1306_WriteCommand( struct SSD1306_Device* DeviceHandle, SSDCmd SSDCommand ) { - NullCheck( DeviceHandle, return false ); - NullCheck( DeviceHandle->WriteCommand, return false ); - - return ( DeviceHandle->WriteCommand ) ( DeviceHandle, SSDCommand ); -} - -bool SSD1306_WriteData( struct SSD1306_Device* DeviceHandle, uint8_t* Data, size_t DataLength ) { - NullCheck( DeviceHandle, return false ); - NullCheck( DeviceHandle->WriteData, return false ); - - return ( DeviceHandle->WriteData ) ( DeviceHandle, Data, DataLength ); -} - -void SSD1306_SetMuxRatio( struct SSD1306_Device* DeviceHandle, uint8_t Ratio ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, 0xA8 ); - SSD1306_WriteCommand( DeviceHandle, Ratio ); -} - -void SSD1306_SetDisplayOffset( struct SSD1306_Device* DeviceHandle, uint8_t Offset ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, 0xD3 ); - SSD1306_WriteCommand( DeviceHandle, Offset ); -} - -void SSD1306_SetDisplayStartLine( struct SSD1306_Device* DeviceHandle, int Line ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, - SSDCmd_Set_Display_Start_Line + ( uint32_t ) ( Line & 0x1F ) - ); -} - -/* - * This is all a big giant mystery that I have yet to figure out. - * Beware all ye who enter. - */ -static void SetCOMPinConfiguration( struct SSD1306_Device* DeviceHandle, uint32_t RemapCFG, uint32_t PinCFG, int ScanDir ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_COM_Pin_Config ); - SSD1306_WriteCommand( DeviceHandle, ( uint8_t ) ( RemapCFG | PinCFG | BIT( 1 ) ) ); - - SSD1306_WriteCommand( DeviceHandle, - ( ScanDir == COM_ScanDir_LR ) ? SSDCmd_Set_Display_VFlip_Off : SSDCmd_Set_Display_VFlip_On - ); -} - -void SSD1306_SetContrast( struct SSD1306_Device* DeviceHandle, uint8_t Contrast ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Contrast ); - SSD1306_WriteCommand( DeviceHandle, Contrast ); -} - -void SSD1306_EnableDisplayRAM( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Display_Show_RAM ); -} - -void SSD1306_DisableDisplayRAM( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Display_Ignore_RAM ); -} - -void SSD1306_SetInverted( struct SSD1306_Device* DeviceHandle, bool Inverted ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, ( Inverted == true ) ? SSDCmd_Set_Inverted_Display : SSDCmd_Set_Normal_Display ); -} - -void SSD1306_SetDisplayClocks( struct SSD1306_Device* DeviceHandle, uint32_t DisplayClockDivider, uint32_t OSCFrequency ) { - NullCheck( DeviceHandle, return ); - - DisplayClockDivider&= 0x0F; - OSCFrequency&= 0x0F; - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Display_CLK ); - SSD1306_WriteCommand( DeviceHandle, ( ( OSCFrequency << 4 ) | DisplayClockDivider ) ); -} - -/* There is no documentation for this command, but it is required during init. */ -static void EnableChargePumpRegulator( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Enable_Charge_Pump_Regulator ); - SSD1306_WriteCommand( DeviceHandle, 0x14 ); /* MAGIC NUMBER */ -} - -void SSD1306_DisplayOn( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Display_On ); -} - -void SSD1306_DisplayOff( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Display_Off ); -} - -void SSD1306_SetDisplayAddressMode( struct SSD1306_Device* DeviceHandle, SSD1306_AddressMode AddressMode ) { - NullCheck( DeviceHandle, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Memory_Addressing_Mode ); - SSD1306_WriteCommand( DeviceHandle, AddressMode ); -} - -void SSD1306_Update( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return ); - SSD1306_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1); - SSD1306_SetPageAddress( DeviceHandle, 0, DeviceHandle->Height / 8 - 1); - SSD1306_WriteData( DeviceHandle, DeviceHandle->Framebuffer, DeviceHandle->FramebufferSize ); -} - -void SSD1306_WriteRawData( struct SSD1306_Device* DeviceHandle, uint8_t* Data, size_t DataLength ) { - NullCheck( DeviceHandle, return ); - NullCheck( Data, return ); - - DataLength = DataLength > DeviceHandle->FramebufferSize ? DeviceHandle->FramebufferSize : DataLength; - - if ( DataLength > 0 ) { - SSD1306_WriteData( DeviceHandle, Data, DataLength ); - } -} - -void SSD1306_SetHFlip( struct SSD1306_Device* DeviceHandle, bool On ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, ( On == true ) ? SSDCmd_Set_Display_HFlip_On : SSDCmd_Set_Display_HFlip_Off ); -} - -void SSD1306_SetVFlip( struct SSD1306_Device* DeviceHandle, bool On ) { - NullCheck( DeviceHandle, return ); - SSD1306_WriteCommand( DeviceHandle, ( On == true ) ? SSDCmd_Set_Display_VFlip_On : SSDCmd_Set_Display_VFlip_Off ); -} - -void SSD1306_SetColumnAddress( struct SSD1306_Device* DeviceHandle, uint8_t Start, uint8_t End ) { - NullCheck( DeviceHandle, return ); - - CheckBounds( Start > SSD1306_Max_Col, return ); - CheckBounds( End > SSD1306_Max_Col, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Column_Address ); - SSD1306_WriteCommand( DeviceHandle, Start ); - SSD1306_WriteCommand( DeviceHandle, End ); -} - -void SSD1306_SetPageAddress( struct SSD1306_Device* DeviceHandle, uint8_t Start, uint8_t End ) { - NullCheck( DeviceHandle, return ); - - CheckBounds( Start > SSD1306_Max_Row, return ); - CheckBounds( End > SSD1306_Max_Row, return ); - - SSD1306_WriteCommand( DeviceHandle, SSDCmd_Set_Page_Address ); - SSD1306_WriteCommand( DeviceHandle, Start ); - SSD1306_WriteCommand( DeviceHandle, End ); -} - -bool SSD1306_HWReset( struct SSD1306_Device* DeviceHandle ) { - NullCheck( DeviceHandle, return 0 ); - - if ( DeviceHandle->Reset != NULL ) { - return ( DeviceHandle->Reset ) ( DeviceHandle ); - } - - /* This should always return true if there is no reset callback as - * no error would have occurred during the non existant reset. - */ - return true; -} - -static bool SSD1306_Init( struct SSD1306_Device* DeviceHandle, int Width, int Height ) { - DeviceHandle->Width = Width; - DeviceHandle->Height = Height; - DeviceHandle->FramebufferSize = ( DeviceHandle->Width * Height ) / 8; - - // DeviceHandle->Framebuffer = heap_caps_calloc( 1, DeviceHandle->FramebufferSize, MALLOC_CAP_INTERNAL ); - DeviceHandle->Framebuffer = calloc( 1, DeviceHandle->FramebufferSize ); - - NullCheck( DeviceHandle->Framebuffer, return false ); - - /* For those who have a hardware reset pin on their display */ - SSD1306_HWReset( DeviceHandle ); - - /* Init sequence according to SSD1306.pdf */ - SSD1306_SetMuxRatio( DeviceHandle, Height - 1 ); - SSD1306_SetDisplayOffset( DeviceHandle, 0x00 ); - SSD1306_SetDisplayStartLine( DeviceHandle, 0 ); - SSD1306_SetHFlip( DeviceHandle, false ); - SSD1306_SetVFlip( DeviceHandle, false ); - - if ( Height == 64 ) { - SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Alternative, COM_ScanDir_LR ); - } else { - SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Sequential, COM_ScanDir_LR ); - } - - SSD1306_SetContrast( DeviceHandle, 0x7F ); - SSD1306_DisableDisplayRAM( DeviceHandle ); - SSD1306_SetInverted( DeviceHandle, false ); - SSD1306_SetDisplayClocks( DeviceHandle, 0, 8 ); - EnableChargePumpRegulator( DeviceHandle ); - SSD1306_SetDisplayAddressMode( DeviceHandle, AddressMode_Vertical ); - SSD1306_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1 ); - SSD1306_SetPageAddress( DeviceHandle, 0, ( DeviceHandle->Height / 8 ) - 1 ); - SSD1306_EnableDisplayRAM( DeviceHandle ); - SSD1306_DisplayOn( DeviceHandle ); - SSD1306_Update( DeviceHandle ); - - return true; -} - -bool SSD1306_Init_I2C( struct SSD1306_Device* DeviceHandle, int Width, int Height, int I2CAddress, int ResetPin, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ) { - NullCheck( DeviceHandle, return false ); - NullCheck( WriteCommand, return false ); - NullCheck( WriteData, return false ); - - memset( DeviceHandle, 0, sizeof( struct SSD1306_Device ) ); - - DeviceHandle->WriteCommand = WriteCommand; - DeviceHandle->WriteData = WriteData; - DeviceHandle->Reset = Reset; - DeviceHandle->Address = I2CAddress; - DeviceHandle->RSTPin = ResetPin; - - return SSD1306_Init( DeviceHandle, Width, Height ); -} - -bool SSD1306_Init_SPI( struct SSD1306_Device* DeviceHandle, int Width, int Height, int ResetPin, int CSPin, spi_device_handle_t SPIHandle, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ) { - NullCheck( DeviceHandle, return false ); - NullCheck( WriteCommand, return false ); - NullCheck( WriteData, return false ); - - memset( DeviceHandle, 0, sizeof( struct SSD1306_Device ) ); - - DeviceHandle->WriteCommand = WriteCommand; - DeviceHandle->WriteData = WriteData; - DeviceHandle->Reset = Reset; - DeviceHandle->SPIHandle = SPIHandle; - DeviceHandle->RSTPin = ResetPin; - DeviceHandle->CSPin = CSPin; - - return SSD1306_Init( DeviceHandle, Width, Height ); -} diff --git a/components/services/tarablessd1306/ssd1306.h b/components/services/tarablessd1306/ssd1306.h deleted file mode 100644 index a546e5b9..00000000 --- a/components/services/tarablessd1306/ssd1306.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef _SSD1306_H_ -#define _SSD1306_H_ - -/* For uint(X)_t */ -#include - -/* For booooool */ -#include - -#include "sdkconfig.h" -#include "ssd1306_err.h" - -#define SSD_ALWAYS_INLINE __attribute__( ( always_inline ) ) - -#define SSD1306_Max_Col 127 -#define SSD1306_Max_Row 7 - -#if ! defined BIT -#define BIT( n ) ( 1 << n ) -#endif - -typedef enum { - SSDCmd_Set_Contrast = 0x81, - SSDCmd_Set_Display_Show_RAM = 0xA4, - SSDCmd_Set_Display_Ignore_RAM = 0xA5, - SSDCmd_Set_Normal_Display = 0xA6, - SSDCmd_Set_Inverted_Display = 0xA7, - SSDCmd_Set_Display_Off = 0xAE, - SSDCmd_Set_Display_On = 0xAF, - SSDCmd_Set_Memory_Addressing_Mode = 0x20, - SSDCmd_Set_Mux_Ratio = 0xA8, - SSDCmd_Nop = 0xE3, - SSDCmd_Set_Display_Offset = 0xD3, - SSDCmd_Set_Display_Start_Line = 0x40, - SSDCmd_Set_Display_HFlip_Off = 0xA0, - SSDCmd_Set_Display_HFlip_On = 0xA1, - SSDCmd_Set_Display_VFlip_Off = 0xC0, - SSDCmd_Set_Display_VFlip_On = 0xC8, - SSDCmd_Set_COM_Pin_Config = 0xDA, - SSDCmd_Set_Display_CLK = 0xD5, - SSDCmd_Enable_Charge_Pump_Regulator = 0x8D, - SSDCmd_Set_Column_Address = 0x21, - SSDCmd_Set_Page_Address = 0x22 -} SSDCmd; - -typedef enum { - AddressMode_Horizontal = 0, - AddressMode_Vertical, - AddressMode_Page, - AddressMode_Invalid -} SSD1306_AddressMode; - -struct SSD1306_Device; - -/* - * These can optionally return a succeed/fail but are as of yet unused in the driver. - */ -typedef bool ( *WriteCommandProc ) ( struct SSD1306_Device* DeviceHandle, SSDCmd Command ); -typedef bool ( *WriteDataProc ) ( struct SSD1306_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ); -typedef bool ( *ResetProc ) ( struct SSD1306_Device* DeviceHandle ); - -struct spi_device_t; -typedef struct spi_device_t* spi_device_handle_t; - -struct SSD1306_FontDef; - -struct SSD1306_Device { - /* I2C Specific */ - int Address; - - /* SPI Specific */ - spi_device_handle_t SPIHandle; - int RSTPin; - int CSPin; - - /* Everything else */ - int Width; - int Height; - - uint8_t* Framebuffer; - int FramebufferSize; - - WriteCommandProc WriteCommand; - WriteDataProc WriteData; - ResetProc Reset; - - const struct SSD1306_FontDef* Font; - bool FontForceProportional; - bool FontForceMonospace; -}; - -void SSD1306_SetMuxRatio( struct SSD1306_Device* DeviceHandle, uint8_t Ratio ); -void SSD1306_SetDisplayOffset( struct SSD1306_Device* DeviceHandle, uint8_t Offset ); -void SSD1306_SetDisplayStartLines( struct SSD1306_Device* DeviceHandle ); -void SSD1306_SetSegmentRemap( struct SSD1306_Device* DeviceHandle, bool Remap ); -void SSD1306_SetContrast( struct SSD1306_Device* DeviceHandle, uint8_t Contrast ); -void SSD1306_EnableDisplayRAM( struct SSD1306_Device* DeviceHandle ); -void SSD1306_DisableDisplayRAM( struct SSD1306_Device* DeviceHandle ); -void SSD1306_SetInverted( struct SSD1306_Device* DeviceHandle, bool Inverted ); -void SSD1306_SetHFlip( struct SSD1306_Device* DeviceHandle, bool On ); -void SSD1306_SetVFlip( struct SSD1306_Device* DeviceHandle, bool On ); -void SSD1306_DisplayOn( struct SSD1306_Device* DeviceHandle ); -void SSD1306_DisplayOff( struct SSD1306_Device* DeviceHandle ); -void SSD1306_SetDisplayAddressMode( struct SSD1306_Device* DeviceHandle, SSD1306_AddressMode AddressMode ); -void SSD1306_Update( struct SSD1306_Device* DeviceHandle ); -void SSD1306_SetDisplayClocks( struct SSD1306_Device* DeviceHandle, uint32_t DisplayClockDivider, uint32_t OSCFrequency ); -void SSD1306_WriteRawData( struct SSD1306_Device* DeviceHandle, uint8_t* Data, size_t DataLength ); - -void SSD1306_SetColumnAddress( struct SSD1306_Device* DeviceHandle, uint8_t Start, uint8_t End ); -void SSD1306_SetPageAddress( struct SSD1306_Device* DeviceHandle, uint8_t Start, uint8_t End ); - -bool SSD1306_HWReset( struct SSD1306_Device* DeviceHandle ); - -bool SSD1306_Init_I2C( struct SSD1306_Device* DeviceHandle, int Width, int Height, int I2CAddress, int ResetPin, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); -bool SSD1306_Init_SPI( struct SSD1306_Device* DeviceHandle, int Width, int Height, int ResetPin, int CSPin, spi_device_handle_t SPIHandle, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); - -#endif diff --git a/components/services/tarablessd1306/ssd1306_default_if.h b/components/services/tarablessd1306/ssd1306_default_if.h deleted file mode 100644 index a55478af..00000000 --- a/components/services/tarablessd1306/ssd1306_default_if.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _SSD1306_DEFAULT_IF_H_ -#define _SSD1306_DEFAULT_IF_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Initializes the i2c master - * - * Returns true on successful init of the i2c bus. - */ -bool SSD1306_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ); - -/* - * Attaches a display to the I2C bus using default communication functions. - * - * Params: - * DisplayHandle: Pointer to your SSD1306_Device object - * Width: Width of display - * Height: Height of display - * I2CAddress: Address of your display - * RSTPin: Optional GPIO pin to use for hardware reset, if none pass -1 for this parameter. - * - * Returns true on successful init of display. - */ -bool SSD1306_I2CMasterAttachDisplayDefault( struct SSD1306_Device* DisplayHandle, int Width, int Height, int I2CAddress, int RSTPin ); - -bool SSD1306_SPIMasterInitDefault( void ); -bool SSD1306_SPIMasterAttachDisplayDefault( struct SSD1306_Device* DeviceHandle, int Width, int Height, int CSForThisDisplay, int RSTForThisDisplay ); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/components/services/tarablessd1306/ssd1306_font.h b/components/services/tarablessd1306/ssd1306_font.h deleted file mode 100644 index 942bb026..00000000 --- a/components/services/tarablessd1306/ssd1306_font.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _SSD1306_FONT_H_ -#define _SSD1306_FONT_H_ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct SSD1306_Device; - -/* - * X-GLCD Font format: - * - * First byte of glyph is it's width in pixels. - * Each data byte represents 8 pixels going down from top to bottom. - * - * Example glyph layout for a 16x16 font - * 'a': [Glyph width][Pixel column 0][Pixel column 1] where the number of pixel columns is the font height divided by 8 - * 'b': [Glyph width][Pixel column 0][Pixel column 1]... - * 'c': And so on... - */ - -struct SSD1306_FontDef { - const uint8_t* FontData; - - int Width; - int Height; - - int StartChar; - int EndChar; - - bool Monospace; -}; - -typedef enum { - TextAnchor_East = 0, - TextAnchor_West, - TextAnchor_North, - TextAnchor_South, - TextAnchor_NorthEast, - TextAnchor_NorthWest, - TextAnchor_SouthEast, - TextAnchor_SouthWest, - TextAnchor_Center -} TextAnchor; - -bool SSD1306_SetFont( struct SSD1306_Device* Display, const struct SSD1306_FontDef* Font ); - -void SSD1306_FontForceProportional( struct SSD1306_Device* Display, bool Force ); -void SSD1306_FontForceMonospace( struct SSD1306_Device* Display, bool Force ); - -int SSD1306_FontGetWidth( struct SSD1306_Device* Display ); -int SSD1306_FontGetHeight( struct SSD1306_Device* Display ); - -int SSD1306_FontGetMaxCharsPerRow( struct SSD1306_Device* Display ); -int SSD1306_FontGetMaxCharsPerColumn( struct SSD1306_Device* Display ); - -int SSD1306_FontGetCharWidth( struct SSD1306_Device* Display, char Character ); -int SSD1306_FontGetCharHeight( struct SSD1306_Device* Display ); -int SSD1306_FontMeasureString( struct SSD1306_Device* Display, const char* Text );\ - -void SSD1306_FontDrawChar( struct SSD1306_Device* Display, char Character, int x, int y, int Color ); -void SSD1306_FontDrawString( struct SSD1306_Device* Display, int x, int y, const char* Text, int Color ); -void SSD1306_FontDrawAnchoredString( struct SSD1306_Device* Display, TextAnchor Anchor, const char* Text, int Color ); -void SSD1306_FontGetAnchoredStringCoords( struct SSD1306_Device* Display, int* OutX, int* OutY, TextAnchor Anchor, const char* Text ); - -extern const struct SSD1306_FontDef Font_droid_sans_fallback_11x13; -extern const struct SSD1306_FontDef Font_droid_sans_fallback_15x17; -extern const struct SSD1306_FontDef Font_droid_sans_fallback_24x28; - -extern const struct SSD1306_FontDef Font_droid_sans_mono_7x13; -extern const struct SSD1306_FontDef Font_droid_sans_mono_13x24; -extern const struct SSD1306_FontDef Font_droid_sans_mono_16x31; - -extern const struct SSD1306_FontDef Font_liberation_mono_9x15; -extern const struct SSD1306_FontDef Font_liberation_mono_13x21; -extern const struct SSD1306_FontDef Font_liberation_mono_17x30; - -extern const struct SSD1306_FontDef Font_Tarable7Seg_16x32; -extern const struct SSD1306_FontDef Font_Tarable7Seg_32x64; - -extern const struct SSD1306_FontDef Font_line_1; -extern const struct SSD1306_FontDef Font_line_2; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/components/services/tarablessd1306/.gitignore b/components/services/tarablessd13x6/.gitignore similarity index 100% rename from components/services/tarablessd1306/.gitignore rename to components/services/tarablessd13x6/.gitignore diff --git a/components/services/tarablessd1306/CMakeLists.txt b/components/services/tarablessd13x6/CMakeLists.txt similarity index 100% rename from components/services/tarablessd1306/CMakeLists.txt rename to components/services/tarablessd13x6/CMakeLists.txt diff --git a/components/services/tarablessd1306/Kconfig b/components/services/tarablessd13x6/Kconfig similarity index 100% rename from components/services/tarablessd1306/Kconfig rename to components/services/tarablessd13x6/Kconfig diff --git a/components/services/tarablessd1306/LICENSE b/components/services/tarablessd13x6/LICENSE similarity index 100% rename from components/services/tarablessd1306/LICENSE rename to components/services/tarablessd13x6/LICENSE diff --git a/components/services/tarablessd1306/README.md b/components/services/tarablessd13x6/README.md similarity index 100% rename from components/services/tarablessd1306/README.md rename to components/services/tarablessd13x6/README.md diff --git a/components/services/tarablessd1306/component.mk b/components/services/tarablessd13x6/component.mk similarity index 100% rename from components/services/tarablessd1306/component.mk rename to components/services/tarablessd13x6/component.mk diff --git a/components/services/tarablessd1306/fonts/LICENSE-apache b/components/services/tarablessd13x6/fonts/LICENSE-apache similarity index 100% rename from components/services/tarablessd1306/fonts/LICENSE-apache rename to components/services/tarablessd13x6/fonts/LICENSE-apache diff --git a/components/services/tarablessd1306/fonts/LICENSE-liberation-mono b/components/services/tarablessd13x6/fonts/LICENSE-liberation-mono similarity index 100% rename from components/services/tarablessd1306/fonts/LICENSE-liberation-mono rename to components/services/tarablessd13x6/fonts/LICENSE-liberation-mono diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c index 6a4cab9c..957b261e 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Fallback11x13[ ] = { 0x05, 0x00, 0x10, 0xE4, 0x11, 0x00, 0x0E, 0x00, 0x02, 0xE4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_fallback_11x13 = { +const struct SSD13x6_FontDef Font_droid_sans_fallback_11x13 = { Droid_Sans_Fallback11x13, 11, 13, diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c index c9f46eed..17e1b75a 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Fallback15x17[ ] = { 0x07, 0xC0, 0x00, 0x01, 0x00, 0x03, 0x01, 0x10, 0x8C, 0x00, 0x00, 0x70, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x03, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_fallback_15x17 = { +const struct SSD13x6_FontDef Font_droid_sans_fallback_15x17 = { Droid_Sans_Fallback15x17, 15, 17, diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c index ee099074..5719a0fe 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Fallback24x28[ ] = { 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x0C, 0xE0, 0xF0, 0x03, 0x0C, 0xE0, 0x80, 0x0F, 0x0E, 0x00, 0x00, 0xFE, 0x07, 0x00, 0x00, 0xF0, 0x01, 0x00, 0x00, 0x7E, 0x00, 0xE0, 0x80, 0x0F, 0x00, 0xE0, 0xF0, 0x03, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_fallback_24x28 = { +const struct SSD13x6_FontDef Font_droid_sans_fallback_24x28 = { Droid_Sans_Fallback24x28, 24, 28, diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_mono_13x24.c b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_mono_13x24.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c index d9db8a72..95bb2321 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_mono_13x24.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Mono13x24[ ] = { 0x0C, 0x00, 0x00, 0x00, 0x80, 0x00, 0xC0, 0x80, 0x07, 0xC0, 0x00, 0x1E, 0xC0, 0x18, 0xF8, 0xC0, 0x18, 0xC0, 0x7F, 0x00, 0x00, 0x1E, 0x00, 0xC0, 0x07, 0x18, 0xF8, 0x00, 0x18, 0x3E, 0x00, 0x80, 0x07, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_mono_13x24 = { +const struct SSD13x6_FontDef Font_droid_sans_mono_13x24 = { Droid_Sans_Mono13x24, 13, 24, diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_mono_16x31.c b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_mono_16x31.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c index 5f1484bc..bcab6249 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_mono_16x31.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Mono16x31[ ] = { 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x60, 0x00, 0x78, 0x00, 0x60, 0x00, 0xF8, 0x01, 0x60, 0x00, 0xE0, 0x07, 0x60, 0xE0, 0x00, 0x3F, 0x70, 0xE0, 0x00, 0xFC, 0x3C, 0x40, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0xE0, 0x07, 0x40, 0x00, 0xF8, 0x01, 0xE0, 0x00, 0x3F, 0x00, 0xE0, 0xC0, 0x0F, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_mono_16x31 = { +const struct SSD13x6_FontDef Font_droid_sans_mono_16x31 = { Droid_Sans_Mono16x31, 16, 31, diff --git a/components/services/tarablessd1306/fonts/font_droid_sans_mono_7x13.c b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_droid_sans_mono_7x13.c rename to components/services/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c index ee5f2cfc..dc84c1d9 100644 --- a/components/services/tarablessd1306/fonts/font_droid_sans_mono_7x13.c +++ b/components/services/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Droid_Sans_Mono7x13[ ] = { 0x06, 0x00, 0x00, 0x30, 0x10, 0xC4, 0x10, 0x00, 0x0F, 0xC4, 0x01, 0x30, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_droid_sans_mono_7x13 = { +const struct SSD13x6_FontDef Font_droid_sans_mono_7x13 = { Droid_Sans_Mono7x13, 7, 13, diff --git a/components/services/tarablessd1306/fonts/font_liberation_mono_13x21.c b/components/services/tarablessd13x6/fonts/font_liberation_mono_13x21.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_liberation_mono_13x21.c rename to components/services/tarablessd13x6/fonts/font_liberation_mono_13x21.c index 8d8a38b2..1cd5b46e 100644 --- a/components/services/tarablessd1306/fonts/font_liberation_mono_13x21.c +++ b/components/services/tarablessd13x6/fonts/font_liberation_mono_13x21.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Liberation_Mono13x21[ ] = { 0x0C, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xC0, 0x03, 0x10, 0x00, 0x0F, 0x10, 0x0C, 0x3C, 0x18, 0x00, 0xE0, 0x0D, 0x00, 0x80, 0x07, 0x00, 0xE0, 0x01, 0x0C, 0x3C, 0x00, 0x00, 0x0F, 0x00, 0xC0, 0x03, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_liberation_mono_13x21 = { +const struct SSD13x6_FontDef Font_liberation_mono_13x21 = { Liberation_Mono13x21, 13, 21, diff --git a/components/services/tarablessd1306/fonts/font_liberation_mono_17x30.c b/components/services/tarablessd13x6/fonts/font_liberation_mono_17x30.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_liberation_mono_17x30.c rename to components/services/tarablessd13x6/fonts/font_liberation_mono_17x30.c index e3432061..c44307ef 100644 --- a/components/services/tarablessd1306/fonts/font_liberation_mono_17x30.c +++ b/components/services/tarablessd13x6/fonts/font_liberation_mono_17x30.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Liberation_Mono17x30[] = { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x30, 0x00, 0x3F, 0x00, 0x30, 0x00, 0xFC, 0x01, 0x30, 0x38, 0xE0, 0x07, 0x38, 0x38, 0x00, 0x3F, 0x1C, 0x00, 0x00, 0xFC, 0x0F, 0x00, 0x00, 0xE0, 0x07, 0x00, 0x00, 0xF8, 0x01, 0x38, 0x00, 0x3F, 0x00, 0x38, 0xE0, 0x07, 0x00, 0x38, 0xFC, 0x01, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_liberation_mono_17x30 = { +const struct SSD13x6_FontDef Font_liberation_mono_17x30 = { Liberation_Mono17x30, 17, 30, diff --git a/components/services/tarablessd1306/fonts/font_liberation_mono_9x15.c b/components/services/tarablessd13x6/fonts/font_liberation_mono_9x15.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_liberation_mono_9x15.c rename to components/services/tarablessd13x6/fonts/font_liberation_mono_9x15.c index a872ebd7..3d7b1d9d 100644 --- a/components/services/tarablessd1306/fonts/font_liberation_mono_9x15.c +++ b/components/services/tarablessd13x6/fonts/font_liberation_mono_9x15.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Liberation_Mono9x15[ ] = { 0x08, 0x00, 0x00, 0x30, 0x40, 0xC6, 0x41, 0x06, 0x67, 0x00, 0x18, 0x06, 0x07, 0xC6, 0x01, 0x30, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_liberation_mono_9x15 = { +const struct SSD13x6_FontDef Font_liberation_mono_9x15 = { Liberation_Mono9x15, 9, 15, diff --git a/components/services/tarablessd1306/fonts/font_line_1.c b/components/services/tarablessd13x6/fonts/font_line_1.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_line_1.c rename to components/services/tarablessd13x6/fonts/font_line_1.c index d041166e..d23345a7 100644 --- a/components/services/tarablessd1306/fonts/font_line_1.c +++ b/components/services/tarablessd13x6/fonts/font_line_1.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -214,7 +214,7 @@ static const uint8_t Square721_BT11x14[] = { 0x06, 0x00, 0x00, 0xE8, 0x03, 0xB0, 0x04, 0xA0, 0x04, 0xA0, 0x04, 0xE0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char è }; -const struct SSD1306_FontDef Font_line_1 = { +const struct SSD13x6_FontDef Font_line_1 = { Square721_BT11x14, 11, 14, diff --git a/components/services/tarablessd1306/fonts/font_line_2.c b/components/services/tarablessd13x6/fonts/font_line_2.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_line_2.c rename to components/services/tarablessd13x6/fonts/font_line_2.c index 39231967..19cc11cf 100644 --- a/components/services/tarablessd1306/fonts/font_line_2.c +++ b/components/services/tarablessd13x6/fonts/font_line_2.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -237,7 +237,7 @@ static const uint8_t Archivo_Narrow18x24[] = { 0x0A, 0x00, 0x01, 0x00, 0x00, 0x1F, 0xE0, 0x38, 0xFF, 0xE0, 0x38, 0xFC, 0xF7, 0x00, 0xE0, 0x7F, 0x00, 0x00, 0x3F, 0x38, 0xF0, 0x0F, 0x38, 0xFF, 0x01, 0x00, 0x1F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char ÿ }; -const struct SSD1306_FontDef Font_line_2 = { +const struct SSD13x6_FontDef Font_line_2 = { Archivo_Narrow18x24, 18, 24, diff --git a/components/services/tarablessd1306/fonts/font_tarable7seg_16x32.c b/components/services/tarablessd13x6/fonts/font_tarable7seg_16x32.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_tarable7seg_16x32.c rename to components/services/tarablessd13x6/fonts/font_tarable7seg_16x32.c index 323cdc24..d40ed086 100644 --- a/components/services/tarablessd1306/fonts/font_tarable7seg_16x32.c +++ b/components/services/tarablessd13x6/fonts/font_tarable7seg_16x32.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -109,7 +109,7 @@ static const uint8_t Tarable7Seg_16x32[ ] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char  }; -const struct SSD1306_FontDef Font_Tarable7Seg_16x32 = { +const struct SSD13x6_FontDef Font_Tarable7Seg_16x32 = { Tarable7Seg_16x32, 16, 32, diff --git a/components/services/tarablessd1306/fonts/font_tarable7seg_32x64.c b/components/services/tarablessd13x6/fonts/font_tarable7seg_32x64.c similarity index 99% rename from components/services/tarablessd1306/fonts/font_tarable7seg_32x64.c rename to components/services/tarablessd13x6/fonts/font_tarable7seg_32x64.c index aaf2ab88..fc659328 100644 --- a/components/services/tarablessd1306/fonts/font_tarable7seg_32x64.c +++ b/components/services/tarablessd13x6/fonts/font_tarable7seg_32x64.c @@ -1,4 +1,4 @@ -#include +#include //WARNING: This Font Require X-GLCD Lib. // You can not use it with MikroE GLCD Lib. @@ -109,7 +109,7 @@ static const uint8_t Tarable7Seg_32x64[ ] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Code for char  }; -const struct SSD1306_FontDef Font_Tarable7Seg_32x64 = { +const struct SSD13x6_FontDef Font_Tarable7Seg_32x64 = { Tarable7Seg_32x64, 32, 64, diff --git a/components/services/tarablessd1306/ifaces/default_if_i2c.c b/components/services/tarablessd13x6/ifaces/default_if_i2c.c similarity index 66% rename from components/services/tarablessd1306/ifaces/default_if_i2c.c rename to components/services/tarablessd13x6/ifaces/default_if_i2c.c index 190c479c..4a44d716 100644 --- a/components/services/tarablessd1306/ifaces/default_if_i2c.c +++ b/components/services/tarablessd13x6/ifaces/default_if_i2c.c @@ -11,19 +11,18 @@ #include #include #include -#include "ssd1306.h" -#include "ssd1306_default_if.h" +#include "ssd13x6.h" +#include "ssd13x6_default_if.h" -static const int I2CDisplaySpeed = CONFIG_DISPLAY_I2C_SPEED; static int I2CPortNumber; -static const int SSD1306_I2C_COMMAND_MODE = 0x80; -static const int SSD1306_I2C_DATA_MODE = 0x40; +static const int SSD13x6_I2C_COMMAND_MODE = 0x80; +static const int SSD13x6_I2C_DATA_MODE = 0x40; static bool I2CDefaultWriteBytes( int Address, bool IsCommand, const uint8_t* Data, size_t DataLength ); -static bool I2CDefaultWriteCommand( struct SSD1306_Device* Display, SSDCmd Command ); -static bool I2CDefaultWriteData( struct SSD1306_Device* Display, const uint8_t* Data, size_t DataLength ); -static bool I2CDefaultReset( struct SSD1306_Device* Display ); +static bool I2CDefaultWriteCommand( struct SSD13x6_Device* Display, SSDCmd Command ); +static bool I2CDefaultWriteData( struct SSD13x6_Device* Display, const uint8_t* Data, size_t DataLength ); +static bool I2CDefaultReset( struct SSD13x6_Device* Display ); /* * Initializes the i2c master with the parameters specified @@ -31,7 +30,7 @@ static bool I2CDefaultReset( struct SSD1306_Device* Display ); * * Returns true on successful init of the i2c bus. */ -bool SSD1306_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ) { +bool SSD13x6_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ) { I2CPortNumber = PortNumber; if (SDA != -1 && SCL != -1) { @@ -42,7 +41,7 @@ bool SSD1306_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ) { Config.sda_pullup_en = GPIO_PULLUP_ENABLE; Config.scl_io_num = SCL; Config.scl_pullup_en = GPIO_PULLUP_ENABLE; - Config.master.clk_speed = I2CDisplaySpeed; + Config.master.clk_speed = 250000; ESP_ERROR_CHECK_NONFATAL( i2c_param_config( I2CPortNumber, &Config ), return false ); ESP_ERROR_CHECK_NONFATAL( i2c_driver_install( I2CPortNumber, Config.mode, 0, 0, 0 ), return false ); @@ -55,7 +54,7 @@ bool SSD1306_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ) { * Attaches a display to the I2C bus using default communication functions. * * Params: - * DisplayHandle: Pointer to your SSD1306_Device object + * DisplayHandle: Pointer to your SSD13x6_Device object * Width: Width of display * Height: Height of display * I2CAddress: Address of your display @@ -63,15 +62,17 @@ bool SSD1306_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ) { * * Returns true on successful init of display. */ -bool SSD1306_I2CMasterAttachDisplayDefault( struct SSD1306_Device* DisplayHandle, int Width, int Height, int I2CAddress, int RSTPin ) { - NullCheck( DisplayHandle, return false ); +bool SSD13x6_I2CMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int I2CAddress, int RSTPin ) { + NullCheck( DeviceHandle, return false ); if ( RSTPin >= 0 ) { ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( RSTPin, GPIO_MODE_OUTPUT ), return false ); ESP_ERROR_CHECK_NONFATAL( gpio_set_level( RSTPin, 1 ), return false ); } - - return SSD1306_Init_I2C( DisplayHandle, + + DeviceHandle->Model = Model; + + return SSD13x6_Init_I2C( DeviceHandle, Width, Height, I2CAddress, @@ -89,36 +90,40 @@ static bool I2CDefaultWriteBytes( int Address, bool IsCommand, const uint8_t* Da NullCheck( Data, return false ); if ( ( CommandHandle = i2c_cmd_link_create( ) ) != NULL ) { - ModeByte = ( IsCommand == true ) ? SSD1306_I2C_COMMAND_MODE: SSD1306_I2C_DATA_MODE; + ModeByte = ( IsCommand == true ) ? SSD13x6_I2C_COMMAND_MODE: SSD13x6_I2C_DATA_MODE; - ESP_ERROR_CHECK_NONFATAL( i2c_master_start( CommandHandle ), return false ); - ESP_ERROR_CHECK_NONFATAL( i2c_master_write_byte( CommandHandle, ( Address << 1 ) | I2C_MASTER_WRITE, true ), return false ); - ESP_ERROR_CHECK_NONFATAL( i2c_master_write_byte( CommandHandle, ModeByte, true ), return false ); - ESP_ERROR_CHECK_NONFATAL( i2c_master_write( CommandHandle, ( uint8_t* ) Data, DataLength, true ), return false ); - ESP_ERROR_CHECK_NONFATAL( i2c_master_stop( CommandHandle ), return false ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_start( CommandHandle ), goto error ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_write_byte( CommandHandle, ( Address << 1 ) | I2C_MASTER_WRITE, true ), goto error ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_write_byte( CommandHandle, ModeByte, true ), goto error ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_write( CommandHandle, ( uint8_t* ) Data, DataLength, true ), goto error ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_stop( CommandHandle ), goto error ); - ESP_ERROR_CHECK_NONFATAL( i2c_master_cmd_begin( I2CPortNumber, CommandHandle, pdMS_TO_TICKS( 1000 ) ), return false ); + ESP_ERROR_CHECK_NONFATAL( i2c_master_cmd_begin( I2CPortNumber, CommandHandle, pdMS_TO_TICKS( 1000 ) ), goto error ); i2c_cmd_link_delete( CommandHandle ); } return true; + +error: + if (CommandHandle) i2c_cmd_link_delete( CommandHandle ); + return false; } -static bool I2CDefaultWriteCommand( struct SSD1306_Device* Display, SSDCmd Command ) { +static bool I2CDefaultWriteCommand( struct SSD13x6_Device* Display, SSDCmd Command ) { uint8_t CommandByte = ( uint8_t ) Command; NullCheck( Display, return false ); return I2CDefaultWriteBytes( Display->Address, true, ( const uint8_t* ) &CommandByte, 1 ); } -static bool I2CDefaultWriteData( struct SSD1306_Device* Display, const uint8_t* Data, size_t DataLength ) { +static bool I2CDefaultWriteData( struct SSD13x6_Device* Display, const uint8_t* Data, size_t DataLength ) { NullCheck( Display, return false ); NullCheck( Data, return false ); return I2CDefaultWriteBytes( Display->Address, false, Data, DataLength ); } -static bool I2CDefaultReset( struct SSD1306_Device* Display ) { +static bool I2CDefaultReset( struct SSD13x6_Device* Display ) { NullCheck( Display, return false ); if ( Display->RSTPin >= 0 ) { diff --git a/components/services/tarablessd13x6/ifaces/default_if_spi.c b/components/services/tarablessd13x6/ifaces/default_if_spi.c new file mode 100644 index 00000000..cde9d465 --- /dev/null +++ b/components/services/tarablessd13x6/ifaces/default_if_spi.c @@ -0,0 +1,122 @@ + +/** + * Copyright (c) 2017-2018 Tara Keeling + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include +#include +#include +#include +#include +#include +#include +#include "ssd13x6.h" +#include "ssd13x6_default_if.h" + +static const int SSD13x6_SPI_Command_Mode = 0; +static const int SSD13x6_SPI_Data_Mode = 1; + +static spi_host_device_t SPIHost; +static int DCPin; + +static bool SPIDefaultWriteBytes( spi_device_handle_t SPIHandle, int WriteMode, const uint8_t* Data, size_t DataLength ); +static bool SPIDefaultWriteCommand( struct SSD13x6_Device* DeviceHandle, SSDCmd Command ); +static bool SPIDefaultWriteData( struct SSD13x6_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ); +static bool SPIDefaultReset( struct SSD13x6_Device* DeviceHandle ); + +bool SSD13x6_SPIMasterInitDefault( int SPI, int DC ) { + SPIHost = SPI; + DCPin = DC; + return true; +} + +bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin ) { + spi_device_interface_config_t SPIDeviceConfig; + spi_device_handle_t SPIDeviceHandle; + + NullCheck( DeviceHandle, return false ); + + if (CSPin >= 0) { + ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( CSPin, GPIO_MODE_OUTPUT ), return false ); + ESP_ERROR_CHECK_NONFATAL( gpio_set_level( CSPin, 0 ), return false ); + } + + memset( &SPIDeviceConfig, 0, sizeof( spi_device_interface_config_t ) ); + + SPIDeviceConfig.clock_speed_hz = SPI_MASTER_FREQ_8M; + SPIDeviceConfig.spics_io_num = CSPin; + SPIDeviceConfig.queue_size = 1; + + if ( RSTPin >= 0 ) { + ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( RSTPin, GPIO_MODE_OUTPUT ), return false ); + ESP_ERROR_CHECK_NONFATAL( gpio_set_level( RSTPin, 0 ), return false ); + } + + ESP_ERROR_CHECK_NONFATAL( spi_bus_add_device( SPIHost, &SPIDeviceConfig, &SPIDeviceHandle ), return false ); + + DeviceHandle->Model = Model; + + return SSD13x6_Init_SPI( DeviceHandle, + Width, + Height, + RSTPin, + CSPin, + SPIDeviceHandle, + SPIDefaultWriteCommand, + SPIDefaultWriteData, + SPIDefaultReset + ); +} + +static bool SPIDefaultWriteBytes( spi_device_handle_t SPIHandle, int WriteMode, const uint8_t* Data, size_t DataLength ) { + spi_transaction_t SPITransaction; + + NullCheck( SPIHandle, return false ); + NullCheck( Data, return false ); + + if ( DataLength > 0 ) { + memset( &SPITransaction, 0, sizeof( spi_transaction_t ) ); + + SPITransaction.length = DataLength * 8; + SPITransaction.tx_buffer = Data; + + gpio_set_level( DCPin, WriteMode ); + ESP_ERROR_CHECK_NONFATAL( spi_device_transmit( SPIHandle, &SPITransaction ), return false ); + } + + return true; +} + +static bool SPIDefaultWriteCommand( struct SSD13x6_Device* DeviceHandle, SSDCmd Command ) { + static uint8_t CommandByte = 0; + + NullCheck( DeviceHandle, return false ); + NullCheck( DeviceHandle->SPIHandle, return false ); + + CommandByte = Command; + + return SPIDefaultWriteBytes( DeviceHandle->SPIHandle, SSD13x6_SPI_Command_Mode, &CommandByte, 1 ); +} + +static bool SPIDefaultWriteData( struct SSD13x6_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ) { + NullCheck( DeviceHandle, return false ); + NullCheck( DeviceHandle->SPIHandle, return false ); + + return SPIDefaultWriteBytes( DeviceHandle->SPIHandle, SSD13x6_SPI_Data_Mode, Data, DataLength ); +} + +static bool SPIDefaultReset( struct SSD13x6_Device* DeviceHandle ) { + NullCheck( DeviceHandle, return false ); + + if ( DeviceHandle->RSTPin >= 0 ) { + ESP_ERROR_CHECK_NONFATAL( gpio_set_level( DeviceHandle->RSTPin, 0 ), return false ); + vTaskDelay( pdMS_TO_TICKS( 100 ) ); + ESP_ERROR_CHECK_NONFATAL( gpio_set_level( DeviceHandle->RSTPin, 1 ), return false ); + } + + return true; +} + diff --git a/components/services/tarablessd13x6/ssd13x6.c b/components/services/tarablessd13x6/ssd13x6.c new file mode 100644 index 00000000..8795279c --- /dev/null +++ b/components/services/tarablessd13x6/ssd13x6.c @@ -0,0 +1,298 @@ +/** + * Copyright (c) 2017-2018 Tara Keeling + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "ssd13x6.h" + +#define COM_Disable_LR_Remap 0 +#define COM_Enable_LR_Remap BIT( 5 ) + +#define COM_Pins_Sequential 0 +#define COM_Pins_Alternative BIT( 4 ) + +#define COM_ScanDir_LR 0 +#define COM_ScanDir_RL 1 + +// used by both but different +static uint8_t SSDCmd_Set_Display_Start_Line; +static uint8_t SSDCmd_Set_Display_Offset; +static uint8_t SSDCmd_Set_Column_Address; +static uint8_t SSDCmd_Set_Display_CLK; +static uint8_t SSDCmd_Set_Page_Address; + +// misc boundaries +static uint8_t SSD13x6_Max_Col; +static const uint8_t SSD13x6_Max_Row = 7; + +static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int Height ); + +bool SSD13x6_WriteCommand( struct SSD13x6_Device* DeviceHandle, SSDCmd SSDCommand ) { + NullCheck( DeviceHandle->WriteCommand, return false ); + return ( DeviceHandle->WriteCommand ) ( DeviceHandle, SSDCommand ); +} + +bool SSD13x6_WriteData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, size_t DataLength ) { + NullCheck( DeviceHandle->WriteData, return false ); + return ( DeviceHandle->WriteData ) ( DeviceHandle, Data, DataLength ); +} + +void SSD13x6_SetMuxRatio( struct SSD13x6_Device* DeviceHandle, uint8_t Ratio ) { + SSD13x6_WriteCommand( DeviceHandle, 0xA8 ); + SSD13x6_WriteCommand( DeviceHandle, Ratio ); +} + +void SSD13x6_SetDisplayOffset( struct SSD13x6_Device* DeviceHandle, uint8_t Offset ) { + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Display_Offset ); + SSD13x6_WriteCommand( DeviceHandle, Offset ); +} + +void SSD13x6_SetDisplayStartLine( struct SSD13x6_Device* DeviceHandle, int Line ) { + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Display_Start_Line + ( uint32_t ) ( Line & 0x1F ) ); +} + +void SSD13x6_SetContrast( struct SSD13x6_Device* DeviceHandle, uint8_t Contrast ) { + SSD13x6_WriteCommand( DeviceHandle, 0x81 ); + SSD13x6_WriteCommand( DeviceHandle, Contrast ); +} + +void SSD13x6_EnableDisplayRAM( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_WriteCommand( DeviceHandle, 0xA4 ); +} + +void SSD13x6_DisableDisplayRAM( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_WriteCommand( DeviceHandle, 0xA5 ); +} + +void SSD13x6_SetInverted( struct SSD13x6_Device* DeviceHandle, bool Inverted ) { + SSD13x6_WriteCommand( DeviceHandle, Inverted ? 0xA7 : 0xA6 ); +} + +void SSD13x6_SetDisplayClocks( struct SSD13x6_Device* DeviceHandle, uint32_t DisplayClockDivider, uint32_t OSCFrequency ) { + DisplayClockDivider&= 0x0F; + OSCFrequency&= 0x0F; + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Display_CLK ); + SSD13x6_WriteCommand( DeviceHandle, ( ( OSCFrequency << 4 ) | DisplayClockDivider ) ); +} + +void SSD13x6_DisplayOn( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_WriteCommand( DeviceHandle, 0xAF ); +} + +void SSD13x6_DisplayOff( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_WriteCommand( DeviceHandle, 0xAE ); +} + +void SSD132x_ReMap( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_WriteCommand( DeviceHandle, 0xA0 ); + SSD13x6_WriteCommand( DeviceHandle, DeviceHandle->ReMap ); +} + +void SSD13x6_SetDisplayAddressMode( struct SSD13x6_Device* DeviceHandle, SSD13x6_AddressMode AddressMode ) { + switch (DeviceHandle->Model) { + case SSD1306: + SSD13x6_WriteCommand( DeviceHandle, 0x20 ); + SSD13x6_WriteCommand( DeviceHandle, AddressMode ); + break; + case SSD1326: + DeviceHandle->ReMap = (AddressMode == AddressMode_Horizontal) ? (DeviceHandle->ReMap & ~0x80) : (DeviceHandle->ReMap | 0x80); + SSD132x_ReMap(DeviceHandle); + break; + } +} + +void SSD13x6_Update( struct SSD13x6_Device* DeviceHandle ) { + SSD13x6_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1); + SSD13x6_SetPageAddress( DeviceHandle, 0, DeviceHandle->Height / 8 - 1); + SSD13x6_WriteData( DeviceHandle, DeviceHandle->Framebuffer, DeviceHandle->FramebufferSize ); +} + +void SSD13x6_WriteRawData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, size_t DataLength ) { + NullCheck( Data, return ); + DataLength = DataLength > DeviceHandle->FramebufferSize ? DeviceHandle->FramebufferSize : DataLength; + if ( DataLength > 0 ) SSD13x6_WriteData( DeviceHandle, Data, DataLength ); +} + +void SSD13x6_SetHFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { + switch (DeviceHandle->Model) { + case SSD1306: + SSD13x6_WriteCommand( DeviceHandle, On ? 0xA1 : 0xA0 ); + break; + case SSD1326: + DeviceHandle->ReMap = On ? (DeviceHandle->ReMap | 0x01) : (DeviceHandle->ReMap & ~0x01); + SSD132x_ReMap(DeviceHandle); + break; + } +} + +void SSD13x6_SetVFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { + switch (DeviceHandle->Model) { + case SSD1306: + SSD13x6_WriteCommand( DeviceHandle, On ? 0xC8 : 0xC0 ); + break; + case SSD1326: + DeviceHandle->ReMap = On ? (DeviceHandle->ReMap | 0x05) : (DeviceHandle->ReMap & ~0x05); + SSD132x_ReMap( DeviceHandle ); + break; + } +} + +void SSD13x6_SetColumnAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ) { + CheckBounds( Start > SSD13x6_Max_Col, return ); + CheckBounds( End > SSD13x6_Max_Col, return ); + + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Column_Address ); + SSD13x6_WriteCommand( DeviceHandle, Start ); + SSD13x6_WriteCommand( DeviceHandle, End ); +} + +void SSD13x6_SetPageAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ) { + NullCheck( DeviceHandle, return ); + + CheckBounds( Start > SSD13x6_Max_Row, return ); + CheckBounds( End > SSD13x6_Max_Row, return ); + + // in case of SSD1326, this is sub-optimal as it can address by line, not by page + if (DeviceHandle->Model != SSD1306) { + Start *= 8; + End = (End + 1) * 8 - 1; + } + + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Page_Address ); + SSD13x6_WriteCommand( DeviceHandle, Start ); + SSD13x6_WriteCommand( DeviceHandle, End ); +} + +bool SSD13x6_HWReset( struct SSD13x6_Device* DeviceHandle ) { + NullCheck( DeviceHandle, return 0 ); + + if ( DeviceHandle->Reset != NULL ) { + return ( DeviceHandle->Reset ) ( DeviceHandle ); + } + + /* This should always return true if there is no reset callback as + * no error would have occurred during the non existant reset. + */ + return true; +} + + +/* + * This is all a big giant mystery that I have yet to figure out. + * Beware all ye who enter. + */ +static void SetCOMPinConfiguration( struct SSD13x6_Device* DeviceHandle, uint32_t RemapCFG, uint32_t PinCFG, int ScanDir ) { + SSD13x6_WriteCommand( DeviceHandle, 0xDA ); + SSD13x6_WriteCommand( DeviceHandle, ( uint8_t ) ( RemapCFG | PinCFG | BIT( 1 ) ) ); + + SSD13x6_WriteCommand( DeviceHandle, + ( ScanDir == COM_ScanDir_LR ) ? 0xC0 : 0xC8 + ); +} + + +static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int Height ) { + DeviceHandle->Width = Width; + DeviceHandle->Height = Height; + DeviceHandle->FramebufferSize = ( DeviceHandle->Width * Height ) / 8; + + // DeviceHandle->Framebuffer = heap_caps_calloc( 1, DeviceHandle->FramebufferSize, MALLOC_CAP_INTERNAL ); + DeviceHandle->Framebuffer = calloc( 1, DeviceHandle->FramebufferSize ); + NullCheck( DeviceHandle->Framebuffer, return false ); + + SSD13x6_HWReset( DeviceHandle ); + + if (DeviceHandle->Model == SSD1306) { + SSDCmd_Set_Display_Start_Line = 0x40; + SSDCmd_Set_Display_Offset = 0xD3; + SSDCmd_Set_Column_Address = 0x21, + SSDCmd_Set_Display_CLK = 0xD5; + SSDCmd_Set_Page_Address = 0x22; + + SSD13x6_Max_Col = 127; + + // charge pump regulator, do direct init + SSD13x6_WriteCommand( DeviceHandle, 0x8D ); + SSD13x6_WriteCommand( DeviceHandle, 0x14 ); /* MAGIC NUMBER */ + + if ( Height == 64 ) { + SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Alternative, COM_ScanDir_LR ); + } else { + SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Sequential, COM_ScanDir_LR ); + } + } else if (DeviceHandle->Model == SSD1326) { + SSDCmd_Set_Display_Start_Line = 0xA1; + SSDCmd_Set_Display_Offset = 0xA2; + SSDCmd_Set_Column_Address = 0x15; + SSDCmd_Set_Display_CLK = 0xB3; + SSDCmd_Set_Page_Address = 0x75; // not really a page but a row + + SSD13x6_Max_Col = 255; + + // no gray scale + DeviceHandle->ReMap |= 0x10; + SSD132x_ReMap( DeviceHandle ); + + SSD13x6_SetHFlip( DeviceHandle, false ); + SSD13x6_SetVFlip( DeviceHandle, false ); + } + + SSD13x6_SetMuxRatio( DeviceHandle, Height - 1 ); + SSD13x6_SetDisplayOffset( DeviceHandle, 0x00 ); + SSD13x6_SetDisplayStartLine( DeviceHandle, 0 ); + SSD13x6_SetContrast( DeviceHandle, 0x7F ); + SSD13x6_DisableDisplayRAM( DeviceHandle ); + SSD13x6_SetInverted( DeviceHandle, false ); + SSD13x6_SetDisplayClocks( DeviceHandle, 0, 8 ); + SSD13x6_SetDisplayAddressMode( DeviceHandle, AddressMode_Vertical ); + SSD13x6_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1 ); + SSD13x6_SetPageAddress( DeviceHandle, 0, ( DeviceHandle->Height / 8 ) - 1 ); + SSD13x6_EnableDisplayRAM( DeviceHandle ); + SSD13x6_DisplayOn( DeviceHandle ); + SSD13x6_Update( DeviceHandle ); + + return true; +} + +bool SSD13x6_Init_I2C( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int I2CAddress, int ResetPin, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ) { + NullCheck( DeviceHandle, return false ); + NullCheck( WriteCommand, return false ); + NullCheck( WriteData, return false ); + + memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); + + DeviceHandle->WriteCommand = WriteCommand; + DeviceHandle->WriteData = WriteData; + DeviceHandle->Reset = Reset; + DeviceHandle->Address = I2CAddress; + DeviceHandle->RSTPin = ResetPin; + + return SSD13x6_Init( DeviceHandle, Width, Height ); +} + +bool SSD13x6_Init_SPI( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int ResetPin, int CSPin, spi_device_handle_t SPIHandle, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ) { + NullCheck( DeviceHandle, return false ); + NullCheck( WriteCommand, return false ); + NullCheck( WriteData, return false ); + + memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); + + DeviceHandle->WriteCommand = WriteCommand; + DeviceHandle->WriteData = WriteData; + DeviceHandle->Reset = Reset; + DeviceHandle->SPIHandle = SPIHandle; + DeviceHandle->RSTPin = ResetPin; + DeviceHandle->CSPin = CSPin; + + return SSD13x6_Init( DeviceHandle, Width, Height ); +} diff --git a/components/services/tarablessd13x6/ssd13x6.h b/components/services/tarablessd13x6/ssd13x6.h new file mode 100644 index 00000000..a9113767 --- /dev/null +++ b/components/services/tarablessd13x6/ssd13x6.h @@ -0,0 +1,94 @@ +#ifndef _SSD13X6_H_ +#define _SSD13X6_H_ + +/* For uint(X)_t */ +#include + +/* For booooool */ +#include + +#include "sdkconfig.h" +#include "ssd13x6_err.h" + +#define SSD_ALWAYS_INLINE __attribute__( ( always_inline ) ) + +#if ! defined BIT +#define BIT( n ) ( 1 << n ) +#endif + +typedef uint8_t SSDCmd; + +typedef enum { + AddressMode_Horizontal = 0, + AddressMode_Vertical, + AddressMode_Page, + AddressMode_Invalid +} SSD13x6_AddressMode; + +struct SSD13x6_Device; + +/* + * These can optionally return a succeed/fail but are as of yet unused in the driver. + */ +typedef bool ( *WriteCommandProc ) ( struct SSD13x6_Device* DeviceHandle, SSDCmd Command ); +typedef bool ( *WriteDataProc ) ( struct SSD13x6_Device* DeviceHandle, const uint8_t* Data, size_t DataLength ); +typedef bool ( *ResetProc ) ( struct SSD13x6_Device* DeviceHandle ); + +struct spi_device_t; +typedef struct spi_device_t* spi_device_handle_t; + +struct SSD13x6_FontDef; + +struct SSD13x6_Device { + /* I2C Specific */ + int Address; + + /* SPI Specific */ + spi_device_handle_t SPIHandle; + int RSTPin; + int CSPin; + + /* Everything else */ + int Width; + int Height; + + enum { SSD1306, SSD1326 } Model; + uint8_t ReMap; + uint8_t* Framebuffer; + int FramebufferSize; + + WriteCommandProc WriteCommand; + WriteDataProc WriteData; + ResetProc Reset; + + const struct SSD13x6_FontDef* Font; + bool FontForceProportional; + bool FontForceMonospace; +}; + +void SSD13x6_SetMuxRatio( struct SSD13x6_Device* DeviceHandle, uint8_t Ratio ); +void SSD13x6_SetDisplayOffset( struct SSD13x6_Device* DeviceHandle, uint8_t Offset ); +void SSD13x6_SetDisplayStartLines( struct SSD13x6_Device* DeviceHandle ); + +void SSD13x6_SetSegmentRemap( struct SSD13x6_Device* DeviceHandle, bool Remap ); + +void SSD13x6_SetContrast( struct SSD13x6_Device* DeviceHandle, uint8_t Contrast ); +void SSD13x6_EnableDisplayRAM( struct SSD13x6_Device* DeviceHandle ); +void SSD13x6_DisableDisplayRAM( struct SSD13x6_Device* DeviceHandle ); +void SSD13x6_SetInverted( struct SSD13x6_Device* DeviceHandle, bool Inverted ); +void SSD13x6_SetHFlip( struct SSD13x6_Device* DeviceHandle, bool On ); +void SSD13x6_SetVFlip( struct SSD13x6_Device* DeviceHandle, bool On ); +void SSD13x6_DisplayOn( struct SSD13x6_Device* DeviceHandle ); +void SSD13x6_DisplayOff( struct SSD13x6_Device* DeviceHandle ); +void SSD13x6_SetDisplayAddressMode( struct SSD13x6_Device* DeviceHandle, SSD13x6_AddressMode AddressMode ); +void SSD13x6_Update( struct SSD13x6_Device* DeviceHandle ); +void SSD13x6_SetDisplayClocks( struct SSD13x6_Device* DeviceHandle, uint32_t DisplayClockDivider, uint32_t OSCFrequency ); +void SSD13x6_SetColumnAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ); +void SSD13x6_SetPageAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ); +bool SSD13x6_HWReset( struct SSD13x6_Device* DeviceHandle ); +bool SSD13x6_Init_I2C( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int I2CAddress, int ResetPin, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); +bool SSD13x6_Init_SPI( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int ResetPin, int CSPin, spi_device_handle_t SPIHandle, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); + +void SSD13x6_WriteRawData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, size_t DataLength ); + +#endif diff --git a/components/services/tarablessd13x6/ssd13x6_default_if.h b/components/services/tarablessd13x6/ssd13x6_default_if.h new file mode 100644 index 00000000..d7c4b1cc --- /dev/null +++ b/components/services/tarablessd13x6/ssd13x6_default_if.h @@ -0,0 +1,18 @@ +#ifndef _SSD13x6_DEFAULT_IF_H_ +#define _SSD13x6_DEFAULT_IF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +bool SSD13x6_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ); +bool SSD13x6_I2CMasterAttachDisplayDefault( struct SSD13x6_Device* DisplayHandle, int Model, int Width, int Height, int I2CAddress, int RSTPin ); + +bool SSD13x6_SPIMasterInitDefault( int SPI, int DC); +bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin ); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/components/services/tarablessd1306/ssd1306_draw.c b/components/services/tarablessd13x6/ssd13x6_draw.c similarity index 75% rename from components/services/tarablessd1306/ssd1306_draw.c rename to components/services/tarablessd13x6/ssd13x6_draw.c index c1329986..9467abf8 100644 --- a/components/services/tarablessd1306/ssd1306_draw.c +++ b/components/services/tarablessd13x6/ssd13x6_draw.c @@ -13,10 +13,10 @@ #include #include -#include "ssd1306.h" -#include "ssd1306_draw.h" +#include "ssd13x6.h" +#include "ssd13x6_draw.h" -__attribute__( ( always_inline ) ) static inline bool IsPixelVisible( struct SSD1306_Device* DeviceHandle, int x, int y ) { +__attribute__( ( always_inline ) ) static inline bool IsPixelVisible( struct SSD13x6_Device* DeviceHandle, int x, int y ) { bool Result = ( ( x >= 0 ) && ( x < DeviceHandle->Width ) && @@ -24,7 +24,7 @@ __attribute__( ( always_inline ) ) static inline bool IsPixelVisible( struct SSD ( y < DeviceHandle->Height ) ) ? true : false; -#if CONFIG_SSD1306_CLIPDEBUG > 0 +#if CONFIG_SSD13x6_CLIPDEBUG > 0 if ( Result == false ) { ClipDebug( x, y ); } @@ -40,7 +40,7 @@ __attribute__( ( always_inline ) ) static inline void SwapInt( int* a, int* b ) *a = Temp; } -inline void IRAM_ATTR SSD1306_DrawPixelFast( struct SSD1306_Device* DeviceHandle, int X, int Y, int Color ) { +inline void IRAM_ATTR SSD13x6_DrawPixelFast( struct SSD13x6_Device* DeviceHandle, int X, int Y, int Color ) { uint32_t YBit = ( Y & 0x07 ); uint8_t* FBOffset = NULL; @@ -61,15 +61,15 @@ inline void IRAM_ATTR SSD1306_DrawPixelFast( struct SSD1306_Device* DeviceHandle } } -void IRAM_ATTR SSD1306_DrawPixel( struct SSD1306_Device* DeviceHandle, int x, int y, int Color ) { +void IRAM_ATTR SSD13x6_DrawPixel( struct SSD13x6_Device* DeviceHandle, int x, int y, int Color ) { NullCheck( DeviceHandle, return ); if ( IsPixelVisible( DeviceHandle, x, y ) == true ) { - SSD1306_DrawPixelFast( DeviceHandle, x, y, Color ); + SSD13x6_DrawPixelFast( DeviceHandle, x, y, Color ); } } -void IRAM_ATTR SSD1306_DrawHLine( struct SSD1306_Device* DeviceHandle, int x, int y, int Width, int Color ) { +void IRAM_ATTR SSD13x6_DrawHLine( struct SSD13x6_Device* DeviceHandle, int x, int y, int Width, int Color ) { int XEnd = x + Width; NullCheck( DeviceHandle, return ); @@ -77,14 +77,14 @@ void IRAM_ATTR SSD1306_DrawHLine( struct SSD1306_Device* DeviceHandle, int x, in for ( ; x <= XEnd; x++ ) { if ( IsPixelVisible( DeviceHandle, x, y ) == true ) { - SSD1306_DrawPixelFast( DeviceHandle, x, y, Color ); + SSD13x6_DrawPixelFast( DeviceHandle, x, y, Color ); } else { break; } } } -void IRAM_ATTR SSD1306_DrawVLine( struct SSD1306_Device* DeviceHandle, int x, int y, int Height, int Color ) { +void IRAM_ATTR SSD13x6_DrawVLine( struct SSD13x6_Device* DeviceHandle, int x, int y, int Height, int Color ) { int YEnd = y + Height; NullCheck( DeviceHandle, return ); @@ -92,14 +92,14 @@ void IRAM_ATTR SSD1306_DrawVLine( struct SSD1306_Device* DeviceHandle, int x, in for ( ; y <= YEnd; y++ ) { if ( IsPixelVisible( DeviceHandle, x, y ) == true ) { - SSD1306_DrawPixel( DeviceHandle, x, y, Color ); + SSD13x6_DrawPixel( DeviceHandle, x, y, Color ); } else { break; } } } -static inline void IRAM_ATTR DrawWideLine( struct SSD1306_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { +static inline void IRAM_ATTR DrawWideLine( struct SSD13x6_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { int dx = ( x1 - x0 ); int dy = ( y1 - y0 ); int Error = 0; @@ -116,7 +116,7 @@ static inline void IRAM_ATTR DrawWideLine( struct SSD1306_Device* DeviceHandle, for ( ; x <= x1; x++ ) { if ( IsPixelVisible( DeviceHandle, x, y ) == true ) { - SSD1306_DrawPixelFast( DeviceHandle, x, y, Color ); + SSD13x6_DrawPixelFast( DeviceHandle, x, y, Color ); } if ( Error > 0 ) { @@ -128,7 +128,7 @@ static inline void IRAM_ATTR DrawWideLine( struct SSD1306_Device* DeviceHandle, } } -static inline void IRAM_ATTR DrawTallLine( struct SSD1306_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { +static inline void IRAM_ATTR DrawTallLine( struct SSD13x6_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { int dx = ( x1 - x0 ); int dy = ( y1 - y0 ); int Error = 0; @@ -145,7 +145,7 @@ static inline void IRAM_ATTR DrawTallLine( struct SSD1306_Device* DeviceHandle, for ( ; y < y1; y++ ) { if ( IsPixelVisible( DeviceHandle, x, y ) == true ) { - SSD1306_DrawPixelFast( DeviceHandle, x, y, Color ); + SSD13x6_DrawPixelFast( DeviceHandle, x, y, Color ); } if ( Error > 0 ) { @@ -157,14 +157,14 @@ static inline void IRAM_ATTR DrawTallLine( struct SSD1306_Device* DeviceHandle, } } -void IRAM_ATTR SSD1306_DrawLine( struct SSD1306_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { +void IRAM_ATTR SSD13x6_DrawLine( struct SSD13x6_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ) { NullCheck( DeviceHandle, return ); NullCheck( DeviceHandle->Framebuffer, return ); if ( x0 == x1 ) { - SSD1306_DrawVLine( DeviceHandle, x0, y0, ( y1 - y0 ), Color ); + SSD13x6_DrawVLine( DeviceHandle, x0, y0, ( y1 - y0 ), Color ); } else if ( y0 == y1 ) { - SSD1306_DrawHLine( DeviceHandle, x0, y0, ( x1 - x0 ), Color ); + SSD13x6_DrawHLine( DeviceHandle, x0, y0, ( x1 - x0 ), Color ); } else { if ( abs( x1 - x0 ) > abs( y1 - y0 ) ) { /* Wide ( run > rise ) */ @@ -186,7 +186,7 @@ void IRAM_ATTR SSD1306_DrawLine( struct SSD1306_Device* DeviceHandle, int x0, in } } -void IRAM_ATTR SSD1306_DrawBox( struct SSD1306_Device* DeviceHandle, int x1, int y1, int x2, int y2, int Color, bool Fill ) { +void IRAM_ATTR SSD13x6_DrawBox( struct SSD13x6_Device* DeviceHandle, int x1, int y1, int x2, int y2, int Color, bool Fill ) { int Width = ( x2 - x1 ); int Height = ( y2 - y1 ); @@ -195,25 +195,25 @@ void IRAM_ATTR SSD1306_DrawBox( struct SSD1306_Device* DeviceHandle, int x1, int if ( Fill == false ) { /* Top side */ - SSD1306_DrawHLine( DeviceHandle, x1, y1, Width, Color ); + SSD13x6_DrawHLine( DeviceHandle, x1, y1, Width, Color ); /* Bottom side */ - SSD1306_DrawHLine( DeviceHandle, x1, y1 + Height, Width, Color ); + SSD13x6_DrawHLine( DeviceHandle, x1, y1 + Height, Width, Color ); /* Left side */ - SSD1306_DrawVLine( DeviceHandle, x1, y1, Height, Color ); + SSD13x6_DrawVLine( DeviceHandle, x1, y1, Height, Color ); /* Right side */ - SSD1306_DrawVLine( DeviceHandle, x1 + Width, y1, Height, Color ); + SSD13x6_DrawVLine( DeviceHandle, x1 + Width, y1, Height, Color ); } else { /* Fill the box by drawing horizontal lines */ for ( ; y1 <= y2; y1++ ) { - SSD1306_DrawHLine( DeviceHandle, x1, y1, Width, Color ); + SSD13x6_DrawHLine( DeviceHandle, x1, y1, Width, Color ); } } } -void SSD1306_Clear( struct SSD1306_Device* DeviceHandle, int Color ) { +void SSD13x6_Clear( struct SSD13x6_Device* DeviceHandle, int Color ) { NullCheck( DeviceHandle, return ); NullCheck( DeviceHandle->Framebuffer, return ); diff --git a/components/services/tarablessd1306/ssd1306_draw.h b/components/services/tarablessd13x6/ssd13x6_draw.h similarity index 55% rename from components/services/tarablessd1306/ssd1306_draw.h rename to components/services/tarablessd13x6/ssd13x6_draw.h index 35251cd5..18cc35cb 100644 --- a/components/services/tarablessd1306/ssd1306_draw.h +++ b/components/services/tarablessd13x6/ssd13x6_draw.h @@ -1,5 +1,5 @@ -#ifndef _SSD1306_DRAW_H_ -#define _SSD1306_DRAW_H_ +#ifndef _SSD13x6_DRAW_H_ +#define _SSD13x6_DRAW_H_ #ifdef __cplusplus extern "C" { @@ -7,23 +7,23 @@ extern "C" { #include "sdkconfig.h" -#define SSD1306_CLIPDEBUG_NONE 0 -#define SSD1306_CLIPDEBUG_WARNING 1 -#define SSD1306_CLIPDEBUG_ERROR 2 +#define SSD13x6_CLIPDEBUG_NONE 0 +#define SSD13x6_CLIPDEBUG_WARNING 1 +#define SSD13x6_CLIPDEBUG_ERROR 2 -#if CONFIG_SSD1306_CLIPDEBUG == SSD1306_CLIPDEBUG_NONE +#if CONFIG_SSD13x6_CLIPDEBUG == SSD13x6_CLIPDEBUG_NONE /* * Clip silently with no console output. */ #define ClipDebug( x, y ) -#elif CONFIG_SSD1306_CLIPDEBUG == SSD1306_CLIPDEBUG_WARNING +#elif CONFIG_SSD13x6_CLIPDEBUG == SSD13x6_CLIPDEBUG_WARNING /* * Log clipping to the console as a warning. */ #define ClipDebug( x, y ) { \ ESP_LOGW( __FUNCTION__, "Line %d: Pixel at %d, %d CLIPPED", __LINE__, x, y ); \ } -#elif CONFIG_SSD1306_CLIPDEBUG == SSD1306_CLIPDEBUG_ERROR +#elif CONFIG_SSD13x6_CLIPDEBUG == SSD13x6_CLIPDEBUG_ERROR /* * Log clipping as an error to the console. * Also invokes an abort with stack trace. @@ -38,13 +38,13 @@ extern "C" { #define SSD_COLOR_WHITE 1 #define SSD_COLOR_XOR 2 -void SSD1306_Clear( struct SSD1306_Device* DeviceHandle, int Color ); -void SSD1306_DrawPixel( struct SSD1306_Device* DeviceHandle, int X, int Y, int Color ); -void SSD1306_DrawPixelFast( struct SSD1306_Device* DeviceHandle, int X, int Y, int Color ); -void SSD1306_DrawHLine( struct SSD1306_Device* DeviceHandle, int x, int y, int Width, int Color ); -void SSD1306_DrawVLine( struct SSD1306_Device* DeviceHandle, int x, int y, int Height, int Color ); -void SSD1306_DrawLine( struct SSD1306_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ); -void SSD1306_DrawBox( struct SSD1306_Device* DeviceHandle, int x1, int y1, int x2, int y2, int Color, bool Fill ); +void SSD13x6_Clear( struct SSD13x6_Device* DeviceHandle, int Color ); +void SSD13x6_DrawPixel( struct SSD13x6_Device* DeviceHandle, int X, int Y, int Color ); +void SSD13x6_DrawPixelFast( struct SSD13x6_Device* DeviceHandle, int X, int Y, int Color ); +void SSD13x6_DrawHLine( struct SSD13x6_Device* DeviceHandle, int x, int y, int Width, int Color ); +void SSD13x6_DrawVLine( struct SSD13x6_Device* DeviceHandle, int x, int y, int Height, int Color ); +void SSD13x6_DrawLine( struct SSD13x6_Device* DeviceHandle, int x0, int y0, int x1, int y1, int Color ); +void SSD13x6_DrawBox( struct SSD13x6_Device* DeviceHandle, int x1, int y1, int x2, int y2, int Color, bool Fill ); #ifdef __cplusplus } diff --git a/components/services/tarablessd1306/ssd1306_err.h b/components/services/tarablessd13x6/ssd13x6_err.h similarity index 81% rename from components/services/tarablessd1306/ssd1306_err.h rename to components/services/tarablessd13x6/ssd13x6_err.h index e8d055a7..ee65a22d 100644 --- a/components/services/tarablessd1306/ssd1306_err.h +++ b/components/services/tarablessd13x6/ssd13x6_err.h @@ -1,15 +1,15 @@ -#ifndef _SSD1306_ERR_H_ -#define _SSD1306_ERR_H_ +#ifndef _SSD13x6_ERR_H_ +#define _SSD13x6_ERR_H_ #include -#define SSD1306_DoAbort( ) +#define SSD13x6_DoAbort( ) #if ! defined NullCheck #define NullCheck( ptr, retexpr ) { \ if ( ptr == NULL ) { \ ESP_LOGE( __FUNCTION__, "%s == NULL", #ptr ); \ - SSD1306_DoAbort( ); \ + SSD13x6_DoAbort( ); \ retexpr; \ } \ } @@ -20,7 +20,7 @@ esp_err_t __err_rc = ( expr ); \ if ( __err_rc != ESP_OK ) { \ ESP_LOGE( __FUNCTION__, "%s != ESP_OK, result: %d", #expr, __err_rc ); \ - SSD1306_DoAbort( ); \ + SSD13x6_DoAbort( ); \ retexpr; \ } \ } @@ -30,7 +30,7 @@ #define CheckBounds( expr, retexpr ) { \ if ( expr ) { \ ESP_LOGE( __FUNCTION__, "Line %d: %s", __LINE__, #expr ); \ - SSD1306_DoAbort( ); \ + SSD13x6_DoAbort( ); \ retexpr; \ } \ } diff --git a/components/services/tarablessd1306/ssd1306_font.c b/components/services/tarablessd13x6/ssd13x6_font.c similarity index 80% rename from components/services/tarablessd1306/ssd1306_font.c rename to components/services/tarablessd13x6/ssd13x6_font.c index 7a178fd1..37e9dbcb 100644 --- a/components/services/tarablessd1306/ssd1306_font.c +++ b/components/services/tarablessd13x6/ssd13x6_font.c @@ -9,11 +9,11 @@ #include #include #include -#include "ssd1306.h" -#include "ssd1306_draw.h" -#include "ssd1306_font.h" +#include "ssd13x6.h" +#include "ssd13x6_draw.h" +#include "ssd13x6_font.h" -static int RoundUpFontHeight( const struct SSD1306_FontDef* Font ) { +static int RoundUpFontHeight( const struct SSD13x6_FontDef* Font ) { int Height = Font->Height; if ( ( Height % 8 ) != 0 ) { @@ -23,11 +23,11 @@ static int RoundUpFontHeight( const struct SSD1306_FontDef* Font ) { return Height; } -static const uint8_t* GetCharPtr( const struct SSD1306_FontDef* Font, char Character ) { +static const uint8_t* GetCharPtr( const struct SSD13x6_FontDef* Font, char Character ) { return &Font->FontData[ ( Character - Font->StartChar ) * ( ( Font->Width * ( RoundUpFontHeight( Font ) / 8 ) ) + 1 ) ]; } -void SSD1306_FontDrawChar( struct SSD1306_Device* DisplayHandle, char Character, int x, int y, int Color ) { +void SSD13x6_FontDrawChar( struct SSD13x6_Device* DisplayHandle, char Character, int x, int y, int Color ) { const uint8_t* GlyphData = NULL; int GlyphColumnLen = 0; int CharStartX = 0; @@ -52,8 +52,8 @@ void SSD1306_FontDrawChar( struct SSD1306_Device* DisplayHandle, char Character, GlyphData++; GlyphColumnLen = RoundUpFontHeight( DisplayHandle->Font ) / 8; - CharWidth = SSD1306_FontGetCharWidth( DisplayHandle, Character ); - CharHeight = SSD1306_FontGetHeight( DisplayHandle ); + CharWidth = SSD13x6_FontGetCharWidth( DisplayHandle, Character ); + CharHeight = SSD13x6_FontGetHeight( DisplayHandle ); CharStartX = x; CharStartY = y; @@ -89,7 +89,7 @@ void SSD1306_FontDrawChar( struct SSD1306_Device* DisplayHandle, char Character, YBit = ( i + OffsetY ) & 0x07; if ( GlyphData[ YByte ] & BIT( YBit ) ) { - SSD1306_DrawPixel( DisplayHandle, x, y, Color ); + SSD13x6_DrawPixel( DisplayHandle, x, y, Color ); } } @@ -98,7 +98,7 @@ void SSD1306_FontDrawChar( struct SSD1306_Device* DisplayHandle, char Character, } } -bool SSD1306_SetFont( struct SSD1306_Device* Display, const struct SSD1306_FontDef* Font ) { +bool SSD13x6_SetFont( struct SSD13x6_Device* Display, const struct SSD13x6_FontDef* Font ) { NullCheck( Display, return false ); NullCheck( Font, return false ); @@ -109,35 +109,35 @@ bool SSD1306_SetFont( struct SSD1306_Device* Display, const struct SSD1306_FontD return true; } -void SSD1306_FontForceProportional( struct SSD1306_Device* Display, bool Force ) { +void SSD13x6_FontForceProportional( struct SSD13x6_Device* Display, bool Force ) { NullCheck( Display, return ); NullCheck( Display->Font, return ); Display->FontForceProportional = Force; } -void SSD1306_FontForceMonospace( struct SSD1306_Device* Display, bool Force ) { +void SSD13x6_FontForceMonospace( struct SSD13x6_Device* Display, bool Force ) { NullCheck( Display, return ); NullCheck( Display->Font, return ); Display->FontForceMonospace = Force; } -int SSD1306_FontGetWidth( struct SSD1306_Device* Display ) { +int SSD13x6_FontGetWidth( struct SSD13x6_Device* Display ) { NullCheck( Display, return 0 ); NullCheck( Display->Font, return 0 ); return Display->Font->Width; } -int SSD1306_FontGetHeight( struct SSD1306_Device* Display ) { +int SSD13x6_FontGetHeight( struct SSD13x6_Device* Display ) { NullCheck( Display, return 0 ); NullCheck( Display->Font, return 0 ); return Display->Font->Height; } -int SSD1306_FontGetCharWidth( struct SSD1306_Device* Display, char Character ) { +int SSD13x6_FontGetCharWidth( struct SSD13x6_Device* Display, char Character ) { const uint8_t* CharPtr = NULL; int Width = 0; @@ -161,28 +161,28 @@ int SSD1306_FontGetCharWidth( struct SSD1306_Device* Display, char Character ) { return Width; } -int SSD1306_FontGetMaxCharsPerRow( struct SSD1306_Device* Display ) { +int SSD13x6_FontGetMaxCharsPerRow( struct SSD13x6_Device* Display ) { NullCheck( Display, return 0 ); NullCheck( Display->Font, return 0 ); return Display->Width / Display->Font->Width; } -int SSD1306_FontGetMaxCharsPerColumn( struct SSD1306_Device* Display ) { +int SSD13x6_FontGetMaxCharsPerColumn( struct SSD13x6_Device* Display ) { NullCheck( Display, return 0 ); NullCheck( Display->Font, return 0 ); return Display->Height / Display->Font->Height; } -int SSD1306_FontGetCharHeight( struct SSD1306_Device* Display ) { +int SSD13x6_FontGetCharHeight( struct SSD13x6_Device* Display ) { NullCheck( Display, return 0 ); NullCheck( Display->Font, return 0 ); return Display->Font->Height; } -int SSD1306_FontMeasureString( struct SSD1306_Device* Display, const char* Text ) { +int SSD13x6_FontMeasureString( struct SSD13x6_Device* Display, const char* Text ) { int Width = 0; int Len = 0; @@ -192,14 +192,14 @@ int SSD1306_FontMeasureString( struct SSD1306_Device* Display, const char* Text for ( Len = strlen( Text ); Len >= 0; Len--, Text++ ) { if ( *Text >= Display->Font->StartChar && *Text <= Display->Font->EndChar ) { - Width+= SSD1306_FontGetCharWidth( Display, *Text ); + Width+= SSD13x6_FontGetCharWidth( Display, *Text ); } } return Width; } -void SSD1306_FontDrawString( struct SSD1306_Device* Display, int x, int y, const char* Text, int Color ) { +void SSD13x6_FontDrawString( struct SSD13x6_Device* Display, int x, int y, const char* Text, int Color ) { int Len = 0; int i = 0; @@ -208,25 +208,25 @@ void SSD1306_FontDrawString( struct SSD1306_Device* Display, int x, int y, const NullCheck( Text, return ); for ( Len = strlen( Text ), i = 0; i < Len; i++ ) { - SSD1306_FontDrawChar( Display, *Text, x, y, Color ); + SSD13x6_FontDrawChar( Display, *Text, x, y, Color ); - x+= SSD1306_FontGetCharWidth( Display, *Text ); + x+= SSD13x6_FontGetCharWidth( Display, *Text ); Text++; } } -void SSD1306_FontDrawAnchoredString( struct SSD1306_Device* Display, TextAnchor Anchor, const char* Text, int Color ) { +void SSD13x6_FontDrawAnchoredString( struct SSD13x6_Device* Display, TextAnchor Anchor, const char* Text, int Color ) { int x = 0; int y = 0; NullCheck( Display, return ); NullCheck( Text, return ); - SSD1306_FontGetAnchoredStringCoords( Display, &x, &y, Anchor, Text ); - SSD1306_FontDrawString( Display, x, y, Text, Color ); + SSD13x6_FontGetAnchoredStringCoords( Display, &x, &y, Anchor, Text ); + SSD13x6_FontDrawString( Display, x, y, Text, Color ); } -void SSD1306_FontGetAnchoredStringCoords( struct SSD1306_Device* Display, int* OutX, int* OutY, TextAnchor Anchor, const char* Text ) { +void SSD13x6_FontGetAnchoredStringCoords( struct SSD13x6_Device* Display, int* OutX, int* OutY, TextAnchor Anchor, const char* Text ) { int StringWidth = 0; int StringHeight = 0; @@ -235,8 +235,8 @@ void SSD1306_FontGetAnchoredStringCoords( struct SSD1306_Device* Display, int* O NullCheck( OutY, return ); NullCheck( Text, return ); - StringWidth = SSD1306_FontMeasureString( Display, Text ); - StringHeight = SSD1306_FontGetCharHeight( Display ); + StringWidth = SSD13x6_FontMeasureString( Display, Text ); + StringHeight = SSD13x6_FontGetCharHeight( Display ); switch ( Anchor ) { case TextAnchor_East: { diff --git a/components/services/tarablessd13x6/ssd13x6_font.h b/components/services/tarablessd13x6/ssd13x6_font.h new file mode 100644 index 00000000..300c5efb --- /dev/null +++ b/components/services/tarablessd13x6/ssd13x6_font.h @@ -0,0 +1,91 @@ +#ifndef _SSD13x6_FONT_H_ +#define _SSD13x6_FONT_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct SSD13x6_Device; + +/* + * X-GLCD Font format: + * + * First byte of glyph is it's width in pixels. + * Each data byte represents 8 pixels going down from top to bottom. + * + * Example glyph layout for a 16x16 font + * 'a': [Glyph width][Pixel column 0][Pixel column 1] where the number of pixel columns is the font height divided by 8 + * 'b': [Glyph width][Pixel column 0][Pixel column 1]... + * 'c': And so on... + */ + +struct SSD13x6_FontDef { + const uint8_t* FontData; + + int Width; + int Height; + + int StartChar; + int EndChar; + + bool Monospace; +}; + +typedef enum { + TextAnchor_East = 0, + TextAnchor_West, + TextAnchor_North, + TextAnchor_South, + TextAnchor_NorthEast, + TextAnchor_NorthWest, + TextAnchor_SouthEast, + TextAnchor_SouthWest, + TextAnchor_Center +} TextAnchor; + +bool SSD13x6_SetFont( struct SSD13x6_Device* Display, const struct SSD13x6_FontDef* Font ); + +void SSD13x6_FontForceProportional( struct SSD13x6_Device* Display, bool Force ); +void SSD13x6_FontForceMonospace( struct SSD13x6_Device* Display, bool Force ); + +int SSD13x6_FontGetWidth( struct SSD13x6_Device* Display ); +int SSD13x6_FontGetHeight( struct SSD13x6_Device* Display ); + +int SSD13x6_FontGetMaxCharsPerRow( struct SSD13x6_Device* Display ); +int SSD13x6_FontGetMaxCharsPerColumn( struct SSD13x6_Device* Display ); + +int SSD13x6_FontGetCharWidth( struct SSD13x6_Device* Display, char Character ); +int SSD13x6_FontGetCharHeight( struct SSD13x6_Device* Display ); +int SSD13x6_FontMeasureString( struct SSD13x6_Device* Display, const char* Text );\ + +void SSD13x6_FontDrawChar( struct SSD13x6_Device* Display, char Character, int x, int y, int Color ); +void SSD13x6_FontDrawString( struct SSD13x6_Device* Display, int x, int y, const char* Text, int Color ); +void SSD13x6_FontDrawAnchoredString( struct SSD13x6_Device* Display, TextAnchor Anchor, const char* Text, int Color ); +void SSD13x6_FontGetAnchoredStringCoords( struct SSD13x6_Device* Display, int* OutX, int* OutY, TextAnchor Anchor, const char* Text ); + +extern const struct SSD13x6_FontDef Font_droid_sans_fallback_11x13; +extern const struct SSD13x6_FontDef Font_droid_sans_fallback_15x17; +extern const struct SSD13x6_FontDef Font_droid_sans_fallback_24x28; + +extern const struct SSD13x6_FontDef Font_droid_sans_mono_7x13; +extern const struct SSD13x6_FontDef Font_droid_sans_mono_13x24; +extern const struct SSD13x6_FontDef Font_droid_sans_mono_16x31; + +extern const struct SSD13x6_FontDef Font_liberation_mono_9x15; +extern const struct SSD13x6_FontDef Font_liberation_mono_13x21; +extern const struct SSD13x6_FontDef Font_liberation_mono_17x30; + +extern const struct SSD13x6_FontDef Font_Tarable7Seg_16x32; +extern const struct SSD13x6_FontDef Font_Tarable7Seg_32x64; + +extern const struct SSD13x6_FontDef Font_line_1; +extern const struct SSD13x6_FontDef Font_line_2; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/components/squeezelite/a1s/ac101.c b/components/squeezelite/a1s/ac101.c index 148e2397..bdd2bfa8 100644 --- a/components/squeezelite/a1s/ac101.c +++ b/components/squeezelite/a1s/ac101.c @@ -138,8 +138,8 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { #endif // configure I2S pins & install driver - i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = 27, .ws_io_num = 26, - .data_out_num = 25, .data_in_num = 35 //Not used + i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, + .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = CONFIG_I2S_DI_IO }; i2s_driver_install(i2s_num, i2s_config, 0, NULL); i2s_set_pin(i2s_num, &i2s_pin_config); diff --git a/components/squeezelite/external/dac_external.c b/components/squeezelite/external/dac_external.c index 156ca7f4..7e177006 100644 --- a/components/squeezelite/external/dac_external.c +++ b/components/squeezelite/external/dac_external.c @@ -38,9 +38,8 @@ struct adac_s dac_external = { init, deinit, power, speaker, headset, volume }; static char TAG[] = "DAC external"; static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { -#if !defined(CONFIG_SQUEEZEAMP) && !defined(CONFIG_A1S) i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, - .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 }; + .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = CONFIG_I2S_DI_IO }; char *nvs_item = config_alloc_get(NVS_TYPE_STR, "dac_config"); if (nvs_item) { @@ -59,13 +58,10 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { return true; } else { - ESP_LOGI(TAG, "Cannot initialize I2S for SPDIF bck:%d ws:%d do:%d", i2s_pin_config.bck_io_num, + ESP_LOGI(TAG, "Cannot initialize I2S for DAC bck:%d ws:%d do:%d", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); return false; } -#else - return true; -#endif } diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index 13adf39e..25e30656 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -53,6 +53,7 @@ sure that using rate_delay would fix that #include "monitor.h" #include "config.h" #include "accessors.h" +#include "globdefs.h" #define LOCK mutex_lock(outputbuf->mutex) #define UNLOCK mutex_unlock(outputbuf->mutex) @@ -112,16 +113,6 @@ static void *output_thread_i2s_stats(void *arg); static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *count); static void (*jack_handler_chain)(bool inserted); -// force all GPIOs to what we need -#undef CONFIG_I2S_NUM -#define CONFIG_I2S_NUM 0 - -#ifdef CONFIG_SQUEEZEAMP -#undef CONFIG_SPDIF_DO_IO -#define CONFIG_SPDIF_DO_IO 15 -#elif defined CONFIG_A1S -#endif - #define I2C_PORT 0 /**************************************************************************************** @@ -212,13 +203,9 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch if (strcasestr(device, "spdif")) { spdif = true; - -#ifdef CONFIG_SQUEEZEAMP - i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = 33, .ws_io_num = 25, - .data_out_num = CONFIG_SPDIF_DO_IO, .data_in_num = -1 }; -#else i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_SPDIF_BCK_IO, .ws_io_num = CONFIG_SPDIF_WS_IO, .data_out_num = CONFIG_SPDIF_DO_IO, .data_in_num = -1 }; +#ifndef CONFIG_SPDIF_LOCKED char *nvs_item = config_alloc_get(NVS_TYPE_STR, "spdif_config"); if (nvs_item) { if ((p = strcasestr(nvs_item, "bck")) != NULL) i2s_pin_config.bck_io_num = atoi(strchr(p, '=') + 1); @@ -226,13 +213,13 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch if ((p = strcasestr(nvs_item, "do")) != NULL) i2s_pin_config.data_out_num = atoi(strchr(p, '=') + 1); free(nvs_item); } +#endif if (i2s_pin_config.bck_io_num == -1 || i2s_pin_config.ws_io_num == -1 || i2s_pin_config.data_out_num == -1) { LOG_WARN("Cannot initialize I2S for SPDIF bck:%d ws:%d do:%d", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); } -#endif i2s_config.sample_rate = output.current_sample_rate * 2; i2s_config.bits_per_sample = 32; @@ -249,14 +236,15 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch i2s_set_pin(CONFIG_I2S_NUM, &i2s_pin_config); LOG_INFO("SPDIF using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); } else { -#ifdef CONFIG_SQUEEZEAMP +#if CONFIG_SPDIF_DO_IO != -1 gpio_pad_select_gpio(CONFIG_SPDIF_DO_IO); gpio_set_direction(CONFIG_SPDIF_DO_IO, GPIO_MODE_OUTPUT); gpio_set_level(CONFIG_SPDIF_DO_IO, 0); - adac = &dac_tas57xx; -#elif defined(CONFIG_A1S) - adac = &dac_a1s; -#endif +#endif + + // not very pretty ... + adac = &ADAC; + i2s_config.sample_rate = output.current_sample_rate; i2s_config.bits_per_sample = bytes_per_frame * 8 / 2; // Counted in frames (but i2s allocates a buffer <= 4092 bytes) diff --git a/components/squeezelite/tas57xx/dac_57xx.c b/components/squeezelite/tas57xx/dac_57xx.c index 29ba9b18..de451ca5 100644 --- a/components/squeezelite/tas57xx/dac_57xx.c +++ b/components/squeezelite/tas57xx/dac_57xx.c @@ -119,8 +119,8 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { i2c_cmd_link_delete(i2c_cmd); // configure I2S pins & install driver - i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = 33, .ws_io_num = 25, - .data_out_num = 32, .data_in_num = -1 //Not used + i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, + .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = CONFIG_I2S_DI_IO, }; i2s_driver_install(i2s_num, i2s_config, 0, NULL); i2s_set_pin(i2s_num, &i2s_pin_config); diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html index c2b39915..040b19c7 100644 --- a/components/wifi-manager/index.html +++ b/components/wifi-manager/index.html @@ -382,6 +382,7 @@
  • jQuery, The jQuery Foundation. Licensed under the MIT License.
  • cJSON, © 2009-2017, Dave Gamble and cJSON contributors. Licensed under the MIT License.
  • esp32-rotary-encoder, © 2011-2019, David Antliff and Ben Buxton. Licensed under the GPL License.
    • +
  • tarablessd1306, © 2017-2018, Tara Keeling. Licensed under the MIT license.

    • Show NVS Editor

    diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index a1f99c21..69268b08 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -21,99 +21,100 @@ menu "Squeezelite-ESP32" help Set logging level info|debug|sdebug endmenu - menu "Audio CODEC libraries" - config INCLUDE_FLAC - bool "FLAC" - default 1 - help - Include FLAC library for flc decoding. - config INCLUDE_FAAD - bool "FAAD" - default 1 - help - Include FAAD library for aac decoding. - config INCLUDE_MAD - bool "MAD" - default 1 - help - Include mad library for mp3 decoding. - config INCLUDE_VORBIS - bool "VORBIS" - default 1 - help - Include vorbis/ogg library for ogg/vorbis decoding. - config INCLUDE_ALAC - bool "ALAC" - default 1 - help - Include alac library for alac decoding. - config INCLUDE_OPUS - bool "OPUS" - default 1 - help - Include opus library for opus decoding. - - endmenu - menu "Audio Output" + config JACK_LOCKED + bool + config BAT_LOCKED + bool + config I2C_LOCKED + bool + config SPDIF_LOCKED + bool + menu "Audio Output" choice OUTPUT_TYPE - prompt "Output Type" + prompt "Output Type" default BASIC_I2C_BT help Type of hardware platform config SQUEEZEAMP - bool "SqueezeAMP (TAS575x & Bluetooth)" + bool "SqueezeAMP" + select JACK_LOCKED + select BAT_LOCKED + select I2C_LOCKED + select SPDIF_LOCKED config A1S bool "ESP32-A1S module" + select I2C_LOCKED config BASIC_I2C_BT bool "Generic I2S & Bluetooth" endchoice menu "DAC I2S settings" - depends on BASIC_I2C_BT - config I2S_NUM + visible if !SQUEEZEAMP && !A1S + config I2S_NUM int "I2S channel (0 or 1). " default 0 help I2S dma channel to use. config I2S_BCK_IO int "I2S Bit clock GPIO number. " - default 33 + default 33 if !A1S + default 27 if A1S help I2S Bit Clock gpio pin to use. config I2S_WS_IO int "I2S Word Select GPIO number. " - default 25 + default 25 if !A1S + default 26 if A1S help I2S Word Select gpio pin to use. config I2S_DO_IO - int "I2S Data I/O GPIO number. " - default 32 + int "I2S Data Output GPIO number. " + default 32 if !A1S + default 25 if A1S help - I2S data I/O gpio pin to use. + I2S data output gpio pin to use. + config I2S_DI_IO + int "I2S Data Input GPIO number. " + default -1 if !A1S + default 35 if A1S + help + I2S data input gpio pin to use (not used mostly, leave it to -1). + endmenu menu "SPDIF settings" - depends on BASIC_I2C_BT || A1S - config SDIF_NUM - int "SDPIF/I2S channel (0 or 1)" - default 0 + visible if !SQUEEZEAMP && !A1S + config SDIF_NUM + int "I2S channel for SDPIF (0 or 1)" + default 0 help I2S dma channel to use. config SPDIF_BCK_IO - int "SDPIF/I2S Bit clock GPIO number" - default -1 + int "SDPIF Bit clock GPIO number" + default I2S_BCK_IO help - Must be set even if you don't use SPDIF + Must be set as SPDIF re-uses I2S but only needs DO (recommendation: set it to I2S Bit clock value) config SPDIF_WS_IO - int "SPDIF/I2S Word Select GPIO number" - default -1 + int "SPDIF Word Select GPIO number" + default I2S_WS_IO help - Must be set even if you don't use SPDIF + Must be set as SPDIF re-uses I2S but only needs DO (recommendation: set it to I2S Word select value) config SPDIF_DO_IO - int "I2S Data I/O GPIO number" - default -1 - help - Must be set even if you don't use SPDIF + int "SPDIF Data I/O GPIO number" + default 15 if SQUEEZEAMP + default I2S_DO_IO if !A1S + default -1 if A1S + help + I2S data output IO use to simulate SPDIF + endmenu + + menu "SPDIF settings" + visible if A1S + config SPDIF_DO_IO + int "SPDIF Data I/O GPIO number" + default -1 + help + I2S data output IO use to simulate SPDIF endmenu menu "A2DP settings" @@ -179,11 +180,8 @@ menu "Squeezelite-ESP32" default "" help Set parameters for display screen, leave empty for no screen - I2C,width=,height= - SPI,width=,height=,select= - config DISPLAY_I2C_SPEED - int "I2C bus speed" - default 250000 + I2C,width=,height=[address=][,HFlip][,VFlip] + SPI,width=,height=,cs=[,HFlip][,VFlip] endmenu menu "Various I/O" @@ -192,26 +190,64 @@ menu "Squeezelite-ESP32" default "" help Set parameters of shared I2C interface - sda=,scl=,speed=,port=<0|1> + sda=,scl=[,speed=][,port=<0|1>] + config SPI_CONFIG + string "SPI system configuration" + default "" + help + Set parameters of shared SPI interface + data=,clk=[,d/c=][,host=<0|1|2>] + config SET_GPIO + string "Special GPIO configuration" + default "" + help + Set parameters of shared GPIO with special values. + =Vcc|GND|amp|jack_h|jack_l[,=Vcc|GND|amp|jack_h|jack_l] + 'amp' means a GPIO that is set when playback starts + 'jack_h' means the audio_gpio insertion detection (1=inserted, use 'jack_l' when 0=inserted) - see also "Jack Insertion GPIO" + config ROTARY_ENCODER + string "Rotary Encoder configuration" + default "" + help + Set GPIO for rotary encoder (quadrature phase). See README on SqueezeESP32 project's GitHub for more details + A=,B=[,SW=gpio>[,volume][,longpress]] + endmenu + menu "LED configuration" + visible if !SQUEEZEAMP config LED_GREEN_GPIO int "Green led GPIO" - default -1 + default -1 if !SQUEEZEAMP + default 12 if SQUEEZEAMP help Set to -1 for no LED config LED_RED_GPIO int "Red led GPIO" - default -1 + default -1 if !SQUEEZEAMP + default 13 if SQUEEZEAMP help Set to -1 for no LED - config JACK_GPIO + endmenu + menu "Audio JACK" + visible if !SQUEEZEAMP + config JACK_GPIO int "Jack insertion GPIO" - default -1 + default -1 if !SQUEEZEAMP + default 34 if SQUEEZEAMP help - GPIO to detect speaker jack insertion. Set to -1 for no detection + GPIO to detect speaker jack insertion. Set to -1 for no detection. This takes precedence over runtime jack GPIO config JACK_GPIO_LEVEL depends on JACK_GPIO != -1 int "Level when inserted (0/1)" default 0 endmenu + menu "Battery measure" + visible if !SQUEEZEAMP + config BAT_CONFIG + string "Set channel and scale" + default "" if !SQUEEZEAMP + default "channel=7,scale=20.24" if SQUEEZEAMP + help + Read a value every 10s on ADC1. Configuration format: channel=0..7,scale= + endmenu endmenu \ No newline at end of file diff --git a/main/esp_app_main.c b/main/esp_app_main.c index 4fdd42de..e9a95bf9 100644 --- a/main/esp_app_main.c +++ b/main/esp_app_main.c @@ -282,8 +282,8 @@ void register_default_nvs(){ ESP_LOGD(TAG,"Registering default Audio control board type %s, value ","actrls_config"); config_set_default(NVS_TYPE_STR, "actrls_config", "", 0); - ESP_LOGD(TAG,"Registering default Audio control board type %s, value ","rotary_config"); - config_set_default(NVS_TYPE_STR, "rotary_config", "", 0); + ESP_LOGD(TAG,"Registering default Audio control board type %s, value %s", "rotary_config", CONFIG_ROTARY_ENCODER); + config_set_default(NVS_TYPE_STR, "rotary_config", CONFIG_ROTARY_ENCODER, 0); char number_buffer[101] = {}; snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_FLASH_ERASE_BLOCK); @@ -304,15 +304,27 @@ void register_default_nvs(){ ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_airplay", STR(CONFIG_AIRPLAY_SINK)); config_set_default(NVS_TYPE_STR, "enable_airplay", STR(CONFIG_AIRPLAY_SINK), 0); - ESP_LOGD(TAG,"Registering default value for key %s, value %s", "display_config", STR(CONFIG_DISPLAY_CONFIG)); - config_set_default(NVS_TYPE_STR, "display_config", STR(CONFIG_DISPLAY_CONFIG), 0); + ESP_LOGD(TAG,"Registering default value for key %s, value %s", "display_config", CONFIG_DISPLAY_CONFIG); + config_set_default(NVS_TYPE_STR, "display_config", CONFIG_DISPLAY_CONFIG, 0); - ESP_LOGD(TAG,"Registering default value for key %s", "i2c_config"); - config_set_default(NVS_TYPE_STR, "i2c_config", "", 0); + ESP_LOGD(TAG,"Registering default value for key %s, value %s", "i2c_config", CONFIG_I2C_CONFIG); + config_set_default(NVS_TYPE_STR, "i2c_config", CONFIG_I2C_CONFIG, 0); - ESP_LOGD(TAG,"Registering default value for key %s", "set_GPIO"); - config_set_default(NVS_TYPE_STR, "set_GPIO", "", 0); + ESP_LOGD(TAG,"Registering default value for key %s, value %s", "spi_config", CONFIG_SPI_CONFIG); + config_set_default(NVS_TYPE_STR, "spi_config", CONFIG_SPI_CONFIG, 0); + ESP_LOGD(TAG,"Registering default value for key %s, value %s", "set_GPIO", CONFIG_SET_GPIO); + config_set_default(NVS_TYPE_STR, "set_GPIO", CONFIG_SET_GPIO, 0); + + ESP_LOGD(TAG,"Registering default value for key %s", "spdif_config"); + config_set_default(NVS_TYPE_STR, "spdif_config", "", 0); + + ESP_LOGD(TAG,"Registering default value for key %s", "dac_config"); + config_set_default(NVS_TYPE_STR, "dac_config", "", 0); + + ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bat_config", CONFIG_BAT_CONFIG); + config_set_default(NVS_TYPE_STR, "bat_config", CONFIG_BAT_CONFIG, 0); + ESP_LOGD(TAG,"Registering default value for key %s", "metadata_config"); config_set_default(NVS_TYPE_STR, "metadata_config", "", 0); @@ -328,12 +340,6 @@ void register_default_nvs(){ ESP_LOGD(TAG,"Registering default value for key %s", "stats"); config_set_default(NVS_TYPE_STR, "stats", "n", 0); - ESP_LOGD(TAG,"Registering default value for key %s", "spdif_config"); - config_set_default(NVS_TYPE_STR, "spdif_config", "", 0); - - ESP_LOGD(TAG,"Registering default value for key %s", "dac_config"); - config_set_default(NVS_TYPE_STR, "dac_config", "", 0); - ESP_LOGD(TAG,"Done setting default values in nvs."); } From 0cb807b023cf3a58264f0393797acdf7c939e4d0 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 00:31:42 -0800 Subject: [PATCH 06/23] Remove un-needed defaults --- build-scripts/I2S-16MFlash-sdkconfig.defaults | 1157 ----------------- 1 file changed, 1157 deletions(-) delete mode 100644 build-scripts/I2S-16MFlash-sdkconfig.defaults diff --git a/build-scripts/I2S-16MFlash-sdkconfig.defaults b/build-scripts/I2S-16MFlash-sdkconfig.defaults deleted file mode 100644 index 8767d5ec..00000000 --- a/build-scripts/I2S-16MFlash-sdkconfig.defaults +++ /dev/null @@ -1,1157 +0,0 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) Project Configuration -# - -CONFIG_DISPLAY_CONFIG="" -CONFIG_I2C_CONFIG="" -CONFIG_SPI_CONFIG="" -CONFIG_SET_GPIO="" -CONFIG_ROTARY_ENCODER="" -CONFIG_LED_GREEN_GPIO=-1 -CONFIG_LED_RED_GPIO=-1 -CONFIG_JACK_GPIO=-1 -CONFIG_BAT_CONFIG="" -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=33 -CONFIG_I2S_WS_IO=25 -CONFIG_I2S_DO_IO=32 -CONFIG_I2S_DI_IO=-1 -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=33 -CONFIG_SPDIF_WS_IO=25 -CONFIG_SPDIF_DO_IO=-1 - -CONFIG_IDF_TARGET_ESP32=y -CONFIG_IDF_TARGET="esp32" - -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y -CONFIG_APP_COMPILE_TIME_DATE=y - - - -CONFIG_OTA_ALLOW_HTTP=y - - -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y - - -CONFIG_BOOTLOADER_LOG_LEVEL=3 -CONFIG_BOOTLOADER_SPI_WP_PIN=7 -CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y - - -CONFIG_BOOTLOADER_WDT_ENABLE=y - -CONFIG_BOOTLOADER_WDT_TIME_MS=9000 - -CONFIG_ESPTOOLPY_BAUD_2MB=y - - -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_BAUD=2000000 -CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - - - -CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y - - - -CONFIG_ESPTOOLPY_FLASHFREQ="80m" - - - - -CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y -CONFIG_ESPTOOLPY_FLASHSIZE="16MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y -CONFIG_ESPTOOLPY_BEFORE_RESET=y - -CONFIG_ESPTOOLPY_BEFORE="default_reset" -CONFIG_ESPTOOLPY_AFTER_RESET=y - -CONFIG_ESPTOOLPY_AFTER="hard_reset" - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y - - - - -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 - - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y -CONFIG_LOGGING_SLIMPROTO="info" -CONFIG_LOGGING_STREAM="info" -CONFIG_LOGGING_DECODE="info" -CONFIG_LOGGING_OUTPUT="info" -CONFIG_INCLUDE_FLAC=y -CONFIG_INCLUDE_FAAD=y -CONFIG_INCLUDE_MAD=y -CONFIG_INCLUDE_VORBIS=y -CONFIG_INCLUDE_ALAC=y - - -CONFIG_BASIC_I2C_BT=y - -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=-1 -CONFIG_SPDIF_WS_IO=-1 -CONFIG_SPDIF_DO_IO=-1 - -CONFIG_A2DP_SINK_NAME="SMSL BT4.2" -CONFIG_A2DP_DEV_NAME="Squeezelite" -CONFIG_A2DP_CONTROL_DELAY_MS=500 -CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -CONFIG_BT_SINK=y -CONFIG_BT_SINK_NAME="ESP32-BT" -CONFIG_BT_SINK_PIN=1234 -CONFIG_AIRPLAY_SINK=y -CONFIG_AIRPLAY_NAME="ESP32-AirPlay" -CONFIG_AIRPLAY_PORT="5000" -CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 -CONFIG_WIFI_MANAGER_MAX_RETRY=2 -CONFIG_DEFAULT_AP_SSID="squeezelite" -CONFIG_DEFAULT_AP_PASSWORD="squeezelite" -CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_DEFAULT_AP_IP="192.168.4.1" -CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1" -CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" -CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4 -CONFIG_DEFAULT_AP_BEACON_INTERVAL=100 -CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30" - -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y - - - -CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y - - - - - - - -CONFIG_ESP32_APPTRACE_DEST_NONE=y - -CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BT_ENABLED=y - -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0 - -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y - -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y - -CONFIG_BTDM_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y - -CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_BLUEDROID_ENABLED=y - -CONFIG_BT_BTC_TASK_STACK_SIZE=3072 -CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BT_BTU_TASK_STACK_SIZE=4096 - -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048 - - -CONFIG_BT_SSP_ENABLED=y -CONFIG_BT_BLE_ENABLED=y -CONFIG_BT_GATTS_ENABLE=y - -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_BT_GATTC_ENABLE=y - -CONFIG_BT_BLE_SMP_ENABLE=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_HID_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 -CONFIG_BT_ACL_CONNECTIONS=4 - - - -CONFIG_BT_SMP_ENABLE=y -CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 -CONFIG_BT_RESERVE_DRAM=0xdb5c - - -CONFIG_ADC_DISABLE_DAC=y - -CONFIG_SPI_MASTER_ISR_IN_IRAM=y - -CONFIG_SPI_SLAVE_ISR_IN_IRAM=y - - - -CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y - -CONFIG_EFUSE_MAX_BLK_LEN=192 - - - -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_BOOT_INIT=y - - -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y - - -CONFIG_SPIRAM_SIZE=-1 - -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y - -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y - - -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -CONFIG_PICO_PSRAM_CS_IO=10 - - - -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 - -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 - -CONFIG_ESP32_PANIC_PRINT_REBOOT=y - - -CONFIG_ESP32_DEBUG_OCDAWARE=y - -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y - - - -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y - - - -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y - - -CONFIG_ESP32_XTAL_FREQ=40 - - - - -CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y -CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y -CONFIG_ADC_CAL_LUT_ENABLE=y - -CONFIG_ESP_ERR_TO_NAME_LOOKUP=y -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y - - -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y - -CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ETH_PHY_INTERFACE_RMII=y - -CONFIG_ETH_RMII_CLK_INPUT=y - -CONFIG_ETH_RMII_CLK_IN_GPIO=0 -CONFIG_ETH_SMI_MDC_GPIO=23 -CONFIG_ETH_SMI_MDIO_GPIO=18 -CONFIG_ETH_PHY_USE_RST=y -CONFIG_ETH_PHY_RST_GPIO=5 -CONFIG_ETH_DMA_BUFFER_SIZE=512 -CONFIG_ETH_DMA_RX_BUFFER_NUM=10 -CONFIG_ETH_DMA_TX_BUFFER_NUM=10 - -CONFIG_ESP_EVENT_POST_FROM_ISR=y -CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y -CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y - -CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 -CONFIG_HTTPD_MAX_URI_LEN=512 -CONFIG_HTTPD_ERR_RESP_NO_DELAY=y -CONFIG_HTTPD_PURGE_BUF_LEN=32 - - - -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y - - -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y -CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 -CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 - - - -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y - -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 - -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y - -CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 -CONFIG_ESP32_PHY_MAX_TX_POWER=20 - - -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y - - -CONFIG_FATFS_CODEPAGE_437=y - - - - - - - - - - - - - - - - - - - - -CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y - - -CONFIG_FATFS_FS_LOCK=0 -CONFIG_FATFS_TIMEOUT_MS=10000 -CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_TASK_PRIO=10 - -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 - -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y - -CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y - - -CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y - -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y - - -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 - -CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 - - - -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - -CONFIG_HEAP_POISONING_DISABLED=y - - -CONFIG_HEAP_TRACING_OFF=y - - - -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y - - - -CONFIG_LOG_DEFAULT_LEVEL_INFO=y - - -CONFIG_LOG_DEFAULT_LEVEL=3 -CONFIG_LOG_COLORS=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif" - - -CONFIG_LWIP_TIMERS_ONDEMAND=y -CONFIG_LWIP_MAX_SOCKETS=16 - -CONFIG_LWIP_SO_REUSE=y -CONFIG_LWIP_SO_REUSE_RXTOALL=y - - - - - -CONFIG_LWIP_ESP_GRATUITOUS_ARP=y -CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y - -CONFIG_LWIP_DHCPS_LEASE_UNIT=60 -CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 - -CONFIG_LWIP_NETIF_LOOPBACK=y -CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 -CONFIG_LWIP_MAX_ACTIVE_TCP=16 -CONFIG_LWIP_MAX_LISTENING_TCP=16 -CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 -CONFIG_LWIP_TCP_MSS=1440 -CONFIG_LWIP_TCP_MSL=60000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 -CONFIG_LWIP_TCP_WND_DEFAULT=32768 -CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCP_QUEUE_OOSEQ=y - -CONFIG_LWIP_TCP_OVERSIZE_MSS=y - - -CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF - - - -CONFIG_LWIP_MAX_RAW_PCBS=16 -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 -CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 - -CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y - - -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 - - -CONFIG_MBEDTLS_HARDWARE_AES=y - - -CONFIG_MBEDTLS_HAVE_TIME=y - -CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y - - - -CONFIG_MBEDTLS_TLS_SERVER=y -CONFIG_MBEDTLS_TLS_CLIENT=y -CONFIG_MBEDTLS_TLS_ENABLED=y - -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y -CONFIG_MBEDTLS_SSL_RENEGOTIATION=y - -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y - -CONFIG_MBEDTLS_SSL_ALPN=y -CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_AES_C=y - - -CONFIG_MBEDTLS_RC4_DISABLED=y - - - - -CONFIG_MBEDTLS_CCM_C=y -CONFIG_MBEDTLS_GCM_C=y - -CONFIG_MBEDTLS_PEM_PARSE_C=y -CONFIG_MBEDTLS_PEM_WRITE_C=y -CONFIG_MBEDTLS_X509_CRL_PARSE_C=y -CONFIG_MBEDTLS_X509_CSR_PARSE_C=y -CONFIG_MBEDTLS_ECP_C=y -CONFIG_MBEDTLS_ECDH_C=y -CONFIG_MBEDTLS_ECDSA_C=y -CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y -CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y -CONFIG_MBEDTLS_ECP_NIST_OPTIM=y -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MQTT_PROTOCOL_311=y -CONFIG_MQTT_TRANSPORT_SSL=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET=y -CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y - - - -CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y - - - - -CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y - - -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y - -CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 -CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 -CONFIG_ESP32_PTHREAD_STACK_MIN=768 - - -CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y -CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1 -CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" - - -CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y - - - -CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y -CONFIG_SPIFFS_MAX_PARTITIONS=3 -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y - -CONFIG_SPIFFS_PAGE_CHECK=y -CONFIG_SPIFFS_GC_MAX_RUNS=10 - -CONFIG_SPIFFS_PAGE_SIZE=256 -CONFIG_SPIFFS_OBJ_NAME_LEN=32 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y -CONFIG_SPIFFS_META_LENGTH=4 -CONFIG_SPIFFS_USE_MTIME=y - - - - - - -CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120 -CONFIG_TCPIP_LWIP=y -CONFIG_UNITY_ENABLE_FLOAT=y -CONFIG_UNITY_ENABLE_DOUBLE=y - -CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y - - -CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_VFS_SUPPORT_TERMIOS=y -CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 - -CONFIG_WL_SECTOR_SIZE_512=y -#CONFIG_WL_SECTOR_SIZE_4096 is not defined -CONFIG_WL_SECTOR_SIZE=512 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 - - - -# Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y - - - -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y - - -CONFIG_LOG_BOOTLOADER_LEVEL=3 - - -CONFIG_FLASHMODE_QIO=y - - - - - -CONFIG_MONITOR_BAUD_115200B=y - - - - -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 - -CONFIG_OPTIMIZATION_LEVEL_RELEASE=y -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y - - - -CONFIG_STACK_CHECK_NONE=y - - - - - - - -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y - -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y - -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BLUEDROID_ENABLED=y -CONFIG_BTC_TASK_STACK_SIZE=3072 -CONFIG_BLUEDROID_PINNED_TO_CORE_0=y - -CONFIG_BLUEDROID_PINNED_TO_CORE=0 -CONFIG_BTU_TASK_STACK_SIZE=4096 - -CONFIG_CLASSIC_BT_ENABLED=y -CONFIG_A2DP_ENABLE=y -CONFIG_A2DP_SINK_TASK_STACK_SIZE=2048 -CONFIG_A2DP_SOURCE_TASK_STACK_SIZE=2048 - -CONFIG_GATTS_ENABLE=y - -CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y -CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 -CONFIG_GATTC_ENABLE=y - -CONFIG_BLE_SMP_ENABLE=y - - - -CONFIG_HCI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HCI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_L2CAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y - - - - -CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SDP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GAP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GAP_INITIAL_TRACE_LEVEL=2 -CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_PAN_TRACE_LEVEL_WARNING=y - - - - -CONFIG_PAN_INITIAL_TRACE_LEVEL=2 - - -CONFIG_A2D_TRACE_LEVEL_WARNING=y - - - - -CONFIG_A2D_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVDT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVCT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_AVRC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_MCA_TRACE_LEVEL_WARNING=y - - - - -CONFIG_MCA_INITIAL_TRACE_LEVEL=2 - - -CONFIG_HID_TRACE_LEVEL_WARNING=y - - - - -CONFIG_HID_INITIAL_TRACE_LEVEL=2 - - -CONFIG_APPL_TRACE_LEVEL_WARNING=y - - - - -CONFIG_APPL_INITIAL_TRACE_LEVEL=2 - - -CONFIG_GATT_TRACE_LEVEL_WARNING=y - - - - -CONFIG_GATT_INITIAL_TRACE_LEVEL=2 - - -CONFIG_SMP_TRACE_LEVEL_WARNING=y - - - - -CONFIG_SMP_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTIF_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BTC_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BTC_INITIAL_TRACE_LEVEL=2 - - -CONFIG_OSI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_OSI_INITIAL_TRACE_LEVEL=2 - - -CONFIG_BLUFI_TRACE_LEVEL_WARNING=y - - - - -CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 - -CONFIG_SMP_ENABLE=y -CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 -CONFIG_ADC2_DISABLE_DAC=y -CONFIG_SPIRAM_SUPPORT=y - - - -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 - -CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y -CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 - -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y - - - - - - - -CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y - - - - - -CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_MAIN_TASK_STACK_SIZE=8192 -CONFIG_IPC_TASK_STACK_SIZE=1024 -CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_CONSOLE_UART_DEFAULT=y - - -CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_BAUDRATE=115200 -CONFIG_INT_WDT=y -CONFIG_INT_WDT_TIMEOUT_MS=800 -CONFIG_INT_WDT_CHECK_CPU1=y -CONFIG_TASK_WDT=y - -CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y - -CONFIG_POST_EVENTS_FROM_ISR=y -CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_SW_COEXIST_ENABLE=y - - -CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y -CONFIG_SW_COEXIST_PREFERENCE_VALUE=2 -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 - -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -CONFIG_SUPPORT_STATIC_ALLOCATION=y - -CONFIG_TIMER_TASK_PRIORITY=1 -CONFIG_TIMER_TASK_STACK_DEPTH=2048 -CONFIG_TIMER_QUEUE_LENGTH=10 - - -CONFIG_ESP_GRATUITOUS_ARP=y -CONFIG_GARP_TMR_INTERVAL=60 -CONFIG_TCPIP_RECVMBOX_SIZE=32 -CONFIG_TCP_MAXRTX=12 -CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1440 -CONFIG_TCP_MSL=60000 -CONFIG_TCP_SND_BUF_DEFAULT=8192 -CONFIG_TCP_WND_DEFAULT=32768 -CONFIG_TCP_RECVMBOX_SIZE=32 -CONFIG_TCP_QUEUE_OOSEQ=y - -CONFIG_TCP_OVERSIZE_MSS=y - - -CONFIG_UDP_RECVMBOX_SIZE=32 -CONFIG_TCPIP_TASK_STACK_SIZE=3072 -CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y - - -CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF - -CONFIG_PTHREAD_STACK_MIN=768 -CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y - - -CONFIG_IP_LOST_TIMER_INTERVAL=120 -CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y -CONFIG_SUPPORT_TERMIOS=y -# End of deprecated options From 64fcc0edec90a9a3bbe45db09be2ba829504fe28 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 11:36:58 -0800 Subject: [PATCH 07/23] More refactoring - Display is a separated entity - Make battery configuration consistent with others - Led config part of led.c - Jack config moved to monitor.c --- build-scripts/ESP32-A1S-sdkconfig.defaults | 5 +- build-scripts/I2S-4MFlash-sdkconfig.defaults | 5 +- .../NonOTA-I2S-4MFlash-sdkconfig.defaults | 5 +- .../NonOTA-SqueezeAmp-sdkconfig.defaults | 6 +- .../SqueezeAmp4MBFlash-sdkconfig.defaults | 6 +- .../SqueezeAmp8MBFlash-sdkconfig.defaults | 6 +- components/display/CMakeLists.txt | 6 + components/display/component.mk | 12 ++ components/{services => display}/display.c | 0 components/{services => display}/display.h | 0 .../{services => display}/driver_SSD13x6.c | 0 .../tarablessd13x6/fonts/LICENSE-apache | 0 .../fonts/LICENSE-liberation-mono | 0 .../fonts/font_droid_sans_fallback_11x13.c | 0 .../fonts/font_droid_sans_fallback_15x17.c | 0 .../fonts/font_droid_sans_fallback_24x28.c | 0 .../fonts/font_droid_sans_mono_13x24.c | 0 .../fonts/font_droid_sans_mono_16x31.c | 0 .../fonts/font_droid_sans_mono_7x13.c | 0 .../fonts/font_liberation_mono_13x21.c | 0 .../fonts/font_liberation_mono_17x30.c | 0 .../fonts/font_liberation_mono_9x15.c | 0 .../tarablessd13x6/fonts/font_line_1.c | 0 .../tarablessd13x6/fonts/font_line_2.c | 0 .../fonts/font_tarable7seg_16x32.c | 0 .../fonts/font_tarable7seg_32x64.c | 0 .../tarablessd13x6/ifaces/default_if_i2c.c | 0 .../tarablessd13x6/ifaces/default_if_spi.c | 0 .../tarablessd13x6/ssd13x6.c | 0 .../tarablessd13x6/ssd13x6.h | 0 .../tarablessd13x6/ssd13x6_default_if.h | 0 .../tarablessd13x6/ssd13x6_draw.c | 0 .../tarablessd13x6/ssd13x6_draw.h | 0 .../tarablessd13x6/ssd13x6_err.h | 0 .../tarablessd13x6/ssd13x6_font.c | 0 .../tarablessd13x6/ssd13x6_font.h | 0 components/services/battery.c | 12 +- components/services/component.mk | 3 +- components/services/led.c | 49 +++++++- components/services/monitor.c | 23 ++-- components/services/services.c | 5 +- components/services/tarablessd13x6/.gitignore | 4 - .../services/tarablessd13x6/CMakeLists.txt | 3 - components/services/tarablessd13x6/Kconfig | 106 ------------------ components/services/tarablessd13x6/LICENSE | 9 -- components/services/tarablessd13x6/README.md | 16 --- .../services/tarablessd13x6/component.mk | 2 - main/Kconfig.projbuild | 42 +++++-- main/esp_app_main.c | 4 +- 49 files changed, 141 insertions(+), 188 deletions(-) create mode 100644 components/display/CMakeLists.txt create mode 100644 components/display/component.mk rename components/{services => display}/display.c (100%) rename components/{services => display}/display.h (100%) rename components/{services => display}/driver_SSD13x6.c (100%) rename components/{services => display}/tarablessd13x6/fonts/LICENSE-apache (100%) rename components/{services => display}/tarablessd13x6/fonts/LICENSE-liberation-mono (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_liberation_mono_13x21.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_liberation_mono_17x30.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_liberation_mono_9x15.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_line_1.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_line_2.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_tarable7seg_16x32.c (100%) rename components/{services => display}/tarablessd13x6/fonts/font_tarable7seg_32x64.c (100%) rename components/{services => display}/tarablessd13x6/ifaces/default_if_i2c.c (100%) rename components/{services => display}/tarablessd13x6/ifaces/default_if_spi.c (100%) rename components/{services => display}/tarablessd13x6/ssd13x6.c (100%) rename components/{services => display}/tarablessd13x6/ssd13x6.h (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_default_if.h (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_draw.c (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_draw.h (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_err.h (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_font.c (100%) rename components/{services => display}/tarablessd13x6/ssd13x6_font.h (100%) delete mode 100644 components/services/tarablessd13x6/.gitignore delete mode 100644 components/services/tarablessd13x6/CMakeLists.txt delete mode 100644 components/services/tarablessd13x6/Kconfig delete mode 100644 components/services/tarablessd13x6/LICENSE delete mode 100644 components/services/tarablessd13x6/README.md delete mode 100644 components/services/tarablessd13x6/component.mk diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index b26123a5..cb56b9b8 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -12,9 +12,12 @@ CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_BAT_CONFIG="" +CONFIG_BAT_CHANNEL=-1 +CONFIG_BAT_SCALE="0" CONFIG_I2S_BCK_IO=27 CONFIG_I2S_WS_IO=26 CONFIG_I2S_DO_IO=25 diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index d61358ce..cd01f32c 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -9,9 +9,12 @@ CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_BAT_CONFIG="" +CONFIG_BAT_CHANNEL=-1 +CONFIG_BAT_SCALE="0" CONFIG_I2S_NUM=0 CONFIG_I2S_BCK_IO=33 CONFIG_I2S_WS_IO=25 diff --git a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults index 29b8b12d..6aaaf371 100644 --- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults @@ -9,9 +9,12 @@ CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_BAT_CONFIG="" +CONFIG_BAT_CHANNEL=-1 +CONFIG_BAT_SCALE="0" CONFIG_I2S_NUM=0 CONFIG_I2S_BCK_IO=33 CONFIG_I2S_WS_IO=25 diff --git a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults index 020404b6..a77a22eb 100644 --- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults @@ -8,16 +8,20 @@ CONFIG_JACK_LOCKED=y CONFIG_BAT_LOCKED=y CONFIG_I2C_LOCKED=y CONFIG_SPDIF_LOCKED=y +CONFIG_LED_LOCKED=y CONFIG_DISPLAY_CONFIG="" CONFIG_I2C_CONFIG="" CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_GREEN_GPIO_LEVEL=0 CONFIG_LED_RED_GPIO=13 +CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 -CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_BAT_CHANNEL=7 +CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 CONFIG_I2S_BCK_IO=33 CONFIG_I2S_WS_IO=25 diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index 67329f92..c9f2130c 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -8,16 +8,20 @@ CONFIG_JACK_LOCKED=y CONFIG_BAT_LOCKED=y CONFIG_I2C_LOCKED=y CONFIG_SPDIF_LOCKED=y +CONFIG_LED_LOCKED=y CONFIG_DISPLAY_CONFIG="" CONFIG_I2C_CONFIG="" CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_GREEN_GPIO_LEVEL=0 CONFIG_LED_RED_GPIO=13 +CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 -CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_BAT_CHANNEL=7 +CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 CONFIG_I2S_BCK_IO=33 CONFIG_I2S_WS_IO=25 diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index 4681bb66..712cdff1 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -8,16 +8,20 @@ CONFIG_JACK_LOCKED=y CONFIG_BAT_LOCKED=y CONFIG_I2C_LOCKED=y CONFIG_SPDIF_LOCKED=y +CONFIG_LED_LOCKED=y CONFIG_DISPLAY_CONFIG="" CONFIG_I2C_CONFIG="" CONFIG_SPI_CONFIG="" CONFIG_SET_GPIO="" CONFIG_ROTARY_ENCODER="" CONFIG_LED_GREEN_GPIO=12 +CONFIG_LED_GREEN_GPIO_LEVEL=0 CONFIG_LED_RED_GPIO=13 +CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 -CONFIG_BAT_CONFIG="channel=7,scale=20.24" +CONFIG_BAT_CHANNEL=7 +CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 CONFIG_I2S_BCK_IO=33 CONFIG_I2S_WS_IO=25 diff --git a/components/display/CMakeLists.txt b/components/display/CMakeLists.txt new file mode 100644 index 00000000..4672e0c6 --- /dev/null +++ b/components/display/CMakeLists.txt @@ -0,0 +1,6 @@ +idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS + INCLUDE_DIRS . ../tools/ + +) + + diff --git a/components/display/component.mk b/components/display/component.mk new file mode 100644 index 00000000..295c75c4 --- /dev/null +++ b/components/display/component.mk @@ -0,0 +1,12 @@ +# +# Component Makefile +# +# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default, +# this will take the sources in the src/ directory, compile them and link them into +# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable, +# please read the SDK documents if you need to do this. +# + +COMPONENT_SRCDIRS := . tarablessd13x6 tarablessd13x6/fonts tarablessd13x6/ifaces +COMPONENT_ADD_INCLUDEDIRS := . +COMPONENT_ADD_INCLUDEDIRS += ./tarablessd13x6 \ No newline at end of file diff --git a/components/services/display.c b/components/display/display.c similarity index 100% rename from components/services/display.c rename to components/display/display.c diff --git a/components/services/display.h b/components/display/display.h similarity index 100% rename from components/services/display.h rename to components/display/display.h diff --git a/components/services/driver_SSD13x6.c b/components/display/driver_SSD13x6.c similarity index 100% rename from components/services/driver_SSD13x6.c rename to components/display/driver_SSD13x6.c diff --git a/components/services/tarablessd13x6/fonts/LICENSE-apache b/components/display/tarablessd13x6/fonts/LICENSE-apache similarity index 100% rename from components/services/tarablessd13x6/fonts/LICENSE-apache rename to components/display/tarablessd13x6/fonts/LICENSE-apache diff --git a/components/services/tarablessd13x6/fonts/LICENSE-liberation-mono b/components/display/tarablessd13x6/fonts/LICENSE-liberation-mono similarity index 100% rename from components/services/tarablessd13x6/fonts/LICENSE-liberation-mono rename to components/display/tarablessd13x6/fonts/LICENSE-liberation-mono diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c b/components/display/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_fallback_11x13.c diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c b/components/display/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_fallback_15x17.c diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c b/components/display/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_fallback_24x28.c diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c b/components/display/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_mono_13x24.c diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c b/components/display/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_mono_16x31.c diff --git a/components/services/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c b/components/display/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c rename to components/display/tarablessd13x6/fonts/font_droid_sans_mono_7x13.c diff --git a/components/services/tarablessd13x6/fonts/font_liberation_mono_13x21.c b/components/display/tarablessd13x6/fonts/font_liberation_mono_13x21.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_liberation_mono_13x21.c rename to components/display/tarablessd13x6/fonts/font_liberation_mono_13x21.c diff --git a/components/services/tarablessd13x6/fonts/font_liberation_mono_17x30.c b/components/display/tarablessd13x6/fonts/font_liberation_mono_17x30.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_liberation_mono_17x30.c rename to components/display/tarablessd13x6/fonts/font_liberation_mono_17x30.c diff --git a/components/services/tarablessd13x6/fonts/font_liberation_mono_9x15.c b/components/display/tarablessd13x6/fonts/font_liberation_mono_9x15.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_liberation_mono_9x15.c rename to components/display/tarablessd13x6/fonts/font_liberation_mono_9x15.c diff --git a/components/services/tarablessd13x6/fonts/font_line_1.c b/components/display/tarablessd13x6/fonts/font_line_1.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_line_1.c rename to components/display/tarablessd13x6/fonts/font_line_1.c diff --git a/components/services/tarablessd13x6/fonts/font_line_2.c b/components/display/tarablessd13x6/fonts/font_line_2.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_line_2.c rename to components/display/tarablessd13x6/fonts/font_line_2.c diff --git a/components/services/tarablessd13x6/fonts/font_tarable7seg_16x32.c b/components/display/tarablessd13x6/fonts/font_tarable7seg_16x32.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_tarable7seg_16x32.c rename to components/display/tarablessd13x6/fonts/font_tarable7seg_16x32.c diff --git a/components/services/tarablessd13x6/fonts/font_tarable7seg_32x64.c b/components/display/tarablessd13x6/fonts/font_tarable7seg_32x64.c similarity index 100% rename from components/services/tarablessd13x6/fonts/font_tarable7seg_32x64.c rename to components/display/tarablessd13x6/fonts/font_tarable7seg_32x64.c diff --git a/components/services/tarablessd13x6/ifaces/default_if_i2c.c b/components/display/tarablessd13x6/ifaces/default_if_i2c.c similarity index 100% rename from components/services/tarablessd13x6/ifaces/default_if_i2c.c rename to components/display/tarablessd13x6/ifaces/default_if_i2c.c diff --git a/components/services/tarablessd13x6/ifaces/default_if_spi.c b/components/display/tarablessd13x6/ifaces/default_if_spi.c similarity index 100% rename from components/services/tarablessd13x6/ifaces/default_if_spi.c rename to components/display/tarablessd13x6/ifaces/default_if_spi.c diff --git a/components/services/tarablessd13x6/ssd13x6.c b/components/display/tarablessd13x6/ssd13x6.c similarity index 100% rename from components/services/tarablessd13x6/ssd13x6.c rename to components/display/tarablessd13x6/ssd13x6.c diff --git a/components/services/tarablessd13x6/ssd13x6.h b/components/display/tarablessd13x6/ssd13x6.h similarity index 100% rename from components/services/tarablessd13x6/ssd13x6.h rename to components/display/tarablessd13x6/ssd13x6.h diff --git a/components/services/tarablessd13x6/ssd13x6_default_if.h b/components/display/tarablessd13x6/ssd13x6_default_if.h similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_default_if.h rename to components/display/tarablessd13x6/ssd13x6_default_if.h diff --git a/components/services/tarablessd13x6/ssd13x6_draw.c b/components/display/tarablessd13x6/ssd13x6_draw.c similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_draw.c rename to components/display/tarablessd13x6/ssd13x6_draw.c diff --git a/components/services/tarablessd13x6/ssd13x6_draw.h b/components/display/tarablessd13x6/ssd13x6_draw.h similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_draw.h rename to components/display/tarablessd13x6/ssd13x6_draw.h diff --git a/components/services/tarablessd13x6/ssd13x6_err.h b/components/display/tarablessd13x6/ssd13x6_err.h similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_err.h rename to components/display/tarablessd13x6/ssd13x6_err.h diff --git a/components/services/tarablessd13x6/ssd13x6_font.c b/components/display/tarablessd13x6/ssd13x6_font.c similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_font.c rename to components/display/tarablessd13x6/ssd13x6_font.c diff --git a/components/services/tarablessd13x6/ssd13x6_font.h b/components/display/tarablessd13x6/ssd13x6_font.h similarity index 100% rename from components/services/tarablessd13x6/ssd13x6_font.h rename to components/display/tarablessd13x6/ssd13x6_font.h diff --git a/components/services/battery.c b/components/services/battery.c index e3ab43fa..7cf14d04 100644 --- a/components/services/battery.c +++ b/components/services/battery.c @@ -46,7 +46,6 @@ int battery_value_svc(void) { /**************************************************************************************** * */ -#ifdef CONFIG_BAT_CONFIG static void battery_callback(TimerHandle_t xTimer) { battery.sum += adc1_get_raw(battery.channel) * battery.scale / 4095.0; if (++battery.count == 30) { @@ -55,27 +54,25 @@ static void battery_callback(TimerHandle_t xTimer) { ESP_LOGI(TAG, "Voltage %.2fV", battery.avg); } } -#endif /**************************************************************************************** * */ void battery_svc_init(void) { -#ifdef CONFIG_BAT_CONFIG - char *p; - if ((p = strcasestr(CONFIG_BAT_CONFIG, "channel")) != NULL) battery.channel = atof(strchr(p, '=') + 1); - if ((p = strcasestr(CONFIG_BAT_CONFIG, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1); + battery.channel = CONFIG_BAT_CHANNEL; + battery.scale = atof(CONFIG_BAT_SCALE); #ifndef BAT_LOCKED char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0); if (nvs_item) { + char *p; if ((p = strcasestr(nvs_item, "channel")) != NULL) battery.channel = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1); free(nvs_item); } #endif - if (battery.scale) { + if (battery.channel != -1) { ESP_LOGI(TAG, "Battery measure channel: %u, scale %f", battery.channel, battery.scale); adc1_config_width(ADC_WIDTH_BIT_12); @@ -86,5 +83,4 @@ void battery_svc_init(void) { } else { ESP_LOGI(TAG, "No battery"); } -#endif } diff --git a/components/services/component.mk b/components/services/component.mk index 295c75c4..ace79fdb 100644 --- a/components/services/component.mk +++ b/components/services/component.mk @@ -7,6 +7,5 @@ # please read the SDK documents if you need to do this. # -COMPONENT_SRCDIRS := . tarablessd13x6 tarablessd13x6/fonts tarablessd13x6/ifaces +COMPONENT_SRCDIRS := . COMPONENT_ADD_INCLUDEDIRS := . -COMPONENT_ADD_INCLUDEDIRS += ./tarablessd13x6 \ No newline at end of file diff --git a/components/services/led.c b/components/services/led.c index 372c60d1..251828c4 100644 --- a/components/services/led.c +++ b/components/services/led.c @@ -17,6 +17,7 @@ #include "esp_log.h" #include "driver/gpio.h" #include "led.h" +#include "accessors.h" #define MAX_LED 8 #define BLOCKTIME 10 // up to portMAX_DELAY @@ -33,10 +34,15 @@ static struct led_s { TimerHandle_t timer; } leds[MAX_LED]; -void led_svc_init(void) { - ESP_LOGI(TAG, "Initializing led"); -} +static struct { + int gpio; + int state; +} green = { CONFIG_LED_GREEN_GPIO, CONFIG_LED_GREEN_GPIO_LEVEL}, + red = { CONFIG_LED_RED_GPIO, CONFIG_LED_RED_GPIO_LEVEL }; +/**************************************************************************************** + * + */ static void vCallbackFunction( TimerHandle_t xTimer ) { struct led_s *led = (struct led_s*) pvTimerGetTimerID (xTimer); @@ -53,6 +59,9 @@ static void vCallbackFunction( TimerHandle_t xTimer ) { xTimerChangePeriod(xTimer, (led->on ? led->ontime : led->offtime) / portTICK_RATE_MS, BLOCKTIME); } +/**************************************************************************************** + * + */ bool led_blink_core(int idx, int ontime, int offtime, bool pushed) { if (!leds[idx].gpio || leds[idx].gpio<0 ) return false; @@ -99,6 +108,9 @@ bool led_blink_core(int idx, int ontime, int offtime, bool pushed) { return true; } +/**************************************************************************************** + * + */ bool led_unpush(int idx) { if (!leds[idx].gpio || leds[idx].gpio<0) return false; @@ -108,6 +120,9 @@ bool led_unpush(int idx) { return true; } +/**************************************************************************************** + * + */ bool led_config(int idx, gpio_num_t gpio, int onstate) { if(gpio<0){ ESP_LOGW(TAG,"LED GPIO not configured"); @@ -127,6 +142,9 @@ bool led_config(int idx, gpio_num_t gpio, int onstate) { return true; } +/**************************************************************************************** + * + */ bool led_unconfig(int idx) { if (idx >= MAX_LED) return false; @@ -135,3 +153,28 @@ bool led_unconfig(int idx) { return true; } + +/**************************************************************************************** + * + */ +void set_led_gpio(int gpio, char *value) { + char *p; + + if (strcasestr(value, "green")) { + green.gpio = gpio; + if ((p = strchr(value, ':')) != NULL) green.state = atoi(p + 1); + } else if (strcasestr(value, "red")) { + red.state = gpio; + if ((p = strchr(value, ':')) != NULL) red.state = atoi(p + 1); + } +} + +void led_svc_init(void) { +#ifndef LED_LOCKED + parse_set_GPIO(set_led_gpio); +#endif + ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d), red:%d (active:%d)", green.gpio, green.state, red.gpio, red.state); + + led_config(LED_GREEN, green.gpio, green.state); + led_config(LED_RED, red.gpio, red.state); +} diff --git a/components/services/monitor.c b/components/services/monitor.c index 75d44357..0a1c4b05 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -88,24 +88,23 @@ bool spkfault_svc (void) { * */ void set_jack_gpio(int gpio, char *value) { - bool low = false; + char *p; + int active = 1; - if (!strcasecmp(value, "jack_l")) { - jack_gpio = gpio; - low = true; - } else if (!strcasecmp(value, "jack_h")) { + if (strcasestr(value, "jack")) { jack_gpio = gpio; + if ((p = strchr(value, ':')) != NULL) active = atoi(p + 1); } if (jack_gpio != -1) { gpio_pad_select_gpio(jack_gpio); gpio_set_direction(jack_gpio, GPIO_MODE_INPUT); - gpio_set_pull_mode(jack_gpio, low ? GPIO_PULLUP_ONLY : GPIO_PULLDOWN_ONLY); + gpio_set_pull_mode(jack_gpio, active ? GPIO_PULLDOWN_ONLY : GPIO_PULLUP_ONLY); - ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", low ? "low" : "high", gpio); + ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", active ? "high" : "low", gpio); // re-use button management for jack handler, it's a GPIO after all - button_create(NULL, jack_gpio, low ? BUTTON_LOW : BUTTON_HIGH, false, 250, jack_handler_default, 0, -1); + button_create(NULL, jack_gpio, active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1); } } @@ -115,14 +114,12 @@ void set_jack_gpio(int gpio, char *value) { void monitor_svc_init(void) { ESP_LOGI(TAG, "Initializing monitoring"); -#ifdef CONFIG_JACK_GPIO - jack_gpio = CONFIG_JACK_GPIO; #if CONFIG_JACK_GPIO_LEVEL == 1 - set_jack_gpio(CONFIG_JACK_GPIO, "jack_h"); + set_jack_gpio(CONFIG_JACK_GPIO, "jack:1"); #else - set_jack_gpio(CONFIG_JACK_GPIO, "jack_l"); -#endif + set_jack_gpio(CONFIG_JACK_GPIO, "jack:0"); #endif + #ifndef CONFIG_JACK_LOCKED parse_set_GPIO(set_jack_gpio); #endif diff --git a/components/services/services.c b/components/services/services.c index fc118741..aa972540 100644 --- a/components/services/services.c +++ b/components/services/services.c @@ -45,6 +45,7 @@ void set_power_gpio(int gpio, char *value) { if (parsed) ESP_LOGI(TAG, "set GPIO %u to %s", gpio, value); } + /**************************************************************************************** * @@ -88,11 +89,7 @@ void services_init(void) { ESP_LOGW(TAG, "no SPI configured"); } - ESP_LOGD(TAG,"Configuring LEDs green:%d red:%d", CONFIG_LED_GREEN_GPIO, CONFIG_LED_RED_GPIO); led_svc_init(); - led_config(LED_GREEN, CONFIG_LED_GREEN_GPIO, 0); - led_config(LED_RED, CONFIG_LED_RED_GPIO, 0); - battery_svc_init(); monitor_svc_init(); } \ No newline at end of file diff --git a/components/services/tarablessd13x6/.gitignore b/components/services/tarablessd13x6/.gitignore deleted file mode 100644 index 4140eec1..00000000 --- a/components/services/tarablessd13x6/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.vscode -build -.DS_Store - diff --git a/components/services/tarablessd13x6/CMakeLists.txt b/components/services/tarablessd13x6/CMakeLists.txt deleted file mode 100644 index 7498b266..00000000 --- a/components/services/tarablessd13x6/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -set(COMPONENT_SRCDIRS ". fonts ifaces") -set(COMPONENT_ADD_INCLUDEDIRS ".") -register_component() diff --git a/components/services/tarablessd13x6/Kconfig b/components/services/tarablessd13x6/Kconfig deleted file mode 100644 index cc2cb11a..00000000 --- a/components/services/tarablessd13x6/Kconfig +++ /dev/null @@ -1,106 +0,0 @@ -menu "TarableSSD1306" - -config SSD1306_ENABLE_DEFAULT_I2C_INTERFACE - bool "Enable default i2c master interface code" - default y - help - Provides initialization code for both the i2c bus and i2c display device. - -config SSD1306_DEFAULT_I2C_SPEED - depends on SSD1306_ENABLE_DEFAULT_I2C_INTERFACE - int "Bus speed for i2c master" - default 250000 - help - Default i2c interface speed in Hz - -config SSD1306_DEFAULT_I2C_PORT_NUMBER - depends on SSD1306_ENABLE_DEFAULT_I2C_INTERFACE - int "I2C port number to use" - default 0 - -config SSD1306_DEFAULT_I2C_SCL_PIN - depends on SSD1306_ENABLE_DEFAULT_I2C_INTERFACE - int "Default SCL pin number" - default 22 - -config SSD1306_DEFAULT_I2C_SDA_PIN - depends on SSD1306_ENABLE_DEFAULT_I2C_INTERFACE - int "Default SDA pin number" - default 21 - -config SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - bool "Enable default SPI interface" - default y - help - Provides initialization code for both the i2c device and spi attached display. - -config SSD1306_DEFAULT_SPI_HOST - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - int - default 1 if SSD1306_USE_HSPI_HOST - default 2 if SSD1306_USE_VSPI_HOST - - choice - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - prompt "Default SPI host" - default SSD1306_USE_HSPI_HOST - - config SSD1306_USE_HSPI_HOST - bool "HSPI" - - config SSD1306_USE_VSPI_HOST - bool "VSPI" - endchoice - -config SSD1306_DEFAULT_SPI_FREQUENCY - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - int "Default frequency for SPI attached display" - default 1000000 - -config SSD1306_DEFAULT_SPI_MOSI_PIN - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - int "Default MOSI pin number" - default 13 - -config SSD1306_DEFAULT_SPI_SCLK_PIN - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - int "Default SCLK pin number" - default 14 - -config SSD1306_DEFAULT_SPI_DC_PIN - depends on SSD1306_ENABLE_DEFAULT_SPI_INTERFACE - int "Default DC pin number" - default 33 - -config SSD1306_ERROR_ABORT - bool "Call abort() on all errors" - default y - -config SSD1306_CLIPDEBUG - int - default 0 if CLIPDEBUG_NONE - default 1 if CLIPDEBUG_WARNING - default 2 if CLIPDEBUG_ERROR - - choice - prompt "Clipping debug level" - default CLIPDEBUG_WARNING - - - config CLIPDEBUG_NONE - bool "None" - help - Drawing operations clip silently. - - config CLIPDEBUG_WARNING - bool "Warning" - help - If a drawing operation is clipped a warning is written to the console. - - config CLIPDEBUG_ERROR - bool "Error" - help - If a drawing operation is clipped an error is written to the console along with an abort. - endchoice - -endmenu diff --git a/components/services/tarablessd13x6/LICENSE b/components/services/tarablessd13x6/LICENSE deleted file mode 100644 index 41c0c99a..00000000 --- a/components/services/tarablessd13x6/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) 2017 Tara Keeling - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/components/services/tarablessd13x6/README.md b/components/services/tarablessd13x6/README.md deleted file mode 100644 index e0d16354..00000000 --- a/components/services/tarablessd13x6/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# SSD1306 Component for the ESP32 and ESP-IDF SDK - -## About: -This is a simple component for the SSD1306 display. -It supports multiple display sizes on both i2c and spi interfaces. - -Check out the wiki where most of the relevant information is. - -***Examples:*** https://github.com/TaraHoleInIt/tarablessd1306_examples diff --git a/components/services/tarablessd13x6/component.mk b/components/services/tarablessd13x6/component.mk deleted file mode 100644 index d985d1e8..00000000 --- a/components/services/tarablessd13x6/component.mk +++ /dev/null @@ -1,2 +0,0 @@ -COMPONENT_SRCDIRS := . fonts ifaces -COMPONENT_ADD_INCLUDEDIRS := . diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 69268b08..0981c9b4 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -29,6 +29,8 @@ menu "Squeezelite-ESP32" bool config SPDIF_LOCKED bool + config LED_LOCKED + bool menu "Audio Output" choice OUTPUT_TYPE prompt "Output Type" @@ -41,6 +43,7 @@ menu "Squeezelite-ESP32" select BAT_LOCKED select I2C_LOCKED select SPDIF_LOCKED + select LED_LOCKED config A1S bool "ESP32-A1S module" select I2C_LOCKED @@ -49,7 +52,7 @@ menu "Squeezelite-ESP32" endchoice menu "DAC I2S settings" - visible if !SQUEEZEAMP && !A1S + visible if BASIC_I2C_BT config I2S_NUM int "I2S channel (0 or 1). " default 0 @@ -83,7 +86,7 @@ menu "Squeezelite-ESP32" endmenu menu "SPDIF settings" - visible if !SQUEEZEAMP && !A1S + visible if BASIC_I2C_BT config SDIF_NUM int "I2S channel for SDPIF (0 or 1)" default 0 @@ -202,9 +205,11 @@ menu "Squeezelite-ESP32" default "" help Set parameters of shared GPIO with special values. - =Vcc|GND|amp|jack_h|jack_l[,=Vcc|GND|amp|jack_h|jack_l] - 'amp' means a GPIO that is set when playback starts - 'jack_h' means the audio_gpio insertion detection (1=inserted, use 'jack_l' when 0=inserted) - see also "Jack Insertion GPIO" + =Vcc|GND|amp|jack[:0|1][,=Vcc|GND|amp|jack[:0|1]] + 'amp' => GPIO that is set when playback starts + 'jack' => GPIO used for audio jack detection + 'green', 'red' => GPIO for status LED + '[:0|1] means set the active value for that GPIO can be low or high config ROTARY_ENCODER string "Rotary Encoder configuration" default "" @@ -220,12 +225,22 @@ menu "Squeezelite-ESP32" default 12 if SQUEEZEAMP help Set to -1 for no LED + config LED_GREEN_GPIO_LEVEL + int "Green led ON level" + depends on LED_GREEN_GPIO != -1 + default 0 if SQUEEZEAMP + default 1 if !SQUEEZEAMP config LED_RED_GPIO int "Red led GPIO" default -1 if !SQUEEZEAMP default 13 if SQUEEZEAMP help Set to -1 for no LED + config LED_RED_GPIO_LEVEL + int "Red led ON level" + depends on LED_RED_GPIO != -1 + default 0 if SQUEEZEAMP + default 1 if !SQUEEZEAMP endmenu menu "Audio JACK" visible if !SQUEEZEAMP @@ -242,12 +257,19 @@ menu "Squeezelite-ESP32" endmenu menu "Battery measure" visible if !SQUEEZEAMP - config BAT_CONFIG - string "Set channel and scale" - default "" if !SQUEEZEAMP - default "channel=7,scale=20.24" if SQUEEZEAMP + config BAT_CHANNEL + int "Set channel (0..7)" + default -1 if !SQUEEZEAMP + default 7 if SQUEEZEAMP help - Read a value every 10s on ADC1. Configuration format: channel=0..7,scale= + Read a value every 10s on ADC1 on set Channel + config BAT_SCALE + string "Set scaling factor" + depends on BAT_CHANNEL != -1 + default "" if !SQUEEZEAMP + default "20.24" if SQUEEZEAMP + help + Set the scaling factor for this 12 bits ADC endmenu endmenu \ No newline at end of file diff --git a/main/esp_app_main.c b/main/esp_app_main.c index e9a95bf9..f361874b 100644 --- a/main/esp_app_main.c +++ b/main/esp_app_main.c @@ -322,8 +322,8 @@ void register_default_nvs(){ ESP_LOGD(TAG,"Registering default value for key %s", "dac_config"); config_set_default(NVS_TYPE_STR, "dac_config", "", 0); - ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bat_config", CONFIG_BAT_CONFIG); - config_set_default(NVS_TYPE_STR, "bat_config", CONFIG_BAT_CONFIG, 0); + ESP_LOGD(TAG,"Registering default value for key %s", "bat_config"); + config_set_default(NVS_TYPE_STR, "bat_config", "", 0); ESP_LOGD(TAG,"Registering default value for key %s", "metadata_config"); config_set_default(NVS_TYPE_STR, "metadata_config", "", 0); From 5bee512a8529c4bf0a6a7fbd5fbd2f2e0aeb6c3f Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 12:11:32 -0800 Subject: [PATCH 08/23] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e8bc947..6bfe27ae 100644 --- a/README.md +++ b/README.md @@ -80,12 +80,14 @@ GPIO can be set to GND provide or Vcc at boot. This is convenient to power devic This parameter can use used as well to assign a GPIO that will be set to 1 when playback starts and wil be reset to 0 when squeezelite becomes idle. The idle timeout is set on the squeezelite command line through -C \ -Finally, if you have an audio jack that supports insertion (set to GND when inserted), you can specify whch GPIO it's connected to. Using the parameter jack_mutes_amp allows to mute the amp when headset (e.g.) is inserted. +If you have an audio jack that supports insertion (use :0 or :1 to set the level when inserted), you can specify which GPIO it's connected to. Using the parameter jack_mutes_amp allows to mute the amp when headset (e.g.) is inserted. + +You can set the Green and Red status led as well with their respective active state (:0 or :1) Syntax is: ``` -=Vcc|GND|amp|jack_h|jack_l[,=Vcc|GND|amp|jack_h|jack_l] +=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1][,=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1] ``` NB: jack_h is for jack inserted sets GPIO to 1 and jack_l is for 0 ### Rotary Encoder From 90d52dabaf2016d7068e614ed97f1ffa8a08918c Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 13:29:25 -0800 Subject: [PATCH 09/23] More refactoring last compile dependency on DAC --- build-scripts/ESP32-A1S-sdkconfig.defaults | 3 + build-scripts/I2S-4MFlash-sdkconfig.defaults | 3 + .../NonOTA-I2S-4MFlash-sdkconfig.defaults | 3 + .../NonOTA-SqueezeAmp-sdkconfig.defaults | 2 + .../SqueezeAmp4MBFlash-sdkconfig.defaults | 2 + .../SqueezeAmp8MBFlash-sdkconfig.defaults | 2 + components/cmd_i2c/cmd_i2ctools.c | 2 +- components/services/battery.c | 2 +- components/services/globdefs.h | 1 - components/services/led.c | 2 +- components/services/monitor.c | 65 +++++++------------ main/Kconfig.projbuild | 20 +++++- 12 files changed, 61 insertions(+), 46 deletions(-) diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults index cb56b9b8..4c23a8fe 100644 --- a/build-scripts/ESP32-A1S-sdkconfig.defaults +++ b/build-scripts/ESP32-A1S-sdkconfig.defaults @@ -16,6 +16,9 @@ CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=-1 CONFIG_BAT_SCALE="0" CONFIG_I2S_BCK_IO=27 diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index cd01f32c..41a0b935 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -13,6 +13,9 @@ CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=-1 CONFIG_BAT_SCALE="0" CONFIG_I2S_NUM=0 diff --git a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults index 6aaaf371..a783b563 100644 --- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults @@ -13,6 +13,9 @@ CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=-1 CONFIG_BAT_SCALE="0" CONFIG_I2S_NUM=0 diff --git a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults index a77a22eb..4fa041ad 100644 --- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults @@ -20,6 +20,8 @@ CONFIG_LED_RED_GPIO=13 CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=2 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=7 CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index c9f2130c..6038d934 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -20,6 +20,8 @@ CONFIG_LED_RED_GPIO=13 CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=2 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=7 CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index 712cdff1..f0a45d9a 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -20,6 +20,8 @@ CONFIG_LED_RED_GPIO=13 CONFIG_LED_RED_GPIO_LEVEL=0 CONFIG_JACK_GPIO=34 CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_SPKFAULT_GPIO=2 +CONFIG_SPKFAULT_GPIO_LEVEL=0 CONFIG_BAT_CHANNEL=7 CONFIG_BAT_SCALE="20.24" CONFIG_I2S_NUM=0 diff --git a/components/cmd_i2c/cmd_i2ctools.c b/components/cmd_i2c/cmd_i2ctools.c index a71f378a..f03f253e 100644 --- a/components/cmd_i2c/cmd_i2ctools.c +++ b/components/cmd_i2c/cmd_i2ctools.c @@ -32,7 +32,7 @@ static const char *TAG = "cmd_i2ctools"; static gpio_num_t i2c_gpio_sda = 19; static gpio_num_t i2c_gpio_scl = 18; static uint32_t i2c_frequency = 100000; -#ifdef I2C_LOCKED +#ifdef CONFIG_I2C_LOCKED static i2c_port_t i2c_port = I2C_NUM_1; #else static i2c_port_t i2c_port = I2C_NUM_0; diff --git a/components/services/battery.c b/components/services/battery.c index 7cf14d04..5208df0a 100644 --- a/components/services/battery.c +++ b/components/services/battery.c @@ -62,7 +62,7 @@ void battery_svc_init(void) { battery.channel = CONFIG_BAT_CHANNEL; battery.scale = atof(CONFIG_BAT_SCALE); -#ifndef BAT_LOCKED +#ifndef CONFIG_BAT_LOCKED char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0); if (nvs_item) { char *p; diff --git a/components/services/globdefs.h b/components/services/globdefs.h index 92c93a42..5fdfec5b 100644 --- a/components/services/globdefs.h +++ b/components/services/globdefs.h @@ -29,7 +29,6 @@ extern int spi_system_dc_gpio; extern bool gpio36_39_used; #ifdef CONFIG_SQUEEZEAMP -#define SPKFAULT_GPIO 2 // this requires a pull-up, so can't be >34 #define ADAC dac_tas57xx #elif defined(CONFIG_A1S) #define ADAC dac_a1s diff --git a/components/services/led.c b/components/services/led.c index 251828c4..f4094bff 100644 --- a/components/services/led.c +++ b/components/services/led.c @@ -170,7 +170,7 @@ void set_led_gpio(int gpio, char *value) { } void led_svc_init(void) { -#ifndef LED_LOCKED +#ifndef CONFIG_LED_LOCKED parse_set_GPIO(set_led_gpio); #endif ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d), red:%d (active:%d)", green.gpio, green.state, red.gpio, red.state); diff --git a/components/services/monitor.c b/components/services/monitor.c index 0a1c4b05..d9fff0da 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -26,7 +26,12 @@ static const char *TAG = "monitor"; static TimerHandle_t monitor_timer; -static int jack_gpio = -1; + +static struct { + int gpio; + int active; +} jack = { CONFIG_JACK_GPIO, CONFIG_JACK_GPIO_LEVEL }, + spkfault = { CONFIG_SPKFAULT_GPIO, CONFIG_SPKFAULT_GPIO_LEVEL }; void (*jack_handler_svc)(bool inserted); bool jack_inserted_svc(void); @@ -57,54 +62,34 @@ static void jack_handler_default(void *id, button_event_e event, button_press_e * */ bool jack_inserted_svc (void) { - if (jack_gpio != -1) return button_is_pressed(jack_gpio, NULL); - else return false; + return button_is_pressed(jack.gpio, NULL); } /**************************************************************************************** * */ -#ifdef SPKFAULT_GPIO static void spkfault_handler_default(void *id, button_event_e event, button_press_e mode, bool long_press) { ESP_LOGD(TAG, "Speaker status %s", event == BUTTON_PRESSED ? "faulty" : "normal"); if (event == BUTTON_PRESSED) led_on(LED_RED); else led_off(LED_RED); if (spkfault_handler_svc) (*spkfault_handler_svc)(event == BUTTON_PRESSED); } -#endif /**************************************************************************************** * */ bool spkfault_svc (void) { -#ifdef SPKFAULT_GPIO - return !gpio_get_level(SPKFAULT_GPIO); -#else - return false; -#endif + return button_is_pressed(spkfault.gpio, NULL); } /**************************************************************************************** * */ void set_jack_gpio(int gpio, char *value) { - char *p; - int active = 1; - if (strcasestr(value, "jack")) { - jack_gpio = gpio; - if ((p = strchr(value, ':')) != NULL) active = atoi(p + 1); - } - - if (jack_gpio != -1) { - gpio_pad_select_gpio(jack_gpio); - gpio_set_direction(jack_gpio, GPIO_MODE_INPUT); - gpio_set_pull_mode(jack_gpio, active ? GPIO_PULLDOWN_ONLY : GPIO_PULLUP_ONLY); - - ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", active ? "high" : "low", gpio); - - // re-use button management for jack handler, it's a GPIO after all - button_create(NULL, jack_gpio, active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1); + char *p; + jack.gpio = gpio; + if ((p = strchr(value, ':')) != NULL) jack.active = atoi(p + 1); } } @@ -114,25 +99,26 @@ void set_jack_gpio(int gpio, char *value) { void monitor_svc_init(void) { ESP_LOGI(TAG, "Initializing monitoring"); -#if CONFIG_JACK_GPIO_LEVEL == 1 - set_jack_gpio(CONFIG_JACK_GPIO, "jack:1"); -#else - set_jack_gpio(CONFIG_JACK_GPIO, "jack:0"); -#endif - #ifndef CONFIG_JACK_LOCKED parse_set_GPIO(set_jack_gpio); #endif -#ifdef SPKFAULT_GPIO - gpio_pad_select_gpio(SPKFAULT_GPIO); - gpio_set_direction(SPKFAULT_GPIO, GPIO_MODE_INPUT); - gpio_set_pull_mode(SPKFAULT_GPIO, GPIO_PULLUP_ONLY); - - // re-use button management for speaker fault handler, it's a GPIO after all - button_create(NULL, SPKFAULT_GPIO, BUTTON_LOW, true, 0, spkfault_handler_default, 0, -1); + // re-use button management for jack handler, it's a GPIO after all + if (jack.gpio != -1) { + ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", jack.active ? "high" : "low", jack.gpio); + button_create(NULL, jack.gpio, jack.active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1); + } + +#ifndef CONFIG_SPKFAULT_LOCKED + parse_set_GPIO(set_spkfault_gpio); #endif + // re-use button management for speaker fault handler, it's a GPIO after all + if (spkfault.gpio != -1) { + ESP_LOGI(TAG,"Adding speaker fault (%s) detection GPIO %d", spkfault.active ? "high" : "low", spkfault.gpio); + button_create(NULL, spkfault.gpio, spkfault.active ? BUTTON_HIGH : BUTTON_LOW, false, 0, spkfault_handler_default, 0, -1); + } + // do we want stats char *p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0); if (p && (*p == '1' || *p == 'Y' || *p == 'y')) { @@ -140,5 +126,4 @@ void monitor_svc_init(void) { xTimerStart(monitor_timer, portMAX_DELAY); } free(p); - } diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 0981c9b4..fecc7e19 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -31,6 +31,8 @@ menu "Squeezelite-ESP32" bool config LED_LOCKED bool + config SPKFAULT_LOCKED + bool menu "Audio Output" choice OUTPUT_TYPE prompt "Output Type" @@ -44,6 +46,7 @@ menu "Squeezelite-ESP32" select I2C_LOCKED select SPDIF_LOCKED select LED_LOCKED + select SPKFAULT_LOCKED config A1S bool "ESP32-A1S module" select I2C_LOCKED @@ -249,11 +252,24 @@ menu "Squeezelite-ESP32" default -1 if !SQUEEZEAMP default 34 if SQUEEZEAMP help - GPIO to detect speaker jack insertion. Set to -1 for no detection. This takes precedence over runtime jack GPIO + GPIO to detect speaker jack insertion. Set to -1 for no detection. config JACK_GPIO_LEVEL depends on JACK_GPIO != -1 int "Level when inserted (0/1)" - default 0 + default 0 + endmenu + menu "Speaker Fault" + visible if !SQUEEZEAMP + config SPKFAULT_GPIO + int "Speaker fault GPIO" + default -1 if !SQUEEZEAMP + default 2 if SQUEEZEAMP + help + GPIO to detect speaker fault condition. Set to -1 for no detection. + config SPKFAULT_GPIO_LEVEL + depends on SPKFAULT_GPIO != -1 + int "Level when fault (0/1)" + default 0 endmenu menu "Battery measure" visible if !SQUEEZEAMP From c4b0168370d16d22a261e056aa01b4daac6c75b8 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 14:22:35 -0800 Subject: [PATCH 10/23] auto-detect DAC --- components/services/battery.c | 2 ++ components/services/led.c | 26 ++++++++++++------- components/services/monitor.c | 26 ++++++++++++++++--- components/squeezelite/a1s/ac101.c | 19 ++++++++------ .../squeezelite/external/dac_external.c | 2 +- components/squeezelite/output_i2s.c | 12 +++++---- components/squeezelite/tas57xx/dac_57xx.c | 26 ++++++++++++------- 7 files changed, 77 insertions(+), 36 deletions(-) diff --git a/components/services/battery.c b/components/services/battery.c index 5208df0a..1af4a69a 100644 --- a/components/services/battery.c +++ b/components/services/battery.c @@ -60,7 +60,9 @@ static void battery_callback(TimerHandle_t xTimer) { */ void battery_svc_init(void) { battery.channel = CONFIG_BAT_CHANNEL; +#ifdef CONFIG_BAT_SCALE battery.scale = atof(CONFIG_BAT_SCALE); +#endif #ifndef CONFIG_BAT_LOCKED char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0); diff --git a/components/services/led.c b/components/services/led.c index f4094bff..de1be4d7 100644 --- a/components/services/led.c +++ b/components/services/led.c @@ -36,9 +36,9 @@ static struct led_s { static struct { int gpio; - int state; -} green = { CONFIG_LED_GREEN_GPIO, CONFIG_LED_GREEN_GPIO_LEVEL}, - red = { CONFIG_LED_RED_GPIO, CONFIG_LED_RED_GPIO_LEVEL }; + int active; +} green = { CONFIG_LED_GREEN_GPIO, 0 }, + red = { CONFIG_LED_RED_GPIO, 0 }; /**************************************************************************************** * @@ -162,19 +162,27 @@ void set_led_gpio(int gpio, char *value) { if (strcasestr(value, "green")) { green.gpio = gpio; - if ((p = strchr(value, ':')) != NULL) green.state = atoi(p + 1); + if ((p = strchr(value, ':')) != NULL) green.active = atoi(p + 1); } else if (strcasestr(value, "red")) { - red.state = gpio; - if ((p = strchr(value, ':')) != NULL) red.state = atoi(p + 1); + red.active = gpio; + if ((p = strchr(value, ':')) != NULL) red.active = atoi(p + 1); } } void led_svc_init(void) { + +#ifdef CONFIG_LED_GREEN_GPIO_LEVEL + green.active = CONFIG_LED_GREEN_GPIO_LEVEL; +#endif +#ifdef CONFIG_LED_RED_GPIO_LEVEL + red.active = CONFIG_LED_RED_GPIO_LEVEL; +#endif + #ifndef CONFIG_LED_LOCKED parse_set_GPIO(set_led_gpio); #endif - ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d), red:%d (active:%d)", green.gpio, green.state, red.gpio, red.state); + ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d), red:%d (active:%d)", green.gpio, green.active, red.gpio, red.active); - led_config(LED_GREEN, green.gpio, green.state); - led_config(LED_RED, red.gpio, red.state); + led_config(LED_GREEN, green.gpio, green.active); + led_config(LED_RED, red.gpio, red.active); } diff --git a/components/services/monitor.c b/components/services/monitor.c index d9fff0da..b68bfe88 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -21,6 +21,7 @@ #include "globdefs.h" #include "config.h" #include "accessors.h" + #define MONITOR_TIMER (10*1000) static const char *TAG = "monitor"; @@ -30,8 +31,8 @@ static TimerHandle_t monitor_timer; static struct { int gpio; int active; -} jack = { CONFIG_JACK_GPIO, CONFIG_JACK_GPIO_LEVEL }, - spkfault = { CONFIG_SPKFAULT_GPIO, CONFIG_SPKFAULT_GPIO_LEVEL }; +} jack = { CONFIG_JACK_GPIO, 0 }, + spkfault = { CONFIG_SPKFAULT_GPIO, 0 }; void (*jack_handler_svc)(bool inserted); bool jack_inserted_svc(void); @@ -91,13 +92,28 @@ void set_jack_gpio(int gpio, char *value) { jack.gpio = gpio; if ((p = strchr(value, ':')) != NULL) jack.active = atoi(p + 1); } - } +} + +/**************************************************************************************** + * + */ +void set_spkfault_gpio(int gpio, char *value) { + if (strcasestr(value, "spkfault")) { + char *p; + spkfault.gpio = gpio; + if ((p = strchr(value, ':')) != NULL) spkfault.active = atoi(p + 1); + } +} /**************************************************************************************** * */ void monitor_svc_init(void) { ESP_LOGI(TAG, "Initializing monitoring"); + +#ifdef CONFIG_JACK_GPIO_LEVEL + jack.active = CONFIG_JACK_GPIO_LEVEL; +#endif #ifndef CONFIG_JACK_LOCKED parse_set_GPIO(set_jack_gpio); @@ -108,6 +124,10 @@ void monitor_svc_init(void) { ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", jack.active ? "high" : "low", jack.gpio); button_create(NULL, jack.gpio, jack.active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1); } + +#ifdef CONFIG_SPKFAULT_GPIO_LEVEL + spkfault.active = CONFIG_SPKFAULT_GPIO_LEVEL; +#endif #ifndef CONFIG_SPKFAULT_LOCKED parse_set_GPIO(set_spkfault_gpio); diff --git a/components/squeezelite/a1s/ac101.c b/components/squeezelite/a1s/ac101.c index bdd2bfa8..5ba59081 100644 --- a/components/squeezelite/a1s/ac101.c +++ b/components/squeezelite/a1s/ac101.c @@ -73,7 +73,6 @@ static int i2c_port; static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { esp_err_t res; - ESP_LOGI(TAG, "Initializing AC101"); i2c_port = i2c_port_num; // configure i2c @@ -88,17 +87,21 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { i2c_param_config(i2c_port, &i2c_config); i2c_driver_install(i2c_port, I2C_MODE_MASTER, false, false, false); - ESP_LOGI(TAG, "DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num); + + res = i2c_read_reg(CHIP_AUDIO_RS); + + if (!res) { + ESP_LOGW(TAG, "No AC101 detected"); + i2c_driver_delete(i2c_port); + return 0; + } + + ESP_LOGI(TAG, "AC101 DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num); res = i2c_write_reg(CHIP_AUDIO_RS, 0x123); // huh? - vTaskDelay(100 / portTICK_PERIOD_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); - if (ESP_OK != res) { - ESP_LOGE(TAG, "AC101 reset failed! %d", res); - return false; - } - // enable the PLL from BCLK source i2c_write_reg(PLL_CTRL1, BIN(0000,0001,0100,1111)); // F=1,M=1,PLL,INT=31 (medium) i2c_write_reg(PLL_CTRL2, BIN(1000,0110,0000,0000)); // PLL, F=96,N_i=1024-96,F=0,N_f=0*0.2; diff --git a/components/squeezelite/external/dac_external.c b/components/squeezelite/external/dac_external.c index 7e177006..49c5bf69 100644 --- a/components/squeezelite/external/dac_external.c +++ b/components/squeezelite/external/dac_external.c @@ -54,7 +54,7 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { i2s_driver_install(i2s_num, config, 0, NULL); i2s_set_pin(i2s_num, &i2s_pin_config); - ESP_LOGI(TAG, "DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); + ESP_LOGI(TAG, "External DAC using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num); return true; } else { diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index 25e30656..e36d98ec 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -242,9 +242,6 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch gpio_set_level(CONFIG_SPDIF_DO_IO, 0); #endif - // not very pretty ... - adac = &ADAC; - i2s_config.sample_rate = output.current_sample_rate; i2s_config.bits_per_sample = bytes_per_frame * 8 / 2; // Counted in frames (but i2s allocates a buffer <= 4092 bytes) @@ -253,8 +250,13 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch dma_buf_frames = DMA_BUF_COUNT * DMA_BUF_LEN; // finally let DAC driver initialize I2C and I2S - adac->init(I2C_PORT, CONFIG_I2S_NUM, &i2s_config); - } + if (dac_tas57xx.init(I2C_PORT, CONFIG_I2S_NUM, &i2s_config)) adac = &dac_tas57xx; + else if (dac_a1s.init(I2C_PORT, CONFIG_I2S_NUM, &i2s_config)) adac = &dac_a1s; + else { + dac_external.init(I2C_PORT, CONFIG_I2S_NUM, &i2s_config); + adac = &dac_external; + } + } LOG_INFO("Initializing I2S mode %s with rate: %d, bits per sample: %d, buffer frames: %d, number of buffers: %d ", spdif ? "S/PDIF" : "normal", diff --git a/components/squeezelite/tas57xx/dac_57xx.c b/components/squeezelite/tas57xx/dac_57xx.c index de451ca5..6a60dcb9 100644 --- a/components/squeezelite/tas57xx/dac_57xx.c +++ b/components/squeezelite/tas57xx/dac_57xx.c @@ -78,15 +78,8 @@ static int tas57_detect(void); * init */ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { - LOG_INFO("Initializing TAS57xx "); - i2c_port = i2c_port_num; - // init volume & mute - gpio_pad_select_gpio(VOLUME_GPIO); - gpio_set_direction(VOLUME_GPIO, GPIO_MODE_OUTPUT); - gpio_set_level(VOLUME_GPIO, 0); - // configure i2c i2c_config_t i2c_config = { .mode = I2C_MODE_MASTER, @@ -96,13 +89,26 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { .scl_pullup_en = GPIO_PULLUP_ENABLE, .master.clk_speed = 100000, }; + i2c_param_config(i2c_port, &i2c_config); i2c_driver_install(i2c_port, I2C_MODE_MASTER, false, false, false); - LOG_INFO("DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num); - - // find which TAS we are using + + // find which TAS we are using (if any) tas57_addr = tas57_detect(); + if (!tas57_addr) { + LOG_WARN("No TAS57xx detected"); + i2c_driver_delete(i2c_port); + return 0; + } + + LOG_INFO("TAS57xx DAC using I2C sda:%u, scl:%u", i2c_config.sda_io_num, i2c_config.scl_io_num); + + // init volume & mute + gpio_pad_select_gpio(VOLUME_GPIO); + gpio_set_direction(VOLUME_GPIO, GPIO_MODE_OUTPUT); + gpio_set_level(VOLUME_GPIO, 0); + i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create(); for (int i = 0; tas57xx_init_sequence[i].reg != 0xff; i++) { From a47812bb5d8f6353367d342883b62f5561c02a95 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 9 Feb 2020 14:33:26 -0800 Subject: [PATCH 11/23] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6bfe27ae..fa08f847 100644 --- a/README.md +++ b/README.md @@ -87,9 +87,8 @@ You can set the Green and Red status led as well with their respective active st Syntax is: ``` -=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1][,=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1] +=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1]|spkfault[:0|1][,] ``` -NB: jack_h is for jack inserted sets GPIO to 1 and jack_l is for 0 ### Rotary Encoder One rotary encoder is supported, quadrature shift with press. Such encoders usually have 2 pins for encoders (A and B), and common C that must be set to ground and an optional SW pin for press. A, B and SW must be pulled up, so automatic pull-up is provided by ESP32, but you can add your own resistors. A bit of filtering on A and B (~470nF) helps for debouncing which is not made by software. From 55e0efdb4a765eb91897b374850947645d6ccf5f Mon Sep 17 00:00:00 2001 From: philippe44 Date: Mon, 10 Feb 2020 13:19:46 -0800 Subject: [PATCH 12/23] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa08f847..b514e877 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g. sda=,scl=,port=0|1 ``` ### SPI -The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The D/C parameter is needed for displays. Syntax is +The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is ``` -data=,clk=[,d/c=][,host=0|1|2] +data=,clk=[,dc=][,host=0|1|2] ``` ### DAC/I2S The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can also define these at compile time but nvs parameter takes precedence. Note that on SqueezeAMP and A1S, these are forced at runtime, so this parameter does not matter. If your DAC also requires i2c, then you must go the re-compile route. Syntax is From 26c9a9e89795c160d8b6c24cac8afdbd2a409e61 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Mon, 10 Feb 2020 20:44:44 -0800 Subject: [PATCH 13/23] Verify that SPI works with SH1106 --- components/display/display.c | 6 +- components/display/driver_SSD13x6.c | 60 ++++--- .../tarablessd13x6/ifaces/default_if_i2c.c | 1 + .../tarablessd13x6/ifaces/default_if_spi.c | 21 +-- components/display/tarablessd13x6/ssd13x6.c | 146 ++++++++++-------- components/display/tarablessd13x6/ssd13x6.h | 7 +- components/services/accessors.c | 2 +- components/services/services.c | 8 +- components/squeezelite/display.c | 2 +- 9 files changed, 151 insertions(+), 102 deletions(-) diff --git a/components/display/display.c b/components/display/display.c index 1b938117..24ea5c93 100644 --- a/components/display/display.c +++ b/components/display/display.c @@ -36,7 +36,7 @@ static const char *TAG = "display"; #define min(a,b) (((a) < (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b)) -#define DISPLAYER_STACK_SIZE 2048 +#define DISPLAYER_STACK_SIZE (3*1024) #define SCROLLABLE_SIZE 384 #define HEADER_SIZE 64 #define DEFAULT_SLEEP 3600 @@ -66,14 +66,14 @@ void display_init(char *welcome) { if (item && *item) { char * drivername=strstr(item,"driver"); - if (!drivername || (drivername && (strcasestr(drivername,"SSD1306") || strcasestr(drivername,"SSD1326")))) { + if (!drivername || (drivername && (strcasestr(drivername,"SSD1306") || strcasestr(drivername,"SSD1326") || strcasestr(drivername,"SH1106")))) { display = &SSD13x6_display; if (display->init(item, welcome)) { init = true; ESP_LOGI(TAG, "Display initialization successful"); } else { display = NULL; - ESP_LOGE(TAG, "Display initialization failed"); + ESP_LOGW(TAG, "Display initialization failed"); } } else { ESP_LOGE(TAG,"Unknown display driver name in display config: %s",item); diff --git a/components/display/driver_SSD13x6.c b/components/display/driver_SSD13x6.c index 3ebfa695..e5bc3be9 100644 --- a/components/display/driver_SSD13x6.c +++ b/components/display/driver_SSD13x6.c @@ -89,7 +89,7 @@ static struct { * */ static bool init(char *config, char *welcome) { - bool res = false; + bool res = true; int width = -1, height = -1, model = SSD1306; char *p; @@ -98,14 +98,16 @@ static bool init(char *config, char *welcome) { // no time for smart parsing - this is for tinkerers if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1); if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1); - if ((p = strcasestr(config, "ssd1326")) != NULL) model = SSD1326; + + if (strcasestr(config, "ssd1326")) model = SSD1326; + else if (strcasestr(config, "sh1106")) model = SH1106; if (width == -1 || height == -1) { ESP_LOGW(TAG, "No display configured %s [%d x %d]", config, width, height); return false; } - if (strstr(config, "I2C")) { + if (strstr(config, "I2C") && i2c_system_port != -1) { int address = I2C_ADDRESS; if ((p = strcasestr(config, "address")) != NULL) address = atoi(strchr(p, '=') + 1); @@ -117,10 +119,11 @@ static bool init(char *config, char *welcome) { SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); SSD13x6_display.width = width; SSD13x6_display.height = height; + text(DISPLAY_FONT_MEDIUM, DISPLAY_CENTERED, DISPLAY_CLEAR | DISPLAY_UPDATE, welcome); + ESP_LOGI(TAG, "Display is I2C on port %u", address); - res = true; - } else if (strstr(config, "SPI")) { + } else if (strstr(config, "SPI") && spi_system_host != -1) { int CS_pin = -1; if ((p = strcasestr(config, "CS")) != NULL) CS_pin = atoi(strchr(p, '=') + 1); @@ -130,11 +133,14 @@ static bool init(char *config, char *welcome) { SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); SSD13x6_display.width = width; SSD13x6_display.height = height; + text(DISPLAY_FONT_MEDIUM, DISPLAY_CENTERED, DISPLAY_CLEAR | DISPLAY_UPDATE, welcome); - ESP_LOGI(TAG, "Display is SPI host %u with CS:%d", spi_system_host, CS_pin); + + ESP_LOGI(TAG, "Display is SPI host %u with cs:%d", spi_system_host, CS_pin); } else { - ESP_LOGE(TAG, "Unknown display type"); + res = false; + ESP_LOGW(TAG, "Unknown display type or no serial interface configured"); } return res; @@ -198,7 +204,7 @@ static bool set_font(int num, enum display_font_e font, int space) { */ static bool line(int num, int x, int attribute, char *text) { int width; - + // counting 1..n num--; @@ -219,10 +225,11 @@ static bool line(int num, int x, int attribute, char *text) { // erase if requested if (attribute & DISPLAY_CLEAR) { + int y_min = max(0, lines[num].y), y_max = max(0, lines[num].y + lines[num].font->Height); for (int c = (attribute & DISPLAY_ONLY_EOL) ? x : 0; c < Display.Width; c++) - for (int y = lines[num].y; y < lines[num].y + lines[num].font->Height; y++) + for (int y = y_min; y < y_max; y++) SSD13x6_DrawPixelFast( &Display, c, y, SSD_COLOR_BLACK ); - } + } SSD13x6_FontDrawString( &Display, x, lines[num].y, text, SSD_COLOR_WHITE ); @@ -368,18 +375,31 @@ static void draw_cbr(u8_t *data, int height) { #else if (!height) height = Display->Height; - // copy data in frame buffer - for (int c = 0; c < Display.Width; c++) - for (int r = 0; r < height / 8; r++) - Display.Framebuffer[c*Display.Height/8 + r] = BitReverseTable256[data[c*height/8 +r]]; - SSD13x6_SetPageAddress( &Display, 0, height / 8 - 1); - // force addressing mode by columns - if (AddressMode != AddressMode_Vertical) { - AddressMode = AddressMode_Vertical; - SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); - } + // force addressing mode by columns (if we can) + if (SSD13x6_GetCaps( &Display ) & CAPS_ADDRESS_VERTICAL) { + // just copy data in frame buffer with bit-reverse + for (int c = 0; c < Display.Width; c++) + for (int r = 0; r < height / 8; r++) + Display.Framebuffer[c*Display.Height/8 + r] = BitReverseTable256[data[c*height/8 +r]]; + + if (AddressMode != AddressMode_Vertical) { + AddressMode = AddressMode_Vertical; + SSD13x6_SetDisplayAddressMode( &Display, AddressMode ); + } + } else { + // need to do rwo/col swap and bit-reverse + int rows = (height ? height : Display.Height) / 8; + for (int r = 0; r < rows; r++) { + uint8_t *optr = Display.Framebuffer + r*Display.Width, *iptr = data + r; + for (int c = 0; c < Display.Width; c++) { + *optr++ = BitReverseTable256[*iptr];; + iptr += rows; + } + } + ESP_LOGW(TAG, "Can't set addressing mode to vertical, swapping"); + } SSD13x6_WriteRawData(&Display, Display.Framebuffer, Display.Width * Display.Height/8); #endif diff --git a/components/display/tarablessd13x6/ifaces/default_if_i2c.c b/components/display/tarablessd13x6/ifaces/default_if_i2c.c index 4a44d716..d5e6010b 100644 --- a/components/display/tarablessd13x6/ifaces/default_if_i2c.c +++ b/components/display/tarablessd13x6/ifaces/default_if_i2c.c @@ -70,6 +70,7 @@ bool SSD13x6_I2CMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, ESP_ERROR_CHECK_NONFATAL( gpio_set_level( RSTPin, 1 ), return false ); } + memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); DeviceHandle->Model = Model; return SSD13x6_Init_I2C( DeviceHandle, diff --git a/components/display/tarablessd13x6/ifaces/default_if_spi.c b/components/display/tarablessd13x6/ifaces/default_if_spi.c index cde9d465..2d7336c4 100644 --- a/components/display/tarablessd13x6/ifaces/default_if_spi.c +++ b/components/display/tarablessd13x6/ifaces/default_if_spi.c @@ -56,9 +56,10 @@ bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, } ESP_ERROR_CHECK_NONFATAL( spi_bus_add_device( SPIHost, &SPIDeviceConfig, &SPIDeviceHandle ), return false ); - + + memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); DeviceHandle->Model = Model; - + return SSD13x6_Init_SPI( DeviceHandle, Width, Height, @@ -72,19 +73,19 @@ bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, } static bool SPIDefaultWriteBytes( spi_device_handle_t SPIHandle, int WriteMode, const uint8_t* Data, size_t DataLength ) { - spi_transaction_t SPITransaction; + spi_transaction_t SPITransaction = { 0 }; NullCheck( SPIHandle, return false ); NullCheck( Data, return false ); if ( DataLength > 0 ) { - memset( &SPITransaction, 0, sizeof( spi_transaction_t ) ); - - SPITransaction.length = DataLength * 8; - SPITransaction.tx_buffer = Data; - - gpio_set_level( DCPin, WriteMode ); - ESP_ERROR_CHECK_NONFATAL( spi_device_transmit( SPIHandle, &SPITransaction ), return false ); + gpio_set_level( DCPin, WriteMode ); + + SPITransaction.length = DataLength * 8; + SPITransaction.tx_buffer = Data; + + // only do polling as we don't have contention on SPI (otherwise DMA for transfers > 16 bytes) + ESP_ERROR_CHECK_NONFATAL( spi_device_polling_transmit(SPIHandle, &SPITransaction), return false ); } return true; diff --git a/components/display/tarablessd13x6/ssd13x6.c b/components/display/tarablessd13x6/ssd13x6.c index 8795279c..9b758202 100644 --- a/components/display/tarablessd13x6/ssd13x6.c +++ b/components/display/tarablessd13x6/ssd13x6.c @@ -15,15 +15,6 @@ #include "ssd13x6.h" -#define COM_Disable_LR_Remap 0 -#define COM_Enable_LR_Remap BIT( 5 ) - -#define COM_Pins_Sequential 0 -#define COM_Pins_Alternative BIT( 4 ) - -#define COM_ScanDir_LR 0 -#define COM_ScanDir_RL 1 - // used by both but different static uint8_t SSDCmd_Set_Display_Start_Line; static uint8_t SSDCmd_Set_Display_Offset; @@ -37,6 +28,11 @@ static const uint8_t SSD13x6_Max_Row = 7; static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int Height ); +int SSD13x6_GetCaps( struct SSD13x6_Device* DeviceHandle ) { + if (DeviceHandle->Model == SH1106) return 0; + else return CAPS_COLUMN_RANGE | CAPS_PAGE_RANGE | CAPS_ADDRESS_VERTICAL; +} + bool SSD13x6_WriteCommand( struct SSD13x6_Device* DeviceHandle, SSDCmd SSDCommand ) { NullCheck( DeviceHandle->WriteCommand, return false ); return ( DeviceHandle->WriteCommand ) ( DeviceHandle, SSDCommand ); @@ -100,6 +96,9 @@ void SSD132x_ReMap( struct SSD13x6_Device* DeviceHandle ) { void SSD13x6_SetDisplayAddressMode( struct SSD13x6_Device* DeviceHandle, SSD13x6_AddressMode AddressMode ) { switch (DeviceHandle->Model) { + case SH1106: + // does not exist on SH1106 + break; case SSD1306: SSD13x6_WriteCommand( DeviceHandle, 0x20 ); SSD13x6_WriteCommand( DeviceHandle, AddressMode ); @@ -112,9 +111,19 @@ void SSD13x6_SetDisplayAddressMode( struct SSD13x6_Device* DeviceHandle, SSD13x6 } void SSD13x6_Update( struct SSD13x6_Device* DeviceHandle ) { - SSD13x6_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1); - SSD13x6_SetPageAddress( DeviceHandle, 0, DeviceHandle->Height / 8 - 1); - SSD13x6_WriteData( DeviceHandle, DeviceHandle->Framebuffer, DeviceHandle->FramebufferSize ); + if (DeviceHandle->Model == SH1106) { + // SH1106 requires a page-by-page update and ahs no end Page/Column + for (int i = 0; i < DeviceHandle->Height / 8 ; i++) { + SSD13x6_SetPageAddress( DeviceHandle, i, 0); + SSD13x6_SetColumnAddress( DeviceHandle, 0, 0); + SSD13x6_WriteData( DeviceHandle, DeviceHandle->Framebuffer + i*DeviceHandle->Width, DeviceHandle->Width ); + } + } else { + // others have an automatic counter and end Page/Column + SSD13x6_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1); + SSD13x6_SetPageAddress( DeviceHandle, 0, DeviceHandle->Height / 8 - 1); + SSD13x6_WriteData( DeviceHandle, DeviceHandle->Framebuffer, DeviceHandle->FramebufferSize ); + } } void SSD13x6_WriteRawData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, size_t DataLength ) { @@ -125,6 +134,7 @@ void SSD13x6_WriteRawData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, s void SSD13x6_SetHFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { switch (DeviceHandle->Model) { + case SH1106: case SSD1306: SSD13x6_WriteCommand( DeviceHandle, On ? 0xA1 : 0xA0 ); break; @@ -137,6 +147,7 @@ void SSD13x6_SetHFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { void SSD13x6_SetVFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { switch (DeviceHandle->Model) { + case SH1106: case SSD1306: SSD13x6_WriteCommand( DeviceHandle, On ? 0xC8 : 0xC0 ); break; @@ -150,10 +161,18 @@ void SSD13x6_SetVFlip( struct SSD13x6_Device* DeviceHandle, bool On ) { void SSD13x6_SetColumnAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ) { CheckBounds( Start > SSD13x6_Max_Col, return ); CheckBounds( End > SSD13x6_Max_Col, return ); - - SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Column_Address ); - SSD13x6_WriteCommand( DeviceHandle, Start ); - SSD13x6_WriteCommand( DeviceHandle, End ); + + // on SH1106, there is no "end column" + if (DeviceHandle->Model == SH1106) { + // well, unfortunately this driver is 132 colums but most displays are 128... + if (DeviceHandle->Width != 132) Start += 2; + SSD13x6_WriteCommand( DeviceHandle, 0x10 | (Start >> 4) ); + SSD13x6_WriteCommand( DeviceHandle, 0x00 | (Start & 0x0f) ); + } else { + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Column_Address ); + SSD13x6_WriteCommand( DeviceHandle, Start ); + SSD13x6_WriteCommand( DeviceHandle, End ); + } } void SSD13x6_SetPageAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, uint8_t End ) { @@ -162,15 +181,20 @@ void SSD13x6_SetPageAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, CheckBounds( Start > SSD13x6_Max_Row, return ); CheckBounds( End > SSD13x6_Max_Row, return ); - // in case of SSD1326, this is sub-optimal as it can address by line, not by page - if (DeviceHandle->Model != SSD1306) { - Start *= 8; - End = (End + 1) * 8 - 1; - } + // on SH1106, there is no "end page" + if (DeviceHandle->Model == SH1106) { + SSD13x6_WriteCommand( DeviceHandle, 0xB0 | Start ); + } else { + // in case of SSD1326, this is sub-optimal as it can address by line, not by page + if (DeviceHandle->Model != SSD1306) { + Start *= 8; + End = (End + 1) * 8 - 1; + } - SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Page_Address ); - SSD13x6_WriteCommand( DeviceHandle, Start ); - SSD13x6_WriteCommand( DeviceHandle, End ); + SSD13x6_WriteCommand( DeviceHandle, SSDCmd_Set_Page_Address ); + SSD13x6_WriteCommand( DeviceHandle, Start ); + SSD13x6_WriteCommand( DeviceHandle, End ); + } } bool SSD13x6_HWReset( struct SSD13x6_Device* DeviceHandle ) { @@ -186,50 +210,40 @@ bool SSD13x6_HWReset( struct SSD13x6_Device* DeviceHandle ) { return true; } - -/* - * This is all a big giant mystery that I have yet to figure out. - * Beware all ye who enter. - */ -static void SetCOMPinConfiguration( struct SSD13x6_Device* DeviceHandle, uint32_t RemapCFG, uint32_t PinCFG, int ScanDir ) { - SSD13x6_WriteCommand( DeviceHandle, 0xDA ); - SSD13x6_WriteCommand( DeviceHandle, ( uint8_t ) ( RemapCFG | PinCFG | BIT( 1 ) ) ); - - SSD13x6_WriteCommand( DeviceHandle, - ( ScanDir == COM_ScanDir_LR ) ? 0xC0 : 0xC8 - ); -} - - static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int Height ) { DeviceHandle->Width = Width; DeviceHandle->Height = Height; - DeviceHandle->FramebufferSize = ( DeviceHandle->Width * Height ) / 8; - - // DeviceHandle->Framebuffer = heap_caps_calloc( 1, DeviceHandle->FramebufferSize, MALLOC_CAP_INTERNAL ); - DeviceHandle->Framebuffer = calloc( 1, DeviceHandle->FramebufferSize ); - NullCheck( DeviceHandle->Framebuffer, return false ); SSD13x6_HWReset( DeviceHandle ); - - if (DeviceHandle->Model == SSD1306) { + SSD13x6_DisplayOff( DeviceHandle ); + + if (DeviceHandle->Model == SSD1306 || DeviceHandle->Model == SH1106) { SSDCmd_Set_Display_Start_Line = 0x40; SSDCmd_Set_Display_Offset = 0xD3; SSDCmd_Set_Column_Address = 0x21, SSDCmd_Set_Display_CLK = 0xD5; SSDCmd_Set_Page_Address = 0x22; - SSD13x6_Max_Col = 127; - // charge pump regulator, do direct init - SSD13x6_WriteCommand( DeviceHandle, 0x8D ); - SSD13x6_WriteCommand( DeviceHandle, 0x14 ); /* MAGIC NUMBER */ - - if ( Height == 64 ) { - SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Alternative, COM_ScanDir_LR ); + if (DeviceHandle->Model == SSD1306) { + // charge pump regulator, do direct init + SSD13x6_WriteCommand( DeviceHandle, 0x8D ); + SSD13x6_WriteCommand( DeviceHandle, 0x14 ); + + // COM pins HW config (alternative:EN, remap:DIS) - some display might need something difference + SSD13x6_WriteCommand( DeviceHandle, 0xDA ); + SSD13x6_WriteCommand( DeviceHandle, (1 << 4) | (0 < 5) ); + } else { - SetCOMPinConfiguration( DeviceHandle, COM_Disable_LR_Remap, COM_Pins_Sequential, COM_ScanDir_LR ); + // charge pump regulator, do direct init + SSD13x6_WriteCommand( DeviceHandle, 0xAD ); + SSD13x6_WriteCommand( DeviceHandle, 0x8B ); + + // COM pins HW config (alternative:EN) - some display might need something difference + SSD13x6_WriteCommand( DeviceHandle, 0xDA ); + SSD13x6_WriteCommand( DeviceHandle, 1 << 4); } + } else if (DeviceHandle->Model == SSD1326) { SSDCmd_Set_Display_Start_Line = 0xA1; SSDCmd_Set_Display_Offset = 0xA2; @@ -245,21 +259,23 @@ static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int He SSD13x6_SetHFlip( DeviceHandle, false ); SSD13x6_SetVFlip( DeviceHandle, false ); - } - + } + SSD13x6_SetMuxRatio( DeviceHandle, Height - 1 ); SSD13x6_SetDisplayOffset( DeviceHandle, 0x00 ); - SSD13x6_SetDisplayStartLine( DeviceHandle, 0 ); + SSD13x6_SetDisplayStartLine( DeviceHandle, 0 ); SSD13x6_SetContrast( DeviceHandle, 0x7F ); SSD13x6_DisableDisplayRAM( DeviceHandle ); + SSD13x6_SetVFlip( DeviceHandle, false ); + SSD13x6_SetHFlip( DeviceHandle, false ); SSD13x6_SetInverted( DeviceHandle, false ); SSD13x6_SetDisplayClocks( DeviceHandle, 0, 8 ); - SSD13x6_SetDisplayAddressMode( DeviceHandle, AddressMode_Vertical ); + SSD13x6_SetDisplayAddressMode( DeviceHandle, AddressMode_Horizontal ); SSD13x6_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1 ); SSD13x6_SetPageAddress( DeviceHandle, 0, ( DeviceHandle->Height / 8 ) - 1 ); SSD13x6_EnableDisplayRAM( DeviceHandle ); SSD13x6_DisplayOn( DeviceHandle ); - SSD13x6_Update( DeviceHandle ); + SSD13x6_Update( DeviceHandle ); return true; } @@ -269,13 +285,15 @@ bool SSD13x6_Init_I2C( struct SSD13x6_Device* DeviceHandle, int Width, int Heigh NullCheck( WriteCommand, return false ); NullCheck( WriteData, return false ); - memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); - DeviceHandle->WriteCommand = WriteCommand; DeviceHandle->WriteData = WriteData; DeviceHandle->Reset = Reset; DeviceHandle->Address = I2CAddress; DeviceHandle->RSTPin = ResetPin; + + DeviceHandle->FramebufferSize = ( Width * Height ) / 8; + DeviceHandle->Framebuffer = calloc( 1, DeviceHandle->FramebufferSize ); + NullCheck( DeviceHandle->Framebuffer, return false ); return SSD13x6_Init( DeviceHandle, Width, Height ); } @@ -285,8 +303,6 @@ bool SSD13x6_Init_SPI( struct SSD13x6_Device* DeviceHandle, int Width, int Heigh NullCheck( WriteCommand, return false ); NullCheck( WriteData, return false ); - memset( DeviceHandle, 0, sizeof( struct SSD13x6_Device ) ); - DeviceHandle->WriteCommand = WriteCommand; DeviceHandle->WriteData = WriteData; DeviceHandle->Reset = Reset; @@ -294,5 +310,9 @@ bool SSD13x6_Init_SPI( struct SSD13x6_Device* DeviceHandle, int Width, int Heigh DeviceHandle->RSTPin = ResetPin; DeviceHandle->CSPin = CSPin; + DeviceHandle->FramebufferSize = ( Width * Height ) / 8; + DeviceHandle->Framebuffer = heap_caps_calloc( 1, DeviceHandle->FramebufferSize, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA ); + NullCheck( DeviceHandle->Framebuffer, return false ); + return SSD13x6_Init( DeviceHandle, Width, Height ); } diff --git a/components/display/tarablessd13x6/ssd13x6.h b/components/display/tarablessd13x6/ssd13x6.h index a9113767..95a814a1 100644 --- a/components/display/tarablessd13x6/ssd13x6.h +++ b/components/display/tarablessd13x6/ssd13x6.h @@ -12,6 +12,10 @@ #define SSD_ALWAYS_INLINE __attribute__( ( always_inline ) ) +#define CAPS_COLUMN_RANGE 0x01 +#define CAPS_PAGE_RANGE 0x02 +#define CAPS_ADDRESS_VERTICAL 0x04 + #if ! defined BIT #define BIT( n ) ( 1 << n ) #endif @@ -52,7 +56,7 @@ struct SSD13x6_Device { int Width; int Height; - enum { SSD1306, SSD1326 } Model; + enum { SSD1306, SSD1326, SH1106 } Model; uint8_t ReMap; uint8_t* Framebuffer; int FramebufferSize; @@ -88,6 +92,7 @@ void SSD13x6_SetPageAddress( struct SSD13x6_Device* DeviceHandle, uint8_t Start, bool SSD13x6_HWReset( struct SSD13x6_Device* DeviceHandle ); bool SSD13x6_Init_I2C( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int I2CAddress, int ResetPin, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); bool SSD13x6_Init_SPI( struct SSD13x6_Device* DeviceHandle, int Width, int Height, int ResetPin, int CSPin, spi_device_handle_t SPIHandle, WriteCommandProc WriteCommand, WriteDataProc WriteData, ResetProc Reset ); +int SSD13x6_GetCaps( struct SSD13x6_Device* DeviceHandle ); void SSD13x6_WriteRawData( struct SSD13x6_Device* DeviceHandle, uint8_t* Data, size_t DataLength ); diff --git a/components/services/accessors.c b/components/services/accessors.c index 1c2fe786..72360452 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -77,7 +77,7 @@ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) { if (nvs_item) { if ((p = strcasestr(nvs_item, "data")) != NULL) spi.mosi_io_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "clk")) != NULL) spi.sclk_io_num = atoi(strchr(p, '=') + 1); - if ((p = strcasestr(nvs_item, "d/c")) != NULL) spi_system_dc_gpio = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "dc")) != NULL) spi_system_dc_gpio = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "host")) != NULL) spi_system_host = atoi(strchr(p, '=') + 1); free(nvs_item); } diff --git a/components/services/services.c b/components/services/services.c index aa972540..36e53b60 100644 --- a/components/services/services.c +++ b/components/services/services.c @@ -71,21 +71,23 @@ void services_init(void) { i2c_param_config(i2c_system_port, i2c_config); i2c_driver_install(i2c_system_port, i2c_config->mode, 0, 0, 0 ); } else { + i2c_system_port = -1; ESP_LOGW(TAG, "no I2C configured"); } const spi_bus_config_t * spi_config = config_spi_get((spi_host_device_t*) &spi_system_host); - ESP_LOGI(TAG,"Configuring SPI data:%d clk:%d host:%u d/c:%d", spi_config->mosi_io_num, spi_config->sclk_io_num, spi_system_host, spi_system_dc_gpio); + ESP_LOGI(TAG,"Configuring SPI data:%d clk:%d host:%u dc:%d", spi_config->mosi_io_num, spi_config->sclk_io_num, spi_system_host, spi_system_dc_gpio); if (spi_config->mosi_io_num != -1 && spi_config->sclk_io_num != -1) { spi_bus_initialize( spi_system_host, spi_config, 1 ); - if (spi_system_dc_gpio != 1) { + if (spi_system_dc_gpio != -1) { gpio_set_direction( spi_system_dc_gpio, GPIO_MODE_OUTPUT ); gpio_set_level( spi_system_dc_gpio, 0 ); } else { - ESP_LOGW(TAG, "No D/C GPIO set, SPI display will not work"); + ESP_LOGW(TAG, "No DC GPIO set, SPI display will not work"); } } else { + spi_system_host = -1; ESP_LOGW(TAG, "no SPI configured"); } diff --git a/components/squeezelite/display.c b/components/squeezelite/display.c index 252edd78..0dedd208 100644 --- a/components/squeezelite/display.c +++ b/components/squeezelite/display.c @@ -85,7 +85,7 @@ static struct scroller_s { static u8_t ANIC_resp = ANIM_NONE; -#define SCROLL_STACK_SIZE 2048 +#define SCROLL_STACK_SIZE (3*1024) #define LINELEN 40 static log_level loglevel = lINFO; From 23fed62e28cf4b107e8385c4e0cf993970d08f1c Mon Sep 17 00:00:00 2001 From: philippe44 Date: Mon, 10 Feb 2020 20:47:32 -0800 Subject: [PATCH 14/23] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b514e877..ce38ff33 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ bck=,ws=,do= ### Display The NVS parameter "display_config" sets the parameters for an optional display. Syntax is ``` -I2C,width=,height=[address=][,HFlip][,VFlip] -SPI,width=,height=,cs=[,HFlip][,VFlip] +I2C,width=,height=[address=][,HFlip][,VFlip][driver=SSD1306|SSD1326|SH1106] +SPI,width=,height=,cs=[,HFlip][,VFlip][driver=SSD1306|SSD1326|SH1106] ``` - VFlip and HFlip are optional can be used to change display orientation @@ -71,7 +71,7 @@ The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay a - 'format' can contain free text and any of the 3 keywords %artist%, %album%, %title%. Using that format string, the keywords are replaced by their value to build the string to be displayed. Note that the plain text following a keyword that happens to be empty during playback of a track will be removed. For example, if you have set format=%artist% - %title% and there is no artist in the metadata then only will be displayed not " - <title>". -Currently only 128x32 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) are supported +Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this][https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported ### Set GPIO The parameter "set_GPIO" is use to set assign GPIO to various functions. From 3e8f61c0dfd01208f3fc3d25d9b96de53bf485a9 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe44@users.noreply.github.com> Date: Mon, 10 Feb 2020 20:48:21 -0800 Subject: [PATCH 15/23] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce38ff33..484bc6fe 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,8 @@ SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,HFlip][,VFlip][driver=SSD1306|SSD1 ``` - VFlip and HFlip are optional can be used to change display orientation +Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this][https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported + The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay and Bluetooth. Syntax is ``` [format=<display_content>][,speed=<speed>] @@ -71,8 +73,6 @@ The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay a - 'format' can contain free text and any of the 3 keywords %artist%, %album%, %title%. Using that format string, the keywords are replaced by their value to build the string to be displayed. Note that the plain text following a keyword that happens to be empty during playback of a track will be removed. For example, if you have set format=%artist% - %title% and there is no artist in the metadata then only <title> will be displayed not " - <title>". -Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this][https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported - ### Set GPIO The parameter "set_GPIO" is use to set assign GPIO to various functions. From f9beccfb5105ea21e1d59adf249def8163d57f35 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe44@users.noreply.github.com> Date: Mon, 10 Feb 2020 20:48:54 -0800 Subject: [PATCH 16/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 484bc6fe..21efc7a9 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,HFlip][,VFlip][driver=SSD1306|SSD1 ``` - VFlip and HFlip are optional can be used to change display orientation -Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this][https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported +Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this](https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay and Bluetooth. Syntax is ``` From 4f4ebea0e5a6691aba3a64eb4a4485e4dd3af108 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe44@users.noreply.github.com> Date: Mon, 10 Feb 2020 23:53:58 -0800 Subject: [PATCH 17/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21efc7a9..755d1ab5 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ sda=<gpio>,scl=<gpio>,port=0|1 ### SPI The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is ``` -data=<gpio>,clk=<gpio>[,dc=<gpio>][,host=0|1|2] +data=<gpio>,clk=<gpio>[,dc=<gpio>][,host=1|2] ``` ### DAC/I2S The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can also define these at compile time but nvs parameter takes precedence. Note that on SqueezeAMP and A1S, these are forced at runtime, so this parameter does not matter. If your DAC also requires i2c, then you must go the re-compile route. Syntax is From 4cdbec5127a2d25f7b8c75f41f30a78794e67751 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe44@users.noreply.github.com> Date: Mon, 10 Feb 2020 23:55:14 -0800 Subject: [PATCH 18/23] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 755d1ab5..a51d2fe3 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ GND - GND FLT - GND DMP - GND SCL - GND -BCK - (see below) -DIN - (see below) -LCK - (see below) +BCK - (BCK - see below) +DIN - (DO - see below) +LCK - (WS - see below) FMT - GND XMT - 3.3V From dd7b4a0fb4b64f02f081bc4e395c520981a680db Mon Sep 17 00:00:00 2001 From: philippe44 <philippe_44@outlook.com> Date: Tue, 11 Feb 2020 12:42:58 -0800 Subject: [PATCH 19/23] Automatic screen with update from player --- components/squeezelite/embedded.h | 2 +- plugin/SqueezeESP32.zip | Bin 4571 -> 4621 bytes plugin/SqueezeESP32/Player.pm | 4 +++- plugin/SqueezeESP32/install.xml | 2 +- plugin/repo.xml | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/squeezelite/embedded.h b/components/squeezelite/embedded.h index 1d22876e..f8fb1e03 100644 --- a/components/squeezelite/embedded.h +++ b/components/squeezelite/embedded.h @@ -8,7 +8,7 @@ - pthread_create_name - stack size - s16_t, s32_t, s64_t and u64_t - - PLAYER_ID + - PLAYER_ID / custom_player_id can overload (use #define) - exit - gettime_ms diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip index 3785721fc00f77e558a8f2ce71bf7f49211b72d6..1e5af7651a9fac0a2ca4a93b36f4cc2790f03ca0 100644 GIT binary patch delta 738 zcmcbu+^e#|i<QGR)jMFi{QDJ?gIF~gH*T(B<z%e)O7RZ(pH=+j5+eh{TxJFaP6h^s zfSkn2)FQot+|r=<?Arzc^?nNXA7*&JbugY&=KoDfBATuF;>@aAsbr0BHw7o_hEJNE zs(imzJ@VV6OV1Ryy{oH#S66iUQ~Vky57+RIZpRD1-BA2@uyoqJnB#?7H{?Q%W}jO& z*X@Ga$2%&2>k|*ZcwZ=<)^we@=*jKJHBY`yU_Z=iSu-*8lapm=MAq>Y-wQ6@628+^ zyXcUbyDZyU=}*1ybOW}VUuT?Y(KJDnLGVT7!YbC+PfE8pMu}-W&}UJvwU8-&AJHrJ z(SCyRk!df_f4|bZ!eP?$4{;njnK!#;#0n&+h(vs1Yn<)id~j=h?twn>G;YOgt|;HU z8*Xn-`aQh!vZ|=<*oS48=1-ZOXg2o-Z}Gv6hIyWQpDy*R*_+Vzcgc*t*ZaO6acO7n z6K{DTRsA^egW`^+?ul8=jQ^FtSl)Tax9RKl{t2gdZ9D9?-@7Gf)n!+X)7~6&zpOoc zMpI;!UsbjdkNffTX`kPpmM^O}S^nUmc7&T?Ok9)w{^sq0E|bK}J~HZr)wLWwb@szo z&Z&=B+fHly&sJalW1VVn$<b!%b9Fl1qWNBu^M0;r&n}*{*KhxO$(4LgysN7}I?I2& zaYF9W*IJqV1=SBdj~$WTKVK(2h$H*$x8Mw`s|Si4ZceWc@MdNa0md>1!;)sJ&HfxQ z?1+T1ncvXx+pPner5|2pjJ~*F{pDL%8MV#!O1wUKl`+7Zk;$F`q7x<6OcoW;O7y=i zv{(wLYoWdXn7%$8Qy0*_0On4+6RUw~%@dr~RDkXP0R<o~;Q*z)()7$cV9MhH3o$S- qGDtA&xKey_#g)km1Z)`HCf^l^VVpSGN-&1edGd5YJGLJ@ApHPDx<M!a delta 671 zcmeBGxvjjxi<RRWk5fRJ)Z&AagIF~gmu{|M<z%d10~Fi%qv7NNMg|6UW(EdM1_p+J zoW#o1BE5p#+`zkjpAC5S=FLAO)Ui#d=GC#---etACrl6s5m_hT6!|(&@Fl<JDT$2t zeUsaI8TWc5|CW)LU!Hu_c(!uNqWPcQR6YM)Qr`F2<b2<8&q<uyoM!&2TQ4wW+MWw5 z_nw!K)jw@eFTUqrQ|<}19+^yrJK1_Geui56*QXnIPF1Sd+w}L`orf%E<W<dBR~fu` zQ}F-F1=-MY8$O@<tLGQwd5e5tJm@ES?e-(n)fXAIo!i#H8a#b_NRQ^X?+-#c$~dbU zFGRX8h}PKnh?nVlW78z<;09IwuS`zYrkG?{CmU~6((Rm>`Ko@0W!Bl*J9kY8yZ^ms zuTw#e34>(_cihVokLf;})r<b<+KR-@d~va{!t?1qLwzx}^n;3T@+-FR6wH7B_MoYr z;{1DaoiAS7Drr==T3}V!JE;%0agG_k=S6t1$RGL67AnMTo@M`JQTs(@-_)OcwvB;2 z?CcK?{Ws`Ke&w!key80mUyHAcJE!iibk(fveE8zR#ziIU_sUf|)V43%cx}t%T;2WW zmu>g_bbQs}_tBBR<Im3#-z3@;kkB@1MfJ@CCzM|NVF~bNW)T6#83)6{%|@FWIbzrm z(fpL(&`{O!&&D-3uQH}KFRZz7;VPrH*<Oj)C$BOFcr!BDGeC5rq=Cuq0$O~np)&Cx zT{{BUdEC!Tt``uq1sWf~+-Y}WH87!gf)k1g&{_~s0AeQ&P_ija&&&fR8!oUA0|O(2 n1Viw%^gR>LO}->x!zePDUoeI-esT_w6r6lg(2ngG4@f@%UtAXA diff --git a/plugin/SqueezeESP32/Player.pm b/plugin/SqueezeESP32/Player.pm index 017c169f..fe6b208c 100644 --- a/plugin/SqueezeESP32/Player.pm +++ b/plugin/SqueezeESP32/Player.pm @@ -7,6 +7,7 @@ use Slim::Utils::Log; use Slim::Utils::Prefs; my $prefs = preferences('plugin.squeezeesp32'); +my $log = logger('plugin.squeezeesp32'); sub model { 'squeezeesp32' } sub modelName { 'SqueezeESP32' } @@ -23,10 +24,11 @@ sub playerSettingsFrame { # New SETD command 0xfe for display width if ($id == 0xfe) { $value = (unpack('CC', $$data_ref))[1]; - if ($value > 10 && $value < 200) { + if ($value > 100 && $value < 400) { $client->display->widthOverride(1, $value); $client->update; } + $log->info("Setting player width $value for ", $client->name); } $client->SUPER::playerSettingsFrame($data_ref); diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index 42c3b822..d92cd4f3 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ <name>PLUGIN_SQUEEZEESP32</name> <description>PLUGIN_SQUEEZEESP32_DESC</description> <module>Plugins::SqueezeESP32::Plugin</module> - <version>0.8</version> + <version>0.9</version> <creator>Philippe</creator> </extensions> diff --git a/plugin/repo.xml b/plugin/repo.xml index 0fb59927..03f6c740 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,10 +1,10 @@ <?xml version='1.0' standalone='yes'?> <extensions> <plugins> - <plugin version="0.8" name="SqueezeESP32" minTarget="7.5" maxTarget="*"> + <plugin version="0.9" name="SqueezeESP32" minTarget="7.5" maxTarget="*"> <link>https://github.com/sle118/squeezelite-esp32</link> <creator>Philippe</creator> - <sha>66cde7aee1f92e82087e5a7a68c6d57f1229e2a0</sha> + <sha>89c68b54ad4373df6c0cd37222a07b53013c4815</sha> <email>philippe_44@outlook.com</email> <desc lang="EN">SqueezeESP32 additional player id (100)</desc> <url>http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip</url> From 39f7ca7d604c1d6d4e576393fb63fdc466c0b153 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe44@users.noreply.github.com> Date: Tue, 11 Feb 2020 14:11:32 -0800 Subject: [PATCH 20/23] Update README.md --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a51d2fe3..54b535f5 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,9 @@ Use the `squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults` configuration file. To access NVS, in the webUI, go to credits and select "shows nvs editor". Go into the NVS editor tab to change NFS parameters. In syntax description below \<\> means a value while \[\] describe optional parameters. ### I2C -The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g. display). Leave it blank to disable I2C usage. Note that on SqueezeAMP, port must be 1. Syntax is +The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g. display). Leave it blank to disable I2C usage. Note that on SqueezeAMP, port must be 1. Default speed is 400000. Syntax is ``` -sda=<gpio>,scl=<gpio>,port=0|1 +sda=<gpio>,scl=<gpio>[,port=0|1][,speed=<speed>] ``` ### SPI The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is @@ -40,7 +40,7 @@ The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. data=<gpio>,clk=<gpio>[,dc=<gpio>][,host=1|2] ``` ### DAC/I2S -The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can also define these at compile time but nvs parameter takes precedence. Note that on SqueezeAMP and A1S, these are forced at runtime, so this parameter does not matter. If your DAC also requires i2c, then you must go the re-compile route. Syntax is +The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can define the defaults at compile time but nvs parameter takes precedence except for SqueezeAMP and A1S where these are forced at runtime. If your DAC also requires i2c, then you must go the re-compile route. Syntax is ``` bck=<gpio>,ws=<gpio>,do=<gpio> ``` @@ -49,7 +49,7 @@ The NVS parameter "spdif_config" sets the i2s's gpio needed for SPDIF. SPDIF is made available by re-using i2s interface in a non-standard way, so although only one pin (DO) is needed, the controller must be fully initialized, so the bit clock (bck) and word clock (ws) must be set as well. As i2s and SPDIF are mutually exclusive, you can reuse the same IO if your hardware allows so. -Note that on SqueezeAMP, these are automatically defined, so this parameter does not matter. +You can define the defaults at compile time but nvs parameter takes precedence except for SqueezeAMP where these are forced at runtime. Leave it blank to disable SPDIF usage, you can also define them at compile time using "make menuconfig". Syntax is ``` @@ -59,9 +59,10 @@ bck=<gpio>,ws=<gpio>,do=<gpio> The NVS parameter "display_config" sets the parameters for an optional display. Syntax is ``` I2C,width=<pixels>,height=<pixels>[address=<i2c_address>][,HFlip][,VFlip][driver=SSD1306|SSD1326|SH1106] -SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,HFlip][,VFlip][driver=SSD1306|SSD1326|SH1106] +SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,speed=<speed>][,HFlip][,VFlip][driver=SSD1306|SSD1326|SH1106] ``` - VFlip and HFlip are optional can be used to change display orientation +- Default speed is 8000000 (8MHz) Currently 128x32/64 I2C display like [this](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi) and [this](https://www.waveshare.com/wiki/1.3inch_OLED_HAT) are supported @@ -74,11 +75,11 @@ The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay a - 'format' can contain free text and any of the 3 keywords %artist%, %album%, %title%. Using that format string, the keywords are replaced by their value to build the string to be displayed. Note that the plain text following a keyword that happens to be empty during playback of a track will be removed. For example, if you have set format=%artist% - %title% and there is no artist in the metadata then only <title> will be displayed not " - <title>". ### Set GPIO -The parameter "set_GPIO" is use to set assign GPIO to various functions. +The parameter "set_GPIO" is use to assign GPIO to various functions. GPIO can be set to GND provide or Vcc at boot. This is convenient to power devices that consume less than 40mA from the side connector. Be careful because there is no conflict checks being made wrt which GPIO you're changing, so you might damage your board or create a conflict here. -This parameter can use used as well to assign a GPIO that will be set to 1 when playback starts and wil be reset to 0 when squeezelite becomes idle. The idle timeout is set on the squeezelite command line through -C \<timeout\> +The \<amp\> parameter can use used to assign a GPIO that will be set to 1 when playback starts. It will be reset to 0 when squeezelite becomes idle. The idle timeout is set on the squeezelite command line through -C \<timeout\> If you have an audio jack that supports insertion (use :0 or :1 to set the level when inserted), you can specify which GPIO it's connected to. Using the parameter jack_mutes_amp allows to mute the amp when headset (e.g.) is inserted. @@ -89,6 +90,7 @@ Syntax is: ``` <gpio>=Vcc|GND|amp|jack[:0|1]|green[:0|1]|red[:0|1]|spkfault[:0|1][,<repeated sequence for next GPIO>] ``` +You can define the defaults for jack, spkfault leds at compile time but nvs parameter takes precedence except for SqueezeAMP where these are forced at runtime. ### Rotary Encoder One rotary encoder is supported, quadrature shift with press. Such encoders usually have 2 pins for encoders (A and B), and common C that must be set to ground and an optional SW pin for press. A, B and SW must be pulled up, so automatic pull-up is provided by ESP32, but you can add your own resistors. A bit of filtering on A and B (~470nF) helps for debouncing which is not made by software. From ff7b7f08465ca8c03aafadfe110f2e5060e80df6 Mon Sep 17 00:00:00 2001 From: philippe44 <philippe_44@outlook.com> Date: Tue, 11 Feb 2020 14:31:17 -0800 Subject: [PATCH 21/23] Player sends its resolution to LMS + SPI speed settable --- components/display/driver_SSD13x6.c | 7 +-- .../tarablessd13x6/ifaces/default_if_spi.c | 4 +- .../tarablessd13x6/ssd13x6_default_if.h | 2 +- components/squeezelite/a1s/ac101.c | 2 +- components/squeezelite/display.c | 51 +++++++++++++------ 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/components/display/driver_SSD13x6.c b/components/display/driver_SSD13x6.c index e5bc3be9..252225ca 100644 --- a/components/display/driver_SSD13x6.c +++ b/components/display/driver_SSD13x6.c @@ -124,12 +124,13 @@ static bool init(char *config, char *welcome) { ESP_LOGI(TAG, "Display is I2C on port %u", address); } else if (strstr(config, "SPI") && spi_system_host != -1) { - int CS_pin = -1; + int CS_pin = -1, speed = 0; - if ((p = strcasestr(config, "CS")) != NULL) CS_pin = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(config, "cs")) != NULL) CS_pin = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(config, "speed")) != NULL) speed = atoi(strchr(p, '=') + 1); SSD13x6_SPIMasterInitDefault( spi_system_host, spi_system_dc_gpio ); - SSD13x6_SPIMasterAttachDisplayDefault( &Display, model, width, height, CS_pin, -1 ); + SSD13x6_SPIMasterAttachDisplayDefault( &Display, model, width, height, CS_pin, -1, speed ); SSD13x6_SetFont( &Display, &Font_droid_sans_fallback_15x17 ); SSD13x6_display.width = width; SSD13x6_display.height = height; diff --git a/components/display/tarablessd13x6/ifaces/default_if_spi.c b/components/display/tarablessd13x6/ifaces/default_if_spi.c index 2d7336c4..997ff9ad 100644 --- a/components/display/tarablessd13x6/ifaces/default_if_spi.c +++ b/components/display/tarablessd13x6/ifaces/default_if_spi.c @@ -33,7 +33,7 @@ bool SSD13x6_SPIMasterInitDefault( int SPI, int DC ) { return true; } -bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin ) { +bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin, int Speed ) { spi_device_interface_config_t SPIDeviceConfig; spi_device_handle_t SPIDeviceHandle; @@ -46,7 +46,7 @@ bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, memset( &SPIDeviceConfig, 0, sizeof( spi_device_interface_config_t ) ); - SPIDeviceConfig.clock_speed_hz = SPI_MASTER_FREQ_8M; + SPIDeviceConfig.clock_speed_hz = Speed > 0 ? Speed : SPI_MASTER_FREQ_8M; SPIDeviceConfig.spics_io_num = CSPin; SPIDeviceConfig.queue_size = 1; diff --git a/components/display/tarablessd13x6/ssd13x6_default_if.h b/components/display/tarablessd13x6/ssd13x6_default_if.h index d7c4b1cc..c1173e14 100644 --- a/components/display/tarablessd13x6/ssd13x6_default_if.h +++ b/components/display/tarablessd13x6/ssd13x6_default_if.h @@ -9,7 +9,7 @@ bool SSD13x6_I2CMasterInitDefault( int PortNumber, int SDA, int SCL ); bool SSD13x6_I2CMasterAttachDisplayDefault( struct SSD13x6_Device* DisplayHandle, int Model, int Width, int Height, int I2CAddress, int RSTPin ); bool SSD13x6_SPIMasterInitDefault( int SPI, int DC); -bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin ); +bool SSD13x6_SPIMasterAttachDisplayDefault( struct SSD13x6_Device* DeviceHandle, int Model, int Width, int Height, int CSPin, int RSTPin, int Speed ); #ifdef __cplusplus } diff --git a/components/squeezelite/a1s/ac101.c b/components/squeezelite/a1s/ac101.c index 5ba59081..17a02c47 100644 --- a/components/squeezelite/a1s/ac101.c +++ b/components/squeezelite/a1s/ac101.c @@ -82,7 +82,7 @@ static bool init(int i2c_port_num, int i2s_num, i2s_config_t *i2s_config) { .sda_pullup_en = GPIO_PULLUP_ENABLE, .scl_io_num = 32, .scl_pullup_en = GPIO_PULLUP_ENABLE, - .master.clk_speed = 100000, + .master.clk_speed = 250000, }; i2c_param_config(i2c_port, &i2c_config); diff --git a/components/squeezelite/display.c b/components/squeezelite/display.c index 0dedd208..7342f846 100644 --- a/components/squeezelite/display.c +++ b/components/squeezelite/display.c @@ -19,6 +19,7 @@ #include <ctype.h> #include "squeezelite.h" +#include "slimproto.h" #include "display.h" #pragma pack(push, 1) @@ -84,6 +85,7 @@ static struct scroller_s { #define ANIM_SCREEN_2 0x08 static u8_t ANIC_resp = ANIM_NONE; +static u8_t SETD_width; #define SCROLL_STACK_SIZE (3*1024) #define LINELEN 40 @@ -150,6 +152,7 @@ bool sb_display_init(void) { // need to force height to 32 maximum display_width = display->width; display_height = min(display->height, 32); + SETD_width = display->width; // create scroll management task display_mutex = xSemaphoreCreateMutex(); @@ -195,6 +198,23 @@ static void send_server(void) { ANIC_resp = ANIM_NONE; } + if (SETD_width) { + struct SETD_header pkt_header; + + LOG_INFO("sending width %u", SETD_width); + + memset(&pkt_header, 0, sizeof(pkt_header)); + memcpy(&pkt_header.opcode, "SETD", 4); + + pkt_header.id = 0xfe; // id 0xfe is width S:P:Squeezebox2 + pkt_header.length = htonl(sizeof(pkt_header) + 2 - 8); + + send_packet((u8_t *)&pkt_header, sizeof(pkt_header)); + send_packet(&SETD_width, 2); + + SETD_width = 0; + } + if (slimp_loop_chain) (*slimp_loop_chain)(); } @@ -215,24 +235,25 @@ static bool handler(u8_t *data, int len){ bool res = true; // don't do anything if we dont own the display (no lock needed) - if (output.external && output.state >= OUTPUT_STOPPED) return true; - - if (!strncmp((char*) data, "vfdc", 4)) { - vfdc_handler(data, len); - } else if (!strncmp((char*) data, "grfe", 4)) { - grfe_handler(data, len); - } else if (!strncmp((char*) data, "grfb", 4)) { - grfb_handler(data, len); - } else if (!strncmp((char*) data, "grfs", 4)) { - grfs_handler(data, len); - } else if (!strncmp((char*) data, "grfg", 4)) { - grfg_handler(data, len); - } else { - res = false; - } + if (!output.external || output.state < OUTPUT_STOPPED) { + if (!strncmp((char*) data, "vfdc", 4)) { + vfdc_handler(data, len); + } else if (!strncmp((char*) data, "grfe", 4)) { + grfe_handler(data, len); + } else if (!strncmp((char*) data, "grfb", 4)) { + grfb_handler(data, len); + } else if (!strncmp((char*) data, "grfs", 4)) { + grfs_handler(data, len); + } else if (!strncmp((char*) data, "grfg", 4)) { + grfg_handler(data, len); + } else { + res = false; + } + } // chain protocol handlers (bitwise or is fine) if (*slimp_handler_chain) res |= (*slimp_handler_chain)(data, len); + return res; } From 6b9a1420bfdf2ecbe77ebe965602746cc1ff1d6f Mon Sep 17 00:00:00 2001 From: philippe44 <philippe_44@outlook.com> Date: Tue, 11 Feb 2020 21:49:43 -0800 Subject: [PATCH 22/23] 32 pixel height display bug --- components/display/tarablessd13x6/ssd13x6.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/display/tarablessd13x6/ssd13x6.c b/components/display/tarablessd13x6/ssd13x6.c index 9b758202..ea1a0836 100644 --- a/components/display/tarablessd13x6/ssd13x6.c +++ b/components/display/tarablessd13x6/ssd13x6.c @@ -230,9 +230,9 @@ static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int He SSD13x6_WriteCommand( DeviceHandle, 0x8D ); SSD13x6_WriteCommand( DeviceHandle, 0x14 ); - // COM pins HW config (alternative:EN, remap:DIS) - some display might need something difference + // COM pins HW config (alternative:EN if 64, DIS if 32, remap:DIS) - some display might need something difference SSD13x6_WriteCommand( DeviceHandle, 0xDA ); - SSD13x6_WriteCommand( DeviceHandle, (1 << 4) | (0 < 5) ); + SSD13x6_WriteCommand( DeviceHandle, ((Height == 64 ? 1 : 0) << 4) | (0 < 5) ); } else { // charge pump regulator, do direct init @@ -256,9 +256,6 @@ static bool SSD13x6_Init( struct SSD13x6_Device* DeviceHandle, int Width, int He // no gray scale DeviceHandle->ReMap |= 0x10; SSD132x_ReMap( DeviceHandle ); - - SSD13x6_SetHFlip( DeviceHandle, false ); - SSD13x6_SetVFlip( DeviceHandle, false ); } SSD13x6_SetMuxRatio( DeviceHandle, Height - 1 ); From 1af1fd1639030d78f99fb3ebdc1aafbd9236057a Mon Sep 17 00:00:00 2001 From: Sebastien <sle118@hotmail.com> Date: Wed, 12 Feb 2020 17:52:45 -0500 Subject: [PATCH 23/23] refactoring, improvements and bug fixes for telnet --- components/telnet/telnet.c | 380 +++++++++++++++++-------------------- components/telnet/telnet.h | 1 - 2 files changed, 178 insertions(+), 203 deletions(-) diff --git a/components/telnet/telnet.c b/components/telnet/telnet.c index 9732b667..552c678e 100644 --- a/components/telnet/telnet.c +++ b/components/telnet/telnet.c @@ -40,127 +40,46 @@ #include "platform_esp32.h" -#define TELNET_STACK_SIZE 8048 +/************************************ + * Globals + */ +#define TELNET_STACK_SIZE 8048 +#define TELNET_RX_BUF 1024 + +const static char tag[] = "telnet"; +static int uart_fd=0; RingbufHandle_t buf_handle; SemaphoreHandle_t xSemaphore = NULL; static size_t send_chunk=300; static size_t log_buf_size=2000; //32-bit aligned size static bool bIsEnabled=false; -const static char tag[] = "telnet"; - -int _log_vprintf(const char *fmt, va_list args); -void telnet_esp32_listenForClients(); -int telnet_esp32_vprintf(const char *fmt, va_list va); - -static void telnetTask(void *data); - - -static int uart_fd=0; - - -// The global tnHandle ... since we are only processing ONE telnet -// client at a time, this can be a global static. +static int partnerSocket=0; static telnet_t *tnHandle; -static void handleLogBuffer(int partnerSocket, UBaseType_t bytes); + +/************************************ + * Forward declarations + */ +static void telnet_task(void *data); +static ssize_t stdout_read(int fd, void* data, size_t size); +static int stdout_open(const char * path, int flags, int mode); +static int stdout_close(int fd); +static int stdout_fstat(int fd, struct stat * st); +static ssize_t stdout_write(int fd, const void * data, size_t size); +static char *eventToString(telnet_event_type_t type); +static void handle_telnet_conn(); +static void process_logs( UBaseType_t bytes); struct telnetUserData { int sockfd; + telnet_t *tnHandle; + char * rxbuf; }; - -static void telnetTask(void *data) { - ESP_LOGD(tag, ">> telnetTask"); - telnet_esp32_listenForClients(); - ESP_LOGD(tag, "<< telnetTask"); - vTaskDelete(NULL); -} - -void start_telnet(void * pvParameter){ - static bool isStarted=false; - StaticTask_t *xTaskBuffer = (StaticTask_t*) heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); - StackType_t *xStack = malloc(TELNET_STACK_SIZE); - - if(!isStarted && bIsEnabled) { - xTaskCreateStatic( (TaskFunction_t) &telnetTask, "telnet", TELNET_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 1, xStack, xTaskBuffer); - isStarted=true; - } -} - -static ssize_t stdout_write(int fd, const void * data, size_t size) { - if (xSemaphoreTake(xSemaphore, (TickType_t) 10) == pdTRUE) { - // #1 Write to ringbuffer - if (buf_handle == NULL) { - printf("%s() ABORT. file handle _log_remote_fp is NULL\n", - __FUNCTION__); - } else { - //Send an item - UBaseType_t res = xRingbufferSend(buf_handle, data, size, - pdMS_TO_TICKS(100)); - if (res != pdTRUE) { - // flush some entries - handleLogBuffer(0, size); - res = xRingbufferSend(buf_handle, data, size, - pdMS_TO_TICKS(100)); - if (res != pdTRUE) { - - printf("%s() ABORT. Unable to store log entry in buffer\n", - __FUNCTION__); - } - } - } - xSemaphoreGive(xSemaphore); - } else { - // We could not obtain the semaphore and can therefore not access - // the shared resource safely. - } - return write(uart_fd, data, size); -} - -static ssize_t stdout_read(int fd, void* data, size_t size) { - return read(fd, data, size); -} - -static int stdout_open(const char * path, int flags, int mode) { - return 0; -} - -static int stdout_close(int fd) { - return 0; -} - -static int stdout_fstat(int fd, struct stat * st) { - st->st_mode = S_IFCHR; - return 0; -} - - -void kchal_stdout_register() { - const esp_vfs_t vfs = { - .flags = ESP_VFS_FLAG_DEFAULT, - .write = &stdout_write, - .open = &stdout_open, - .fstat = &stdout_fstat, - .close = &stdout_close, - .read = &stdout_read, - }; - uart_fd=open("/dev/uart/0", O_RDWR); - ESP_ERROR_CHECK(esp_vfs_register("/dev/pkspstdout", &vfs, NULL)); - freopen("/dev/pkspstdout", "w", stdout); - freopen("/dev/pkspstdout", "w", stderr); - //printf("8bkc_hal_stdout_register: Custom stdout/stderr handler installed.\n"); -} -/********************************* - * Telnet Support - */ - - void init_telnet(){ - char *val= get_nvs_value_alloc(NVS_TYPE_STR, "telnet_enable"); - - if (!val || !strcasestr("YX",val) ) { + if (!val || strlen(val) == 0 || !strcasestr("YX",val) ) { ESP_LOGI(tag,"Telnet support disabled"); if(val) free(val); return; @@ -177,28 +96,79 @@ void init_telnet(){ free(val); log_buf_size=log_buf_size>0?log_buf_size:4000; } - bIsEnabled=true; - // Create the semaphore to guard a shared resource. vSemaphoreCreateBinary( xSemaphore ); - // First thing we need to do here is to redirect the output to our telnet handler - //Allocate ring buffer data structure and storage area into external RAM + // Redirect the output to our telnet handler as soon as possible StaticRingbuffer_t *buffer_struct = (StaticRingbuffer_t *)heap_caps_malloc(sizeof(StaticRingbuffer_t), MALLOC_CAP_SPIRAM); uint8_t *buffer_storage = (uint8_t *)heap_caps_malloc(sizeof(uint8_t)*log_buf_size, MALLOC_CAP_SPIRAM); - - //Create a ring buffer with manually allocated memory buf_handle = xRingbufferCreateStatic(log_buf_size, RINGBUF_TYPE_BYTEBUF, buffer_storage, buffer_struct); - if (buf_handle == NULL) { ESP_LOGE(tag,"Failed to create ring buffer for telnet!"); return; } ESP_LOGI(tag, "***Redirecting log output to telnet"); - //esp_log_set_vprintf(&_log_vprintf); - kchal_stdout_register(); + const esp_vfs_t vfs = { + .flags = ESP_VFS_FLAG_DEFAULT, + .write = &stdout_write, + .open = &stdout_open, + .fstat = &stdout_fstat, + .close = &stdout_close, + .read = &stdout_read, + }; + uart_fd=open("/dev/uart/0", O_RDWR); + ESP_ERROR_CHECK(esp_vfs_register("/dev/pkspstdout", &vfs, NULL)); + freopen("/dev/pkspstdout", "w", stdout); + freopen("/dev/pkspstdout", "w", stderr); + bIsEnabled=true; } +void start_telnet(void * pvParameter){ + static bool isStarted=false; + StaticTask_t *xTaskBuffer = (StaticTask_t*) heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); + StackType_t *xStack = malloc(TELNET_STACK_SIZE); + + if(!isStarted && bIsEnabled) { + xTaskCreateStatic( (TaskFunction_t) &telnet_task, "telnet", TELNET_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 1, xStack, xTaskBuffer); + isStarted=true; + } +} +static void telnet_task(void *data) { + int serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + struct sockaddr_in serverAddr; + serverAddr.sin_family = AF_INET; + serverAddr.sin_addr.s_addr = htonl(INADDR_ANY); + serverAddr.sin_port = htons(23); + + int rc = bind(serverSocket, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); + if (rc < 0) { + ESP_LOGE(tag, "bind: %d (%s)", errno, strerror(errno)); + return; + } + + rc = listen(serverSocket, 5); + if (rc < 0) { + ESP_LOGE(tag, "listen: %d (%s)", errno, strerror(errno)); + return; + } + + while(1) { + socklen_t len = sizeof(serverAddr); + rc = accept(serverSocket, (struct sockaddr *)&serverAddr, &len); + if (rc < 0 ){ + ESP_LOGE(tag, "accept: %d (%s)", errno, strerror(errno)); + return; + } + else { + partnerSocket = rc; + ESP_LOGD(tag, "We have a new client connection!"); + handle_telnet_conn(); + ESP_LOGD(tag, "Telnet connection terminated"); + } + } + vTaskDelete(NULL); +} + /** * Convert a telnet event type to its string representation. */ @@ -238,49 +208,33 @@ static char *eventToString(telnet_event_type_t type) { return "Unknown type"; } // eventToString - -/** - * Send data to the telnet partner. - */ -void telnet_esp32_sendData(uint8_t *buffer, size_t size) { - if (tnHandle != NULL) { - telnet_send(tnHandle, (char *)buffer, size); - } -} // telnet_esp32_sendData - - -/** - * Send a vprintf formatted output to the telnet partner. - */ -int telnet_esp32_vprintf(const char *fmt, va_list va) { - if (tnHandle == NULL) { - return 0; - } - return telnet_vprintf(tnHandle, fmt, va); -} // telnet_esp32_vprintf - /** * Telnet handler. */ -void processReceivedData(const char * buffer, size_t size){ +void process_received_data(const char * buffer, size_t size){ //ESP_LOGD(tag, "received data, len=%d", event->data.size); char * command = malloc(size+1); - memcpy(command,buffer,size); - command[size]='\0'; - // todo: implement conditional remote echo - //telnet_esp32_sendData((uint8_t *)command, size); - if(command[0]!='\r' && command[0]!='\n'){ - // some telnet clients will send data and crlf in two separate buffers - printf(command); - printf("\r\n"); - run_command((char *)command); + const char * c=buffer; + // scrub from any escape command + if(*c == '\e'){ + while(*(c++) !='n'){ + --size; + }; + --size; + } + memcpy(command,c,size); + command[size]='\0'; + if(command[0]!='\r' && command[0]!='\n'){ + // echo the command buffer out to uart and run + write(uart_fd, command, size); + run_command((char *)command); } free(command); } -static void telnetHandler( +static void handle_telnet_events( telnet_t *thisTelnet, telnet_event_t *event, void *userData) { @@ -295,23 +249,33 @@ static void telnetHandler( break; case TELNET_EV_DATA: - processReceivedData(event->data.buffer, event->data.size); + process_received_data(event->data.buffer, event->data.size); break; + case TELNET_EV_TTYPE: + printf("telnet event: %s\n", eventToString(event->type)); + telnet_ttype_send(telnetUserData->tnHandle); + break; + + default: printf("telnet event: %s\n", eventToString(event->type)); break; } // End of switch event type -} // myTelnetHandler +} // myhandle_telnet_events -static void handleLogBuffer(int partnerSocket, UBaseType_t count){ +static void process_logs(UBaseType_t count){ //Receive an item from no-split ring buffer size_t item_size; UBaseType_t uxItemsWaiting; UBaseType_t uxBytesToSend=count; vRingbufferGetInfo(buf_handle, NULL, NULL, NULL, NULL, &uxItemsWaiting); + if(count == 0){ + // this sends the entire buffer to the remote client + uxBytesToSend = uxItemsWaiting; + } if( partnerSocket ==0 && (uxItemsWaiting*100 / log_buf_size) <75){ // We still have some room in the ringbuffer and there's no telnet // connection yet, so bail out for now. @@ -321,14 +285,12 @@ static void handleLogBuffer(int partnerSocket, UBaseType_t count){ while(uxBytesToSend>0){ char *item = (char *)xRingbufferReceiveUpTo(buf_handle, &item_size, pdMS_TO_TICKS(50), uxBytesToSend); - //Check received data + //Check received data if (item != NULL) { uxBytesToSend-=item_size; - if(partnerSocket!=0) - telnet_esp32_sendData((uint8_t *)item, item_size); - else{ - //printf("%s() flushing %u bytes from log buffer\n", __FUNCTION__, item_size); + if(partnerSocket!=0){ + telnet_send_text(tnHandle, item, item_size); } //Return Item vRingbufferReturnItem(buf_handle, (void *)item); @@ -339,81 +301,95 @@ static void handleLogBuffer(int partnerSocket, UBaseType_t count){ } } -static void doTelnet(int partnerSocket) { - //ESP_LOGD(tag, ">> doTelnet"); +static void handle_telnet_conn() { + static const telnet_telopt_t my_telopts[] = { - { TELNET_TELOPT_ECHO, TELNET_WILL, TELNET_DONT }, + { TELNET_TELOPT_ECHO, TELNET_WONT, TELNET_DO }, { TELNET_TELOPT_TTYPE, TELNET_WILL, TELNET_DONT }, { TELNET_TELOPT_COMPRESS2, TELNET_WONT, TELNET_DO }, { TELNET_TELOPT_ZMP, TELNET_WONT, TELNET_DO }, { TELNET_TELOPT_MSSP, TELNET_WONT, TELNET_DO }, { TELNET_TELOPT_BINARY, TELNET_WILL, TELNET_DO }, { TELNET_TELOPT_NAWS, TELNET_WILL, TELNET_DONT }, + {TELNET_TELOPT_LINEMODE, TELNET_WONT, TELNET_DO }, { -1, 0, 0 } }; struct telnetUserData *pTelnetUserData = (struct telnetUserData *)malloc(sizeof(struct telnetUserData)); + tnHandle = telnet_init(my_telopts, handle_telnet_events, 0, pTelnetUserData); + + pTelnetUserData->rxbuf = (char *) heap_caps_malloc(TELNET_RX_BUF, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT); + pTelnetUserData->tnHandle = tnHandle; pTelnetUserData->sockfd = partnerSocket; + // flush all the log buffer on connect + process_logs(0); - tnHandle = telnet_init(my_telopts, telnetHandler, 0, pTelnetUserData); - - uint8_t buffer[1024]; while(1) { //ESP_LOGD(tag, "waiting for data"); - ssize_t len = recv(partnerSocket, (char *)buffer, sizeof(buffer), MSG_DONTWAIT); + ssize_t len = recv(partnerSocket, pTelnetUserData->rxbuf, TELNET_RX_BUF, MSG_DONTWAIT); if (len >0 ) { - //ESP_LOGD(tag, "received %d bytes", len); - telnet_recv(tnHandle, (char *)buffer, len); + telnet_recv(tnHandle, pTelnetUserData->rxbuf, len); } else if (errno != EAGAIN && errno !=EWOULDBLOCK ){ telnet_free(tnHandle); tnHandle = NULL; + free(pTelnetUserData->rxbuf); + pTelnetUserData->rxbuf=NULL; free(pTelnetUserData); + partnerSocket = 0; return; } - handleLogBuffer(partnerSocket, send_chunk); + process_logs(send_chunk); taskYIELD(); } -} // doTelnet +} // handle_telnet_conn -/** - * Listen for telnet clients and handle them. - */ -void telnet_esp32_listenForClients() { - //ESP_LOGD(tag, ">> telnet_listenForClients"); - int serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); +// ******************* stdout/stderr Redirection to ringbuffer +static ssize_t stdout_write(int fd, const void * data, size_t size) { + if (xSemaphoreTake(xSemaphore, (TickType_t) 10) == pdTRUE) { + // #1 Write to ringbuffer + if (buf_handle == NULL) { + printf("%s() ABORT. file handle _log_remote_fp is NULL\n", + __FUNCTION__); + } else { + //Send an item + UBaseType_t res = xRingbufferSend(buf_handle, data, size, + pdMS_TO_TICKS(100)); + if (res != pdTRUE) { + // flush some entries + process_logs(size); + res = xRingbufferSend(buf_handle, data, size, + pdMS_TO_TICKS(100)); + if (res != pdTRUE) { - struct sockaddr_in serverAddr; - serverAddr.sin_family = AF_INET; - serverAddr.sin_addr.s_addr = htonl(INADDR_ANY); - serverAddr.sin_port = htons(23); - - int rc = bind(serverSocket, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); - if (rc < 0) { - ESP_LOGE(tag, "bind: %d (%s)", errno, strerror(errno)); - return; - } - - rc = listen(serverSocket, 5); - if (rc < 0) { - ESP_LOGE(tag, "listen: %d (%s)", errno, strerror(errno)); - return; - } - - while(1) { - socklen_t len = sizeof(serverAddr); - rc = accept(serverSocket, (struct sockaddr *)&serverAddr, &len); - if (rc < 0 ){ - ESP_LOGE(tag, "accept: %d (%s)", errno, strerror(errno)); - return; - } - else { - int partnerSocket = rc; - ESP_LOGD(tag, "We have a new client connection!"); - doTelnet(partnerSocket); - ESP_LOGD(tag, "Telnet connection terminated"); + printf("%s() ABORT. Unable to store log entry in buffer\n", + __FUNCTION__); + } + } } + xSemaphoreGive(xSemaphore); + } else { + // We could not obtain the semaphore and can therefore not access + // the shared resource safely. } -} // listenForNewClient + return write(uart_fd, data, size); +} + +static ssize_t stdout_read(int fd, void* data, size_t size) { + return read(fd, data, size); +} + +static int stdout_open(const char * path, int flags, int mode) { + return 0; +} + +static int stdout_close(int fd) { + return 0; +} + +static int stdout_fstat(int fd, struct stat * st) { + st->st_mode = S_IFCHR; + return 0; +} diff --git a/components/telnet/telnet.h b/components/telnet/telnet.h index db619f08..255fa3d6 100644 --- a/components/telnet/telnet.h +++ b/components/telnet/telnet.h @@ -1,4 +1,3 @@ void init_telnet(); void start_telnet(void * pvParameter); -void telnet_esp32_sendData(uint8_t *buffer, size_t size);