From bb11826a6071dbde80820dfde8a39efd7850e78b Mon Sep 17 00:00:00 2001 From: jweigele Date: Mon, 17 Jul 2023 07:50:11 -0700 Subject: [PATCH] fix some errors when compiling with zigbee --- aqi/dependencies.lock | 2 +- aqi/main/aqi.c | 20 +++- aqi/main/aqi.h | 8 +- aqi/sdkconfig | 225 ++++++++++++++++-------------------------- 4 files changed, 108 insertions(+), 147 deletions(-) diff --git a/aqi/dependencies.lock b/aqi/dependencies.lock index e0d14f8..ef69687 100644 --- a/aqi/dependencies.lock +++ b/aqi/dependencies.lock @@ -29,5 +29,5 @@ dependencies: type: idf version: 5.1.0 manifest_hash: a38aaee041b50633069a2b3b73fab6a06e0ac769824d1e24f51de3d63b42b66b -target: esp32c6 +target: esp32h2 version: 1.0.0 diff --git a/aqi/main/aqi.c b/aqi/main/aqi.c index 1afd15c..3a71a89 100644 --- a/aqi/main/aqi.c +++ b/aqi/main/aqi.c @@ -382,19 +382,25 @@ static void monitoring_task(void* discard) { #ifdef CONFIG_TEMP_ENABLED init_temp(); + short temp_avg = 0; #endif + uint16_t set_pm10; + uint16_t set_pm25; uint8_t* data = (uint8_t*) malloc(RX_BUF_SIZE+1); int length = 0; +#ifdef CONFIG_WIFI_ENABLED esp_mqtt_client_handle_t queue_item; +#endif for(;;){ +#ifdef CONFIG_WIFI_ENABLED // receive an event we need to deal with from elsewhere, right now just reconnect related if (xQueueReceive(event_queue, &queue_item, 0 )){ ESP_LOGW(TAG, "received a queue event in main monitoring loop! %p", queue_item); mqtt_reinit(queue_item); } - +#endif ESP_LOGI(TAG, "free heap: %"PRIu32, esp_get_free_heap_size()); @@ -414,8 +420,8 @@ static void monitoring_task(void* discard) #ifdef CONFIG_ZIG_ENABLED if (zig_connected){ - uint16_t set_pm10 = (uint16_t)cur_pm.pm10; - uint16_t set_pm25 = (uint16_t)cur_pm.pm25; + set_pm10 = (uint16_t)cur_pm.pm10; + set_pm25 = (uint16_t)cur_pm.pm25; esp_zb_zcl_set_attribute_val(HA_ESP_ENDPOINT, PM25CLUSTER, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, PM10MEASURED, &set_pm10, false); @@ -452,7 +458,7 @@ static void monitoring_task(void* discard) light_driver_set_color_RGB(current_colors[0], current_colors[1], current_colors[2]); #endif - short temp_avg = 0; + temp_avg = 0; #ifdef CONFIG_TEMP_ENABLED // Temperature fetch/calculation/report temp_avg = new_temp_average(get_temp()); @@ -802,6 +808,7 @@ void erase_data_hook(void){ } +#ifdef CONFIG_INDICATOR_ENABLED // simple and cheap, just nerfs the total color values in the lookup table once at boot void adjust_color_lookup_brightness(float multiplier){ for (int x = 0; x < 6; x++ ){ @@ -810,12 +817,17 @@ void adjust_color_lookup_brightness(float multiplier){ } } } +#endif void app_main(void) { ESP_ERROR_CHECK(nvs_flash_init()); +#ifdef CONFIG_WIFI_ENABLED event_queue = xQueueCreate(5, sizeof(esp_mqtt_client_handle_t)); +#endif //indicator light +#ifdef CONFIG_INDICATOR_ENABLED light_driver_init(LIGHT_DEFAULT_OFF); +#endif // check for erasing data partitions diff --git a/aqi/main/aqi.h b/aqi/main/aqi.h index f7e9369..44c1db8 100644 --- a/aqi/main/aqi.h +++ b/aqi/main/aqi.h @@ -53,10 +53,10 @@ void init_mqtt(); static const char *TAG = "aqi"; -#define AQI_INDICATOR_BRIGHTNESS 0.25 +#define AQI_INDICATOR_BRIGHTNESS 0.01 #ifdef CONFIG_TEMP_ENABLED -#define TEMP_GPIO 2 +#define TEMP_GPIO 0 #include "onewire.h" #define MIN_TEMP_VALUE -5500 #define MAX_TEMP_VALUE 12500 @@ -71,8 +71,8 @@ static const char *TAG = "aqi"; #endif #define MAXDEVS 1 -#define UART_RX_GPIO (GPIO_NUM_23) -#define UART_TX_GPIO (GPIO_NUM_22) +#define UART_RX_GPIO (GPIO_NUM_26) +#define UART_TX_GPIO (GPIO_NUM_27) diff --git a/aqi/sdkconfig b/aqi/sdkconfig index 38bf712..789b746 100644 --- a/aqi/sdkconfig +++ b/aqi/sdkconfig @@ -3,52 +3,47 @@ # Espressif IoT Development Framework (ESP-IDF) Project Configuration # CONFIG_SOC_ADC_SUPPORTED=y +CONFIG_SOC_ANA_CMPR_SUPPORTED=y CONFIG_SOC_DEDICATED_GPIO_SUPPORTED=y CONFIG_SOC_UART_SUPPORTED=y CONFIG_SOC_GDMA_SUPPORTED=y -CONFIG_SOC_GPTIMER_SUPPORTED=y +CONFIG_SOC_ASYNC_MEMCPY_SUPPORTED=y CONFIG_SOC_PCNT_SUPPORTED=y CONFIG_SOC_MCPWM_SUPPORTED=y CONFIG_SOC_TWAI_SUPPORTED=y -CONFIG_SOC_ETM_SUPPORTED=y -CONFIG_SOC_PARLIO_SUPPORTED=y CONFIG_SOC_BT_SUPPORTED=y +CONFIG_SOC_GPTIMER_SUPPORTED=y CONFIG_SOC_IEEE802154_SUPPORTED=y -CONFIG_SOC_ASYNC_MEMCPY_SUPPORTED=y +CONFIG_SOC_IEEE802154_BLE_ONLY=y CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y CONFIG_SOC_TEMP_SENSOR_SUPPORTED=y -CONFIG_SOC_WIFI_SUPPORTED=y CONFIG_SOC_SUPPORTS_SECURE_DL_MODE=y -CONFIG_SOC_ULP_SUPPORTED=y -CONFIG_SOC_LP_CORE_SUPPORTED=y CONFIG_SOC_EFUSE_KEY_PURPOSE_FIELD=y CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y CONFIG_SOC_RTC_MEM_SUPPORTED=y CONFIG_SOC_I2S_SUPPORTED=y -CONFIG_SOC_RMT_SUPPORTED=y CONFIG_SOC_SDM_SUPPORTED=y +CONFIG_SOC_ETM_SUPPORTED=y +CONFIG_SOC_RMT_SUPPORTED=y +CONFIG_SOC_PARLIO_SUPPORTED=y CONFIG_SOC_GPSPI_SUPPORTED=y CONFIG_SOC_LEDC_SUPPORTED=y CONFIG_SOC_I2C_SUPPORTED=y CONFIG_SOC_SYSTIMER_SUPPORTED=y -CONFIG_SOC_SUPPORT_COEXISTENCE=y CONFIG_SOC_AES_SUPPORTED=y CONFIG_SOC_MPI_SUPPORTED=y CONFIG_SOC_SHA_SUPPORTED=y CONFIG_SOC_HMAC_SUPPORTED=y CONFIG_SOC_DIG_SIGN_SUPPORTED=y CONFIG_SOC_ECC_SUPPORTED=y +CONFIG_SOC_ECC_EXTENDED_MODES_SUPPORTED=y +CONFIG_SOC_ECDSA_SUPPORTED=y CONFIG_SOC_FLASH_ENC_SUPPORTED=y CONFIG_SOC_SECURE_BOOT_SUPPORTED=y -CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y CONFIG_SOC_BOD_SUPPORTED=y CONFIG_SOC_APM_SUPPORTED=y CONFIG_SOC_PMU_SUPPORTED=y -CONFIG_SOC_PAU_SUPPORTED=y -CONFIG_SOC_LP_TIMER_SUPPORTED=y -CONFIG_SOC_LP_AON_SUPPORTED=y -CONFIG_SOC_LP_I2C_SUPPORTED=y -CONFIG_SOC_XTAL_SUPPORT_40M=y +CONFIG_SOC_XTAL_SUPPORT_32M=y CONFIG_SOC_AES_SUPPORT_DMA=y CONFIG_SOC_AES_GDMA=y CONFIG_SOC_AES_SUPPORT_AES_128=y @@ -58,7 +53,7 @@ CONFIG_SOC_ADC_DIG_IIR_FILTER_SUPPORTED=y CONFIG_SOC_ADC_MONITOR_SUPPORTED=y CONFIG_SOC_ADC_DMA_SUPPORTED=y CONFIG_SOC_ADC_PERIPH_NUM=1 -CONFIG_SOC_ADC_MAX_CHANNEL_NUM=7 +CONFIG_SOC_ADC_MAX_CHANNEL_NUM=5 CONFIG_SOC_ADC_ATTEN_NUM=4 CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=1 CONFIG_SOC_ADC_PATT_LEN_MAX=8 @@ -85,6 +80,10 @@ CONFIG_SOC_CPU_WATCHPOINTS_NUM=4 CONFIG_SOC_CPU_WATCHPOINT_SIZE=0x80000000 CONFIG_SOC_CPU_HAS_PMA=y CONFIG_SOC_CPU_IDRAM_SPLIT_USING_PMP=y +CONFIG_SOC_MMU_PAGE_SIZE_CONFIGURABLE=y +CONFIG_SOC_MMU_PERIPH_NUM=1 +CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=1 +CONFIG_SOC_MMU_DI_VADDR_SHARED=y CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=3072 CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16 CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100 @@ -94,42 +93,39 @@ CONFIG_SOC_GDMA_SUPPORT_ETM=y CONFIG_SOC_ETM_GROUPS=1 CONFIG_SOC_ETM_CHANNELS_PER_GROUP=50 CONFIG_SOC_GPIO_PORT=1 -CONFIG_SOC_GPIO_PIN_COUNT=31 +CONFIG_SOC_GPIO_PIN_COUNT=28 CONFIG_SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER=y +CONFIG_SOC_GPIO_SUPPORT_PIN_HYS_FILTER=y CONFIG_SOC_GPIO_FLEX_GLITCH_FILTER_NUM=8 CONFIG_SOC_GPIO_SUPPORT_ETM=y CONFIG_SOC_GPIO_ETM_EVENTS_PER_GROUP=8 CONFIG_SOC_GPIO_ETM_TASKS_PER_GROUP=8 -CONFIG_SOC_GPIO_SUPPORT_RTC_INDEPENDENT=y CONFIG_SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP=y CONFIG_SOC_GPIO_DEEP_SLEEP_WAKE_VALID_GPIO_MASK=0 -CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x000000007FFFFF00 +CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x000000000FFF807F CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y CONFIG_SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP=y -CONFIG_SOC_RTCIO_PIN_COUNT=8 -CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y -CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y -CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y CONFIG_SOC_DEDIC_GPIO_OUT_CHANNELS_NUM=8 CONFIG_SOC_DEDIC_GPIO_IN_CHANNELS_NUM=8 CONFIG_SOC_DEDIC_PERIPH_ALWAYS_ENABLE=y -CONFIG_SOC_I2C_NUM=1 +CONFIG_SOC_ANA_CMPR_NUM=1 +CONFIG_SOC_I2C_NUM=2 CONFIG_SOC_I2C_FIFO_LEN=32 CONFIG_SOC_I2C_SUPPORT_SLAVE=y CONFIG_SOC_I2C_SUPPORT_HW_CLR_BUS=y CONFIG_SOC_I2C_SUPPORT_XTAL=y CONFIG_SOC_I2C_SUPPORT_RTC=y -CONFIG_SOC_LP_I2C_NUM=1 -CONFIG_SOC_LP_I2C_FIFO_LEN=16 CONFIG_SOC_I2S_NUM=1 CONFIG_SOC_I2S_HW_VERSION_2=y CONFIG_SOC_I2S_SUPPORTS_XTAL=y -CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y +CONFIG_SOC_I2S_SUPPORTS_PLL_F96M=y +CONFIG_SOC_I2S_SUPPORTS_PLL_F64M=y CONFIG_SOC_I2S_SUPPORTS_PCM=y CONFIG_SOC_I2S_SUPPORTS_PDM=y CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y CONFIG_SOC_I2S_PDM_MAX_TX_LINES=2 CONFIG_SOC_I2S_SUPPORTS_TDM=y +CONFIG_SOC_I2S_TDM_FULL_DATA_WIDTH=y CONFIG_SOC_LEDC_SUPPORT_PLL_DIV_CLOCK=y CONFIG_SOC_LEDC_SUPPORT_XTAL_CLOCK=y CONFIG_SOC_LEDC_CHANNEL_NUM=6 @@ -138,10 +134,6 @@ CONFIG_SOC_LEDC_SUPPORT_FADE_STOP=y CONFIG_SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED=y CONFIG_SOC_LEDC_GAMMA_CURVE_FADE_RANGE_MAX=16 CONFIG_SOC_LEDC_FADE_PARAMS_BIT_WIDTH=10 -CONFIG_SOC_MMU_PAGE_SIZE_CONFIGURABLE=y -CONFIG_SOC_MMU_PERIPH_NUM=1 -CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=1 -CONFIG_SOC_MMU_DI_VADDR_SHARED=y CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8 CONFIG_SOC_PCNT_GROUPS=1 @@ -179,9 +171,13 @@ CONFIG_SOC_MCPWM_CAPTURE_CLK_FROM_GROUP=y CONFIG_SOC_PARLIO_GROUPS=1 CONFIG_SOC_PARLIO_TX_UNITS_PER_GROUP=1 CONFIG_SOC_PARLIO_RX_UNITS_PER_GROUP=1 -CONFIG_SOC_PARLIO_TX_UNIT_MAX_DATA_WIDTH=16 -CONFIG_SOC_PARLIO_RX_UNIT_MAX_DATA_WIDTH=16 -CONFIG_SOC_PARLIO_TX_RX_SHARE_INTERRUPT=y +CONFIG_SOC_PARLIO_TX_UNIT_MAX_DATA_WIDTH=8 +CONFIG_SOC_PARLIO_RX_UNIT_MAX_DATA_WIDTH=8 +CONFIG_SOC_PARLIO_TX_CLK_SUPPORT_GATING=y +CONFIG_SOC_PARLIO_TRANS_BIT_ALIGN=y +CONFIG_SOC_RTC_CNTL_CPU_PD_DMA_BUS_WIDTH=128 +CONFIG_SOC_RTC_CNTL_CPU_PD_REG_FILE_NUM=108 +CONFIG_SOC_RTCIO_PIN_COUNT=0 CONFIG_SOC_RSA_MAX_BIT_LEN=3072 CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968 CONFIG_SOC_SHA_SUPPORT_DMA=y @@ -192,7 +188,7 @@ CONFIG_SOC_SHA_SUPPORT_SHA224=y CONFIG_SOC_SHA_SUPPORT_SHA256=y CONFIG_SOC_SDM_GROUPS=1 CONFIG_SOC_SDM_CHANNELS_PER_GROUP=4 -CONFIG_SOC_SDM_CLK_SUPPORT_PLL_F80M=y +CONFIG_SOC_SDM_CLK_SUPPORT_PLL_F48M=y CONFIG_SOC_SDM_CLK_SUPPORT_XTAL=y CONFIG_SOC_SPI_PERIPH_NUM=2 CONFIG_SOC_SPI_MAX_CS_NUM=6 @@ -203,7 +199,7 @@ CONFIG_SOC_SPI_SUPPORT_CD_SIG=y CONFIG_SOC_SPI_SUPPORT_CONTINUOUS_TRANS=y CONFIG_SOC_SPI_SUPPORT_SLAVE_HD_VER2=y CONFIG_SOC_SPI_SUPPORT_CLK_XTAL=y -CONFIG_SOC_SPI_SUPPORT_CLK_PLL_F80M=y +CONFIG_SOC_SPI_SUPPORT_CLK_PLL_F48M=y CONFIG_SOC_SPI_SUPPORT_CLK_RC_FAST=y CONFIG_SOC_MEMSPI_IS_INDEPENDENT=y CONFIG_SOC_SPI_MAX_PRE_DIVIDER=16 @@ -214,9 +210,10 @@ CONFIG_SOC_SPI_MEM_SUPPORT_IDLE_INTR=y CONFIG_SOC_SPI_MEM_SUPPORT_SW_SUSPEND=y CONFIG_SOC_SPI_MEM_SUPPORT_CHECK_SUS=y CONFIG_SOC_SPI_MEM_SUPPORT_WRAP=y -CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y -CONFIG_SOC_MEMSPI_SRC_FREQ_40M_SUPPORTED=y -CONFIG_SOC_MEMSPI_SRC_FREQ_20M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_64M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_32M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_16M_SUPPORTED=y +CONFIG_SOC_MEMSPI_CLOCK_IS_INDEPENDENT=y CONFIG_SOC_SYSTIMER_COUNTER_NUM=2 CONFIG_SOC_SYSTIMER_ALARM_NUM=3 CONFIG_SOC_SYSTIMER_BIT_WIDTH_LO=32 @@ -226,8 +223,6 @@ CONFIG_SOC_SYSTIMER_SUPPORT_RC_FAST=y CONFIG_SOC_SYSTIMER_INT_LEVEL=y CONFIG_SOC_SYSTIMER_ALARM_MISS_COMPENSATE=y CONFIG_SOC_SYSTIMER_SUPPORT_ETM=y -CONFIG_SOC_LP_TIMER_BIT_WIDTH_LO=32 -CONFIG_SOC_LP_TIMER_BIT_WIDTH_HI=16 CONFIG_SOC_TIMER_GROUPS=2 CONFIG_SOC_TIMER_GROUP_TIMERS_PER_GROUP=1 CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=54 @@ -235,12 +230,11 @@ CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y CONFIG_SOC_TIMER_GROUP_SUPPORT_RC_FAST=y CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=2 CONFIG_SOC_TIMER_SUPPORT_ETM=y -CONFIG_SOC_TWAI_CONTROLLER_NUM=2 +CONFIG_SOC_TWAI_CONTROLLER_NUM=y CONFIG_SOC_TWAI_CLK_SUPPORT_XTAL=y CONFIG_SOC_TWAI_BRP_MIN=2 CONFIG_SOC_TWAI_BRP_MAX=32768 CONFIG_SOC_TWAI_SUPPORTS_RX_STATUS=y -CONFIG_SOC_EFUSE_DIS_DOWNLOAD_ICACHE=y CONFIG_SOC_EFUSE_DIS_PAD_JTAG=y CONFIG_SOC_EFUSE_DIS_USB_JTAG=y CONFIG_SOC_EFUSE_DIS_DIRECT_BOOT=y @@ -258,47 +252,30 @@ CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_128=y CONFIG_SOC_UART_NUM=2 CONFIG_SOC_UART_FIFO_LEN=128 CONFIG_SOC_UART_BITRATE_MAX=5000000 -CONFIG_SOC_UART_SUPPORT_PLL_F80M_CLK=y CONFIG_SOC_UART_SUPPORT_RTC_CLK=y CONFIG_SOC_UART_SUPPORT_XTAL_CLK=y -CONFIG_SOC_UART_SUPPORT_WAKEUP_INT=y CONFIG_SOC_UART_SUPPORT_FSM_TX_WAIT_SEND=y CONFIG_SOC_COEX_HW_PTI=y CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21 -CONFIG_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH=12 CONFIG_SOC_PM_SUPPORT_WIFI_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_BEACON_WAKEUP=y CONFIG_SOC_PM_SUPPORT_BT_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_EXT1_WAKEUP=y CONFIG_SOC_PM_SUPPORT_CPU_PD=y -CONFIG_SOC_PM_SUPPORT_MODEM_PD=y +CONFIG_SOC_PM_SUPPORT_BT_PD=y CONFIG_SOC_PM_SUPPORT_XTAL32K_PD=y CONFIG_SOC_PM_SUPPORT_RC32K_PD=y CONFIG_SOC_PM_SUPPORT_RC_FAST_PD=y CONFIG_SOC_PM_SUPPORT_VDDSDIO_PD=y -CONFIG_SOC_PM_SUPPORT_TOP_PD=y -CONFIG_SOC_PM_SUPPORT_MAC_BB_PD=y -CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y -CONFIG_SOC_PM_SUPPORT_PMU_MODEM_STATE=y +CONFIG_SOC_PM_CPU_RETENTION_BY_RTCCNTL=y CONFIG_SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY=y -CONFIG_SOC_PM_CPU_RETENTION_BY_SW=y -CONFIG_SOC_PM_MODEM_RETENTION_BY_REGDMA=y -CONFIG_SOC_PM_PAU_LINK_NUM=4 CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y -CONFIG_SOC_MODEM_CLOCK_IS_INDEPENDENT=y CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y CONFIG_SOC_CLK_OSC_SLOW_SUPPORTED=y CONFIG_SOC_CLK_RC32K_SUPPORTED=y +CONFIG_SOC_CLK_LP_FAST_SUPPORT_LP_PLL=y +CONFIG_SOC_MODEM_CLOCK_IS_INDEPENDENT=y CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC=y CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL=y CONFIG_SOC_TEMPERATURE_SENSOR_INTR_SUPPORT=y -CONFIG_SOC_WIFI_HW_TSF=y -CONFIG_SOC_WIFI_FTM_SUPPORT=y -CONFIG_SOC_WIFI_GCMP_SUPPORT=y -CONFIG_SOC_WIFI_WAPI_SUPPORT=y -CONFIG_SOC_WIFI_CSI_SUPPORT=y -CONFIG_SOC_WIFI_MESH_SUPPORT=y -CONFIG_SOC_WIFI_HE_SUPPORT=y CONFIG_SOC_BLE_SUPPORTED=y CONFIG_SOC_BLE_MESH_SUPPORTED=y CONFIG_SOC_ESP_NIMBLE_CONTROLLER=y @@ -308,9 +285,9 @@ CONFIG_SOC_BLE_POWER_CONTROL_SUPPORTED=y CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_RISCV=y CONFIG_IDF_TARGET_ARCH="riscv" -CONFIG_IDF_TARGET="esp32c6" -CONFIG_IDF_TARGET_ESP32C6=y -CONFIG_IDF_FIRMWARE_CHIP_ID=0x000D +CONFIG_IDF_TARGET="esp32h2" +CONFIG_IDF_TARGET_ESP32H2=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0010 # # Build type @@ -378,20 +355,17 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 CONFIG_ESP_ROM_HAS_CRC_LE=y CONFIG_ESP_ROM_HAS_CRC_BE=y -CONFIG_ESP_ROM_HAS_JPEG_DECODE=y CONFIG_ESP_ROM_UART_CLK_IS_XTAL=y CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=3 CONFIG_ESP_ROM_HAS_RETARGETABLE_LOCKING=y CONFIG_ESP_ROM_GET_CLK_FREQ=y -CONFIG_ESP_ROM_HAS_RVFPLIB=y CONFIG_ESP_ROM_HAS_HAL_WDT=y CONFIG_ESP_ROM_HAS_HAL_SYSTIMER=y CONFIG_ESP_ROM_HAS_HEAP_TLSF=y CONFIG_ESP_ROM_HAS_LAYOUT_TABLE=y CONFIG_ESP_ROM_HAS_SPI_FLASH=y -CONFIG_ESP_ROM_HAS_REGI2C_BUG=y -CONFIG_ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT=y -CONFIG_ESP_ROM_REV0_HAS_NO_ECDSA_INTERFACE=y +CONFIG_ESP_ROM_WITHOUT_REGI2C=y +CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y CONFIG_ESP_ROM_WDT_INIT_PATCH=y CONFIG_ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE=y CONFIG_ESP_ROM_RAM_APP_NEEDS_MMU_INIT=y @@ -415,11 +389,10 @@ CONFIG_ESPTOOLPY_FLASHMODE_DIO=y # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set -# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set -CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y -CONFIG_ESPTOOLPY_FLASHFREQ="80m" +CONFIG_ESPTOOLPY_FLASHFREQ_64M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_32M is not set +# CONFIG_ESPTOOLPY_FLASHFREQ_16M is not set +CONFIG_ESPTOOLPY_FLASHFREQ="48m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set @@ -462,8 +435,7 @@ CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set -# CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB is not set -CONFIG_COMPILER_FLOAT_LIB_FROM_RVFPLIB=y +CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set CONFIG_COMPILER_HIDE_PATHS_MACROS=y @@ -559,6 +531,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_SDM_ENABLE_DEBUG_LOG is not set # end of Sigma Delta Modulator Configuration +# +# Analog Comparator Configuration +# +# CONFIG_ANA_CMPR_ISR_IRAM_SAFE is not set +# CONFIG_ANA_CMPR_CTRL_FUNC_IN_IRAM is not set +# CONFIG_ANA_CMPR_ENABLE_DEBUG_LOG is not set +# end of Analog Comparator Configuration + # # GPTimer Configuration # @@ -631,8 +611,7 @@ CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set -CONFIG_ESP_TLS_INSECURE=y -CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y +# CONFIG_ESP_TLS_INSECURE is not set # end of ESP-TLS # @@ -645,7 +624,6 @@ CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y # # Wireless Coexistence # -CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y # CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE is not set # end of Wireless Coexistence @@ -720,37 +698,34 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 # # Chip revision # -CONFIG_ESP32C6_REV_MIN_0=y -# CONFIG_ESP32C6_REV_MIN_1 is not set -CONFIG_ESP32C6_REV_MIN_FULL=0 +CONFIG_ESP32H2_REV_MIN_0=y +# CONFIG_ESP32H2_REV_MIN_1 is not set +# CONFIG_ESP32H2_REV_MIN_2 is not set +CONFIG_ESP32H2_REV_MIN_FULL=0 CONFIG_ESP_REV_MIN_FULL=0 # -# Maximum Supported ESP32-C6 Revision (Rev v0.99) +# Maximum Supported ESP32-H2 Revision (Rev v0.99) # -CONFIG_ESP32C6_REV_MAX_FULL=99 +CONFIG_ESP32H2_REV_MAX_FULL=99 CONFIG_ESP_REV_MAX_FULL=99 # end of Chip revision # # MAC Config # -CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y -CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y -CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y CONFIG_ESP_MAC_ADDR_UNIVERSE_IEEE802154=y -CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y -# CONFIG_ESP32C6_UNIVERSAL_MAC_ADDRESSES_TWO is not set -CONFIG_ESP32C6_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32C6_UNIVERSAL_MAC_ADDRESSES=4 +CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_TWO=y +CONFIG_ESP32H2_UNIVERSAL_MAC_ADDRESSES_TWO=y +CONFIG_ESP32H2_UNIVERSAL_MAC_ADDRESSES=2 # end of MAC Config # # Sleep Config # # CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set -CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y +# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set # end of Sleep Config @@ -787,8 +762,8 @@ CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y # # Main XTAL Config # -CONFIG_XTAL_FREQ_40=y -CONFIG_XTAL_FREQ=40 +CONFIG_XTAL_FREQ_32=y +CONFIG_XTAL_FREQ=32 # end of Main XTAL Config # end of Hardware Settings @@ -828,7 +803,6 @@ CONFIG_ESP_NETIF_USES_TCPIP_WITH_BSD_API=y # PHY # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y -# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 # CONFIG_ESP_PHY_REDUCE_TX_POWER is not set @@ -842,9 +816,6 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0 # # Power Management # -# CONFIG_PM_ENABLE is not set -CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y -# CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP is not set # end of Power Management # @@ -860,10 +831,10 @@ CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y # # ESP System Settings # -# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set -# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_120 is not set -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_48 is not set +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_64 is not set +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_96=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=96 # CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set @@ -871,8 +842,6 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0 CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y -CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y -CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y # CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set # @@ -952,14 +921,12 @@ CONFIG_ESP_TIMER_IMPL_SYSTIMER=y # # Wi-Fi # -CONFIG_ESP_WIFI_ENABLED=y CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32 # CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32 -# CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP_WIFI_TX_BA_WIN=6 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y @@ -974,25 +941,19 @@ CONFIG_ESP_WIFI_ENABLE_SAE_PK=y CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set -# CONFIG_ESP_WIFI_FTM_ENABLE is not set CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y -# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7 -CONFIG_ESP_WIFI_ENABLE_WIFI_TX_STATS=y CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y -# CONFIG_ESP_WIFI_WAPI_PSK is not set # CONFIG_ESP_WIFI_SUITE_B_192 is not set # CONFIG_ESP_WIFI_11KV_SUPPORT is not set # CONFIG_ESP_WIFI_MBO_SUPPORT is not set # CONFIG_ESP_WIFI_DPP_SUPPORT is not set # CONFIG_ESP_WIFI_11R_SUPPORT is not set # CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR is not set -CONFIG_ESP_WIFI_ENABLE_WIFI_RX_STATS=y -CONFIG_ESP_WIFI_ENABLE_WIFI_RX_MU_STATS=y # # WPS Configuration Options @@ -1368,6 +1329,8 @@ CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_ECC=y CONFIG_MBEDTLS_ECC_OTHER_CURVES_SOFT_FALLBACK=y CONFIG_MBEDTLS_ROM_MD5=y +# CONFIG_MBEDTLS_HARDWARE_ECDSA_SIGN is not set +CONFIG_MBEDTLS_HARDWARE_ECDSA_VERIFY=y # CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set # CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set CONFIG_MBEDTLS_HAVE_TIME=y @@ -1613,12 +1576,6 @@ CONFIG_WS_BUFFER_SIZE=1024 # end of Websocket # end of TCP Transport -# -# Ultra Low Power (ULP) Co-processor -# -# CONFIG_ULP_COPROC_ENABLED is not set -# end of Ultra Low Power (ULP) Co-processor - # # Unity unit testing library # @@ -1673,13 +1630,13 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # # AQI Program Configuration # -# CONFIG_TEMP_ENABLED is not set -# CONFIG_ZIG_ENABLED is not set -CONFIG_WIFI_ENABLED=y -CONFIG_LED_ENABLED=y -CONFIG_INDICATOR_ENABLED=y +CONFIG_TEMP_ENABLED=y +CONFIG_ZIG_ENABLED=y +# CONFIG_WIFI_ENABLED is not set +# CONFIG_LED_ENABLED is not set +# CONFIG_INDICATOR_ENABLED is not set CONFIG_BROKER_URL="mqtts://esp32:sensorauth@rabbitmq.hexthepla.net" -CONFIG_LOCATION="ESP32wifitest" +CONFIG_LOCATION="ESP32 babyyy" CONFIG_GPIO_ERASE_PIN=14 # end of AQI Program Configuration @@ -1697,10 +1654,10 @@ CONFIG_WIFI_MANAGER_RETRY_TIMER=5000 CONFIG_WIFI_MANAGER_MAX_RETRY_START_AP=3 CONFIG_WIFI_MANAGER_SHUTDOWN_AP_TIMER=60000 CONFIG_WEBAPP_LOCATION="/" -CONFIG_DEFAULT_AP_SSID="aqimonitor" -CONFIG_DEFAULT_AP_PASSWORD="aqipw" +CONFIG_DEFAULT_AP_SSID="esp32" +CONFIG_DEFAULT_AP_PASSWORD="esp32pwd" CONFIG_DEFAULT_AP_CHANNEL=1 -CONFIG_NVS_WIFI_PARTITION="wifi_storage" +CONFIG_NVS_WIFI_PARTITION="factory" CONFIG_DEFAULT_AP_IP="10.10.0.1" CONFIG_DEFAULT_AP_GATEWAY="10.10.0.1" CONFIG_DEFAULT_AP_NETMASK="255.255.255.0" @@ -1784,9 +1741,6 @@ CONFIG_STACK_CHECK_NONE=y CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y # CONFIG_MCPWM_ISR_IN_IRAM is not set -CONFIG_SW_COEXIST_ENABLE=y -CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y -CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y # CONFIG_EXTERNAL_COEX_ENABLE is not set # CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set # CONFIG_EVENT_LOOP_PROFILING is not set @@ -1795,12 +1749,10 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y # CONFIG_OTA_ALLOW_HTTP is not set # CONFIG_ESP_SYSTEM_PD_FLASH is not set CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y -# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 # CONFIG_REDUCE_PHY_TX_POWER is not set # CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set -CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 @@ -1829,14 +1781,12 @@ CONFIG_BROWNOUT_DET_LVL_SEL_7=y CONFIG_BROWNOUT_DET_LVL=7 CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 -CONFIG_ESP32_WIFI_ENABLED=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 -# CONFIG_ESP32_WIFI_CSI_ENABLED is not set CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_TX_BA_WIN=6 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y @@ -1852,7 +1802,6 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y CONFIG_WPA_MBEDTLS_CRYPTO=y CONFIG_WPA_MBEDTLS_TLS_CLIENT=y -# CONFIG_WPA_WAPI_PSK is not set # CONFIG_WPA_SUITE_B_192 is not set # CONFIG_WPA_11KV_SUPPORT is not set # CONFIG_WPA_MBO_SUPPORT is not set -- 2.30.2