From 28c324639845a9ab11cebc7b892f3c54a93a0172 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Wed, 5 Feb 2020 16:22:10 -0800 Subject: [PATCH] add dac_config NVS for generic I2S/DAC configuration --- build-scripts/ESP32-A1S.defaults | 1133 ++++++++++++++++++++++++ components/driver_i2s/CMakeLists.txt | 7 - components/driver_i2s/component.mk | 13 - components/driver_i2s/tas5756m.c | 0 components/squeezelite/a1s/ac101.c | 3 +- components/squeezelite/null/dac_null.c | 37 +- components/squeezelite/output_i2s.c | 39 +- components/telnet/telnet.c | 2 +- main/esp_app_main.c | 6 + 9 files changed, 1202 insertions(+), 38 deletions(-) create mode 100644 build-scripts/ESP32-A1S.defaults delete mode 100644 components/driver_i2s/CMakeLists.txt delete mode 100644 components/driver_i2s/component.mk delete mode 100644 components/driver_i2s/tas5756m.c diff --git a/build-scripts/ESP32-A1S.defaults b/build-scripts/ESP32-A1S.defaults new file mode 100644 index 00000000..8d6298f6 --- /dev/null +++ b/build-scripts/ESP32-A1S.defaults @@ -0,0 +1,1133 @@ +# +# 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_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_A1S=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 diff --git a/components/driver_i2s/CMakeLists.txt b/components/driver_i2s/CMakeLists.txt deleted file mode 100644 index 78bef683..00000000 --- a/components/driver_i2s/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(COMPONENT_ADD_INCLUDEDIRS .) - -set(COMPONENT_SRCS "tas5756m.c") - -set(COMPONENT_REQUIRES console spi_flash) - -register_component() diff --git a/components/driver_i2s/component.mk b/components/driver_i2s/component.mk deleted file mode 100644 index 6a3bd780..00000000 --- a/components/driver_i2s/component.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# 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_ADD_INCLUDEDIRS := . -CFLAGS += -Os -DPOSIX -DLINKALL -DLOOPBACK -DNO_FAAD -DEMBEDDED -DTREMOR_ONLY -DBYTES_PER_FRAME=4 -#CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG -CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO diff --git a/components/driver_i2s/tas5756m.c b/components/driver_i2s/tas5756m.c deleted file mode 100644 index e69de29b..00000000 diff --git a/components/squeezelite/a1s/ac101.c b/components/squeezelite/a1s/ac101.c index 414c2485..1026b9be 100644 --- a/components/squeezelite/a1s/ac101.c +++ b/components/squeezelite/a1s/ac101.c @@ -29,9 +29,8 @@ #include #include #include +#include #include "adac.h" - -//#include "audio_hal.h" #include "ac101.h" const static char TAG[] = "AC101"; diff --git a/components/squeezelite/null/dac_null.c b/components/squeezelite/null/dac_null.c index 2e357289..81efcc55 100644 --- a/components/squeezelite/null/dac_null.c +++ b/components/squeezelite/null/dac_null.c @@ -19,9 +19,13 @@ * */ +#include +#include +#include +#include "config.h" #include "adac.h" -static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config) { return true; }; +static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config); static void deinit(void) { }; static void speaker(bool active) { }; static void headset(bool active) { } ; @@ -30,3 +34,34 @@ static void power(adac_power_e mode) { }; struct adac_s dac_null = { init, deinit, power, speaker, headset, volume }; +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 //Not used }; + char *nvs_item = config_alloc_get(NVS_TYPE_STR, "dac_config"); + + if (nvs_item) { + if ((p = strcasestr(nvs_item, "bck")) != NULL) i2s_pin_config.bck_io_num = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "ws")) != NULL) i2s_pin_config.ws_io_num = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "do")) != NULL) i2s_pin_config.data_out_num = atoi(strchr(p, '=') + 1); + free(nvs_item); + } + + if (i2s_pin_config.bck_io_num != -1 && i2s_pin_config.ws_io_num != -1 && i2s_pin_config.data_out_num != -1) { + i2s_driver_install(i2s_num, i2s_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); + + return true; + } else { + 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); + return false; + } +#else + return true; +#endif +} + diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index 6d95feb6..3c7d4a33 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -114,19 +114,11 @@ static void (*jack_handler_chain)(bool inserted); // force all GPIOs to what we need #ifdef CONFIG_SQUEEZEAMP -#define TAS57xx -#undef CONFIG_SPDIF_BCK_IO -#define CONFIG_SPDIF_BCK_IO 33 -#undef CONFIG_SPDIF_WS_IO -#define CONFIG_SPDIF_WS_IO 25 -#undef CONFIG_SPDIF_DO_IO -#define CONFIG_SPDIF_DO_IO 15 -#undef CONFIG_SPDIF_NUM -#define CONFIG_SPDIF_NUM 0 #undef CONFIG_I2S_NUM #define CONFIG_I2S_NUM 0 +#undef CONFIG_SPDIF_DO_IO +#define CONFIG_SPDIF_DO_IO 15 #elif defined CONFIG_A1S -#define A1S #undef CONFIG_I2S_NUM #define CONFIG_I2S_NUM 0 #endif @@ -221,9 +213,28 @@ 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 //Not used - }; + .data_out_num = CONFIG_SPDIF_DO_IO, .data_in_num = -1 }; + 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); + if ((p = strcasestr(nvs_item, "ws")) != NULL) i2s_pin_config.ws_io_num = atoi(strchr(p, '=') + 1); + if ((p = strcasestr(nvs_item, "do")) != NULL) i2s_pin_config.data_out_num = atoi(strchr(p, '=') + 1); + free(nvs_item); + } + + 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; // Normally counted in frames, but 16 sample are transformed into 32 bits in spdif @@ -239,12 +250,12 @@ 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 TAS57xx +#ifdef CONFIG_SQUEEZEAMP 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(A1S) +#elif defined(CONFIG_A1S) adac = &dac_a1s; #endif i2s_config.sample_rate = output.current_sample_rate; diff --git a/components/telnet/telnet.c b/components/telnet/telnet.c index 7f46bc0e..9732b667 100644 --- a/components/telnet/telnet.c +++ b/components/telnet/telnet.c @@ -311,7 +311,7 @@ static void handleLogBuffer(int partnerSocket, UBaseType_t count){ UBaseType_t uxItemsWaiting; UBaseType_t uxBytesToSend=count; - vRingbufferGetInfo(buf_handle, NULL, NULL, NULL, &uxItemsWaiting); + vRingbufferGetInfo(buf_handle, NULL, NULL, NULL, NULL, &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. diff --git a/main/esp_app_main.c b/main/esp_app_main.c index 1530ba37..4fdd42de 100644 --- a/main/esp_app_main.c +++ b/main/esp_app_main.c @@ -328,6 +328,12 @@ 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."); }