changeset
Start migration to IDF 5.1
Mon, 24 Jun 2024 17:05:20 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Mon, 24 Jun 2024 17:05:20 +0200
- branch
- idf 5.1
- changeset 129
- 31f9d3e4a85f
- parent 128
- 64886971967b
- child 130
- 96ee5cb45b37
Start migration to IDF 5.1
--- a/.hgignore Mon Feb 19 15:07:28 2024 +0100 +++ b/.hgignore Mon Jun 24 17:05:20 2024 +0200 @@ -1,6 +1,7 @@ docs/doxygen-warning-log.txt sdkconfig.old pupdate.sh +dependencies.lock syntax: glob build/* @@ -8,3 +9,4 @@ kicad/*-bak kicad/*-cache.lib kicad/brewboard-backups/*.zip +managed_components/*
--- a/CMakeLists.txt Mon Feb 19 15:07:28 2024 +0100 +++ b/CMakeLists.txt Mon Jun 24 17:05:20 2024 +0200 @@ -1,9 +1,22 @@ # The following lines of boilerplate have to be in your project's CMakeLists # in this exact order for cmake to work correctly -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) + +#project(brewboard VERSION 0.3.24) + +#find_package(EXPAT 2.6.2 MODULE REQUIRED) + +#add_executable(brewboard +# hello.c +#) + set(PROJECT_VER "0.3.24") set(PROJECT_NAME "brewboard") + +#target_link_libraries(brewboard PUBLIC expat::expat) + +set(EXTRA_COMPONENT_DIRS components/esp32-ds18b20 components/esp32-owb components/PID components/spidriver components/tft components/websocket) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(brewboard)
--- a/components/esp32-owb/CMakeLists.txt Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/CMakeLists.txt Mon Jun 24 17:05:20 2024 +0200 @@ -1,2 +1,12 @@ -idf_component_register(SRCS owb_rmt.c owb.c owb_gpio.c INCLUDE_DIRS include) +if (NOT IDF_VERSION_MAJOR) + set(IDF_VERSION_MAJOR 3) +endif() +if (IDF_VERSION_MAJOR LESS 5) + message(FATAL_ERROR "Can't build: requires ESP-IDF version 5.0 or above.") +endif() + +set(COMPONENT_ADD_INCLUDEDIRS include) +set(COMPONENT_SRCS "owb.c" "owb_gpio.c" "owb_rmt.c") +set(COMPONENT_REQUIRES "soc" "driver" "esp_rom") +register_component()
--- a/components/esp32-owb/README.md Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/README.md Mon Jun 24 17:05:20 2024 +0200 @@ -2,15 +2,20 @@ This is a ESP32-compatible C component for the Maxim Integrated "1-Wire" protocol. -It is written and tested for version 3.0 of the [ESP-IDF](https://github.com/espressif/esp-idf) environment, using the xtensa-esp32-elf toolchain (gcc version 5.2.0, crosstool-ng-1.22.0-80-g6c4433a). +It is written for the `idf.py` target `esp32`, although it may work on other ESP-32 devices with minor modifications. + +It is tested for version 4.4.4 and 5.0.1 of the [ESP-IDF](https://github.com/espressif/esp-idf) environment. -Support for v2.1 is available on the [ESP-IDF_v2.1](https://github.com/DavidAntliff/esp32-owb/tree/ESP-IDF_v2.1) branch. +Legacy support for v2.1 is available on the [ESP-IDF_v2.1](https://github.com/DavidAntliff/esp32-owb/tree/ESP-IDF_v2.1) branch. This is no longer maintained. + +Legacy support for v3.0-v3.3 and v4.1-beta1 is available on the [ESP-IDF_v3.0-3.3_4.1-beta1](https://github.com/DavidAntliff/esp32-owb/tree/ESP-IDF_v3.0-3.3_4.1-beta1) branch. This is no longer maintained. ## Features This library includes: - * External power supply mode (parasitic mode not yet supported). + * External power supply mode. + * Parasitic power mode. * Static (stack-based) or dynamic (malloc-based) memory model. * No globals - support any number of 1-Wire buses simultaneously. * 1-Wire device detection and validation, including search for multiple devices on a single bus. @@ -23,7 +28,10 @@ however this proved to be too unreliable. A second method, using the ESP32's RMT peripheral, results in very accurate read/write timeslots and more reliable operation. -Therefore I highly recommend that you use the RMT driver. The GPIO driver should be considered deprecated. +Therefore I highly recommend that you use the RMT driver. *The GPIO driver is deprecated and will be removed.* + +See documentation for [esp32-ds18b20](https://www.github.com/DavidAntliff/esp32-ds18b20#parasitic-power-mode) +for further information about parasitic power mode, including strong pull-up configuration. ## Documentation @@ -39,16 +47,17 @@ ## Links - * [esp32-ds18b20](https://github.com/DavidAntliff/esp32-ds18b20) - ESP32-compatible DS18B20 Digital Thermometer component for ESP32 + * [esp32-ds18b20](https://github.com/DavidAntliff/esp32-ds18b20) - ESP32-compatible DS18B20 Digital Thermometer + component for ESP32 * [1-Wire Communication Through Software](https://www.maximintegrated.com/en/app-notes/index.mvp/id/126) * [1-Wire Search Algorithm](https://www.maximintegrated.com/en/app-notes/index.mvp/id/187) * [Espressif IoT Development Framework for ESP32](https://github.com/espressif/esp-idf) ## Acknowledgements -Thank you to [Chris Morgan](https://github.com/chmorgan) for his contribution of adding RMT peripheral support for more reliable operation. +Thank you to [Chris Morgan](https://github.com/chmorgan) for his contribution of adding RMT peripheral support for more +reliable operation. Parts of this code are based on references provided to the public domain by Maxim Integrated. "1-Wire" is a registered trademark of Maxim Integrated. -
--- a/components/esp32-owb/doc/Doxyfile Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/doc/Doxyfile Mon Jun 24 17:05:20 2024 +0200 @@ -1072,6 +1072,25 @@ VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -2195,7 +2214,7 @@ # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO -# The default value is: NO. +# The default value is: YES. HAVE_DOT = NO @@ -2351,7 +2370,9 @@ # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). -# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo, +# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, +# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, +# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo, # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and # png:gdiplus:gdiplus. # The default value is: png.
--- a/components/esp32-owb/include/owb.h Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/include/owb.h Mon Jun 24 17:05:20 2024 +0200 @@ -30,7 +30,8 @@ * This component provides structures and functions that are useful for communicating * with devices connected to a Maxim Integrated 1-Wire® bus via a single GPIO. * - * Currently only externally powered devices are supported. Parasitic power is not supported. + * Externally powered and "parasite-powered" devices are supported. + * Please consult your device's datasheet for power requirements. */ #ifndef ONE_WIRE_BUS_H @@ -39,6 +40,7 @@ #include <stdint.h> #include <stdbool.h> #include <stddef.h> +#include "driver/gpio.h" #ifdef __cplusplus extern "C" { @@ -46,14 +48,18 @@ // ROM commands -#define OWB_ROM_SEARCH 0xF0 ///< Command ROM search -#define OWB_ROM_READ 0x33 ///< ROM read -#define OWB_ROM_MATCH 0x55 ///< ROM address match -#define OWB_ROM_SKIP 0xCC ///< Skip device -#define OWB_ROM_SEARCH_ALARM 0xEC ///< Search device with alarm set +#define OWB_ROM_SEARCH 0xF0 ///< Perform Search ROM cycle to identify devices on the bus +#define OWB_ROM_READ 0x33 ///< Read device ROM (single device on bus only) +#define OWB_ROM_MATCH 0x55 ///< Address a specific device on the bus by ROM +#define OWB_ROM_SKIP 0xCC ///< Address all devices on the bus simultaneously +#define OWB_ROM_SEARCH_ALARM 0xEC ///< Address all devices on the bus with a set alarm flag #define OWB_ROM_CODE_STRING_LENGTH (17) ///< Typical length of OneWire bus ROM ID as ASCII hex string, including null terminator +#ifndef GPIO_NUM_NC +# define GPIO_NUM_NC (-1) ///< ESP-IDF prior to v4.x does not define GPIO_NUM_NC +#endif + struct owb_driver; /** @@ -63,8 +69,9 @@ { const struct _OneWireBus_Timing * timing; ///< Pointer to timing information bool use_crc; ///< True if CRC checks are to be used when retrieving information from a device on the bus - - const struct owb_driver *driver; + bool use_parasitic_power; ///< True if parasitic-powered devices are expected on the bus + gpio_num_t strong_pullup_gpio; ///< Set if an external strong pull-up circuit is required + const struct owb_driver * driver; ///< Pointer to hardware driver instance } OneWireBus; /** @@ -94,45 +101,45 @@ */ typedef struct { - OneWireBus_ROMCode rom_code; - int last_discrepancy; - int last_family_discrepancy; - int last_device_flag; + OneWireBus_ROMCode rom_code; ///< Device ROM code + int last_discrepancy; ///< Bit index that identifies from which bit the next search discrepancy check should start + int last_family_discrepancy; ///< Bit index that identifies the last discrepancy within the first 8-bit family code of the ROM code + int last_device_flag; ///< Flag to indicate previous search was the last device detected } OneWireBus_SearchState; /** - * @brief Status codes + * @brief Represents the result of OWB API functions. */ typedef enum { - OWB_STATUS_OK, ///< Ok - OWB_STATUS_NOT_INITIALIZED, ///< Init error - OWB_STATUS_PARAMETER_NULL, ///< NULL parameter - OWB_STATUS_DEVICE_NOT_RESPONDING, ///< Device does not respond - OWB_STATUS_CRC_FAILED, ///< CRC error - OWB_STATUS_TOO_MANY_BITS, ///< Too many bits - OWB_STATUS_HW_ERROR ///< Hardware error + OWB_STATUS_NOT_SET = -1, ///< A status value has not been set + OWB_STATUS_OK = 0, ///< Operation succeeded + OWB_STATUS_NOT_INITIALIZED, ///< Function was passed an uninitialised variable + OWB_STATUS_PARAMETER_NULL, ///< Function was passed a null pointer + OWB_STATUS_DEVICE_NOT_RESPONDING, ///< No response received from the addressed device or devices + OWB_STATUS_CRC_FAILED, ///< CRC failed on data received from a device or devices + OWB_STATUS_TOO_MANY_BITS, ///< Attempt to write an incorrect number of bits to the One Wire Bus + OWB_STATUS_HW_ERROR ///< A hardware error occurred } owb_status; /** NOTE: Driver assumes that (*init) was called prior to any other methods */ struct owb_driver { const char* name; - owb_status (*uninitialize)(const OneWireBus * bus); - - owb_status (*reset)(const OneWireBus * bus, bool *is_present); - - /** NOTE: The data is shifted out of the low bits, eg. it is written in the order of lsb to msb */ + owb_status (*reset)(const OneWireBus *bus, bool *is_present); owb_status (*write_bits)(const OneWireBus *bus, uint8_t out, int number_of_bits_to_write); - - /** NOTE: Data is read into the high bits, eg. each bit read is shifted down before the next bit is read */ + owb_status (*write_bytes)(const OneWireBus *bus, uint8_t *bytes, int number_of_bytes_to_write); owb_status (*read_bits)(const OneWireBus *bus, uint8_t *in, int number_of_bits_to_read); + owb_status (*read_bytes)(const OneWireBus *bus, uint64_t *in, int number_of_bytes_to_read); }; +/// @cond ignore +// note: the new owb_rmt driver uses the ESP-IDF's built-in `__containerof()` macro instead of this #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +/// @endcond /** * @brief call to release resources after completing use of the OneWireBus @@ -150,29 +157,82 @@ owb_status owb_use_crc(OneWireBus * bus, bool use_crc); /** + * @brief Enable or disable use of parasitic power on the One Wire Bus. + * This affects how devices signal on the bus, as devices cannot + * signal by pulling the bus low when it is pulled high. + * @param[in] bus Pointer to initialised bus instance. + * @param[in] use_parasitic_power True to enable parasitic power, false to disable. + * @return status + */ +owb_status owb_use_parasitic_power(OneWireBus * bus, bool use_parasitic_power); + +/** + * @brief Enable or disable use of extra GPIO to activate strong pull-up circuit. + * This only has effect if parasitic power mode is enabled. + * signal by pulling the bus low when it is pulled high. + * @param[in] bus Pointer to initialised bus instance. + * @param[in] gpio Set to GPIO number to use, or GPIO_NUM_NC to disable. + * @return status + */ +owb_status owb_use_strong_pullup_gpio(OneWireBus * bus, gpio_num_t gpio); + +/** * @brief Read ROM code from device - only works when there is a single device on the bus. * @param[in] bus Pointer to initialised bus instance. * @param[out] rom_code the value read from the device's rom * @return status */ -owb_status owb_read_rom(const OneWireBus * bus, OneWireBus_ROMCode *rom_code); +owb_status owb_read_rom(const OneWireBus * bus, OneWireBus_ROMCode * rom_code); /** * @brief Verify the device specified by ROM code is present. * @param[in] bus Pointer to initialised bus instance. * @param[in] rom_code ROM code to verify. - * @param[out] is_present set to true if a device is present, false if not + * @param[out] is_present Set to true if a device is present, false if not * @return status */ -owb_status owb_verify_rom(const OneWireBus * bus, OneWireBus_ROMCode rom_code, bool* is_present); +owb_status owb_verify_rom(const OneWireBus * bus, OneWireBus_ROMCode rom_code, bool * is_present); /** * @brief Reset the 1-Wire bus. * @param[in] bus Pointer to initialised bus instance. - * @param[out] a_device_present set to true if at least one device is present on the bus + * @param[out] is_present set to true if at least one device is present on the bus + * @return status + */ +owb_status owb_reset(const OneWireBus * bus, bool * is_present); + +/** + * @brief Read a single bit from the 1-Wire bus. + * @param[in] bus Pointer to initialised bus instance. + * @param[out] out The bit value read from the bus. + * @return status + */ +owb_status owb_read_bit(const OneWireBus * bus, uint8_t * out); + +/** + * @brief Read a single byte from the 1-Wire bus. + * @param[in] bus Pointer to initialised bus instance. + * @param[out] out The byte value read from the bus (lsb only). * @return status */ -owb_status owb_reset(const OneWireBus * bus, bool* a_device_present); +owb_status owb_read_byte(const OneWireBus * bus, uint8_t * out); + +/** + * @brief Read a number of bytes from the 1-Wire bus. + * @param[in] bus Pointer to initialised bus instance. + * @param[in, out] buffer Pointer to buffer to receive read data. + * @param[in] len Number of bytes to read, must not exceed length of receive buffer. + * @return status. + */ +owb_status owb_read_bytes(const OneWireBus * bus, uint8_t * buffer, unsigned int len); + +/** + * @brief Write a bit to the 1-Wire bus. + * @param[in] bus Pointer to initialised bus instance. + * @param[in] bit Value to write (lsb only). + * @return status + */ +owb_status owb_write_bit(const OneWireBus * bus, uint8_t bit); /** * @brief Write a single byte to the 1-Wire bus. @@ -183,23 +243,6 @@ owb_status owb_write_byte(const OneWireBus * bus, uint8_t data); /** - * @brief Read a single byte from the 1-Wire bus. - * @param[in] bus Pointer to initialised bus instance. - * @param[out] out The byte value read from the bus. - * @return status - */ -owb_status owb_read_byte(const OneWireBus * bus, uint8_t *out); - -/** - * @brief Read a number of bytes from the 1-Wire bus. - * @param[in] bus Pointer to initialised bus instance. - * @param[in, out] buffer Pointer to buffer to receive read data. - * @param[in] len Number of bytes to read, must not exceed length of receive buffer. - * @return status. - */ -owb_status owb_read_bytes(const OneWireBus * bus, uint8_t * buffer, size_t len); - -/** * @brief Write a number of bytes to the 1-Wire bus. * @param[in] bus Pointer to initialised bus instance. * @param[in] buffer Pointer to buffer to write data from. @@ -267,6 +310,16 @@ */ char * owb_string_from_rom_code(OneWireBus_ROMCode rom_code, char * buffer, size_t len); +/** + * @brief Enable or disable the strong-pullup GPIO, if configured. + * @param[in] bus Pointer to initialised bus instance. + * @param[in] enable If true, enable the external strong pull-up by setting the GPIO high. + * If false, disable the external strong pull-up by setting the GPIO low. + * @return status + */ +owb_status owb_set_strong_pullup(const OneWireBus * bus, bool enable); + + #include "owb_gpio.h" #include "owb_rmt.h"
--- a/components/esp32-owb/include/owb_gpio.h Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/include/owb_gpio.h Mon Jun 24 17:05:20 2024 +0200 @@ -23,6 +23,16 @@ * SOFTWARE. */ +/** + * @file + * @brief Interface definitions for the ESP32 GPIO driver used to communicate with devices + * on the One Wire Bus. + * + * @deprecated + * This driver is deprecated and may be removed at some stage. It is not recommended for use + * due to issues with imprecise timing. + */ + #pragma once #ifndef OWB_GPIO_H #define OWB_GPIO_H @@ -34,7 +44,7 @@ #endif /** - * @brief 1-wire bus connection on the gpio. + * @brief GPIO driver information */ typedef struct {
--- a/components/esp32-owb/include/owb_rmt.h Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/include/owb_rmt.h Mon Jun 24 17:05:20 2024 +0200 @@ -23,34 +23,79 @@ * SOFTWARE. */ +/** + * @file + * @brief Interface definitions for ESP32 RMT driver used to communicate with devices + * on the One Wire Bus. + * + * This is the recommended driver. + */ + #pragma once #ifndef OWB_RMT_H #define OWB_RMT_H #include "freertos/FreeRTOS.h" #include "freertos/queue.h" -#include "freertos/ringbuf.h" -#include "driver/rmt.h" + +#include "driver/rmt_tx.h" +#include "driver/rmt_rx.h" + +#include "owb.h" // for tyoe OneWireBus #ifdef __cplusplus extern "C" { #endif +/** + * @brief RMT driver information + */ typedef struct { - int tx_channel; ///< RMT channel to use for TX - int rx_channel; ///< RMT channel to use for RX - RingbufHandle_t rb; ///< Ring buffer handle - int gpio; ///< OneWireBus GPIO - OneWireBus bus; ///< OneWireBus instance + rmt_channel_handle_t tx_channel_handle; ///< RMT transmit channel, allocated by RMT driver + rmt_channel_handle_t rx_channel_handle; ///< RMT receive channel, allocated by RMT driver + rmt_encoder_handle_t copy_encoder_handle; ///< RMT built-in data encoder that sends pre-defined symbols + rmt_encoder_handle_t bytes_encoder_handle; ///< RMT built-in data encoder that converts bits into symbols + rmt_symbol_word_t *rx_buffer; ///< RMT receive channel symbol buffer + size_t rx_buffer_size_in_bytes; ///< Size of the RMT received buffer, in bytes + QueueHandle_t rx_queue; ///< xQueue to receive RMT symbols from the `on_recv_done` callback + int gpio; ///< OneWireBus GPIO + OneWireBus bus; ///< OneWireBus instance (see owb.h) } owb_rmt_driver_info; /** * @brief Initialise the RMT driver. - * @return OneWireBus*, pass this into the other OneWireBus public API functions + * @param[in] info Pointer to an uninitialized owb_rmt_driver_info structure. + * Note: the structure must remain in scope for the lifetime of this component. + * @param[in] gpio_num The GPIO number to use as the One Wire bus data line. + * @param tx_channel NOW IGNORED: the new RMT driver allocates channels dynamically. + * @param rx_channel NOW IGNORED: the new RMT driver allocates channels dynamically. + * @return OneWireBus *, pass this into the other OneWireBus public API functions */ -OneWireBus* owb_rmt_initialize(owb_rmt_driver_info *info, uint8_t gpio_num, - rmt_channel_t tx_channel, rmt_channel_t rx_channel); +OneWireBus* owb_rmt_initialize(owb_rmt_driver_info * info, gpio_num_t gpio_num, + /*rmt_channel_t*/ int tx_channel, /* rmt_channel_t*/ int rx_channel); + + +/** + * @brief Legacy RMT channel IDs. + * + * These are no longer used for anything. They are defined here purely so + * that code written for the old rmt driver can still compile. + */ +typedef enum { + RMT_CHANNEL_0, /*!< RMT channel number 0 */ + RMT_CHANNEL_1, /*!< RMT channel number 1 */ + RMT_CHANNEL_2, /*!< RMT channel number 2 */ + RMT_CHANNEL_3, /*!< RMT channel number 3 */ +#if SOC_RMT_CHANNELS_PER_GROUP > 4 + RMT_CHANNEL_4, /*!< RMT channel number 4 */ + RMT_CHANNEL_5, /*!< RMT channel number 5 */ + RMT_CHANNEL_6, /*!< RMT channel number 6 */ + RMT_CHANNEL_7, /*!< RMT channel number 7 */ +#endif + RMT_CHANNEL_MAX /*!< Number of RMT channels */ +} rmt_channel_t; + #ifdef __cplusplus }
--- a/components/esp32-owb/owb.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/owb.c Mon Jun 24 17:05:20 2024 +0200 @@ -38,6 +38,7 @@ #include "esp_log.h" #include "sdkconfig.h" #include "driver/gpio.h" +#include "rom/gpio.h" // for gpio_pad_select_gpio() #include "owb.h" #include "owb_gpio.h" @@ -102,7 +103,7 @@ do { crc = _calc_crc(crc, *buffer++); - ESP_LOGD(TAG, "crc 0x%02x, len %d", (int)crc, (int)len); + ESP_LOGD(TAG, "buffer 0x%02x, crc 0x%02x, len %d", (uint8_t)*(buffer - 1), (int)crc, (int)len); } while (--len > 0); return crc; @@ -112,7 +113,7 @@ * @param[out] is_found true if a device was found, false if not * @return status */ -static owb_status _search(const OneWireBus * bus, OneWireBus_SearchState * state, bool *is_found) +static owb_status _search(const OneWireBus * bus, OneWireBus_SearchState * state, bool * is_found) { // Based on https://www.maximintegrated.com/en/app-notes/index.mvp/id/187 @@ -126,7 +127,7 @@ uint8_t search_direction = 0; bool search_result = false; uint8_t crc8 = 0; - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; // if the last call was not the last one if (!state->last_device_flag) @@ -160,21 +161,27 @@ if (id_bit && cmp_id_bit) { break; - } else + } + else { // all devices coupled have 0 or 1 if (id_bit != cmp_id_bit) { search_direction = (id_bit) ? 1 : 0; // bit write value for search - } else + } + else { // if this discrepancy if before the Last Discrepancy // on a previous next then pick the same as last time if (id_bit_number < state->last_discrepancy) + { search_direction = ((state->rom_code.bytes[rom_byte_number] & rom_byte_mask) > 0); + } else + { // if equal to last pick 1, if not then pick 0 search_direction = (id_bit_number == state->last_discrepancy); + } // if 0 was picked then record its position in LastZero if (search_direction == 0) @@ -183,16 +190,22 @@ // check for Last discrepancy in family if (last_zero < 9) + { state->last_family_discrepancy = last_zero; + } } } // set or clear the bit in the ROM byte rom_byte_number // with mask rom_byte_mask if (search_direction == 1) + { state->rom_code.bytes[rom_byte_number] |= rom_byte_mask; + } else + { state->rom_code.bytes[rom_byte_number] &= ~rom_byte_mask; + } // serial number search direction write bit bus->driver->write_bits(bus, search_direction, 1); @@ -211,7 +224,7 @@ } } } - while(rom_byte_number < 8); // loop until through all ROM bytes 0-7 + while (rom_byte_number < 8); // loop until through all ROM bytes 0-7 // if the search was successful then if (!((id_bit_number < 65) || (crc8 != 0))) @@ -221,7 +234,9 @@ // check for last device if (state->last_discrepancy == 0) + { state->last_device_flag = true; + } search_result = true; } @@ -247,12 +262,13 @@ owb_status owb_uninitialize(OneWireBus * bus) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!_is_init(bus)) + if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { bus->driver->uninitialize(bus); status = OWB_STATUS_OK; @@ -263,15 +279,17 @@ owb_status owb_use_crc(OneWireBus * bus, bool use_crc) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus) + if (!bus) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { bus->use_crc = use_crc; ESP_LOGD(TAG, "use_crc %d", bus->use_crc); @@ -282,19 +300,81 @@ return status; } +owb_status owb_use_parasitic_power(OneWireBus * bus, bool use_parasitic_power) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + bus->use_parasitic_power = use_parasitic_power; + ESP_LOGD(TAG, "use_parasitic_power %d", bus->use_parasitic_power); + + status = OWB_STATUS_OK; + } + + return status; +} + +owb_status owb_use_strong_pullup_gpio(OneWireBus * bus, gpio_num_t gpio) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + if (gpio != GPIO_NUM_NC) { + // The strong GPIO pull-up is only activated if parasitic-power mode is enabled + if (!bus->use_parasitic_power) { + ESP_LOGW(TAG, "Strong pull-up GPIO set with parasitic-power disabled"); + } + + gpio_pad_select_gpio(gpio); + gpio_set_direction(gpio, GPIO_MODE_OUTPUT); + } + else + { + gpio_reset_pin(bus->strong_pullup_gpio); + } + + bus->strong_pullup_gpio = gpio; + ESP_LOGD(TAG, "use_strong_pullup_gpio %d", bus->strong_pullup_gpio); + + status = OWB_STATUS_OK; + } + + return status; +} + owb_status owb_read_rom(const OneWireBus * bus, OneWireBus_ROMCode *rom_code) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; memset(rom_code, 0, sizeof(OneWireBus_ROMCode)); - if(!bus || !rom_code) + if (!bus || !rom_code) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { bool is_present; bus->driver->reset(bus, &is_present); @@ -311,11 +391,13 @@ ESP_LOGE(TAG, "CRC failed"); memset(rom_code->bytes, 0, sizeof(OneWireBus_ROMCode)); status = OWB_STATUS_CRC_FAILED; - } else + } + else { status = OWB_STATUS_OK; } - } else + } + else { status = OWB_STATUS_OK; } @@ -326,16 +408,16 @@ else { status = OWB_STATUS_DEVICE_NOT_RESPONDING; - ESP_LOGE(TAG, "ds18b20 no response"); + ESP_LOGE(TAG, "ds18b20 device not responding"); } } return status; } -owb_status owb_verify_rom(const OneWireBus * bus, OneWireBus_ROMCode rom_code, bool* is_present) +owb_status owb_verify_rom(const OneWireBus * bus, OneWireBus_ROMCode rom_code, bool * is_present) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; bool result = false; if (!bus || !is_present) @@ -349,25 +431,25 @@ else { OneWireBus_SearchState state = { + .rom_code = rom_code, .last_discrepancy = 64, .last_device_flag = false, }; bool is_found = false; - while (!state.last_device_flag && !is_found) + _search(bus, &state, &is_found); + if (is_found) { - _search(bus, &state, &is_found); - if (is_found) + result = true; + for (int i = 0; i < sizeof(state.rom_code.bytes) && result; ++i) { - result = true; - for (int i = 0; i < sizeof(state.rom_code.bytes) && result; ++i) - { - result = rom_code.bytes[i] == state.rom_code.bytes[i]; - ESP_LOGD(TAG, "%02x %02x", rom_code.bytes[i], state.rom_code.bytes[i]); - } - is_found = result; + result = rom_code.bytes[i] == state.rom_code.bytes[i]; + ESP_LOGD(TAG, "%02x %02x", rom_code.bytes[i], state.rom_code.bytes[i]); } + is_found = result; } + ESP_LOGD(TAG, "state.last_discrepancy %d, state.last_device_flag %d, is_found %d", + state.last_discrepancy, state.last_device_flag, is_found); ESP_LOGD(TAG, "rom code %sfound", result ? "" : "not "); *is_present = result; @@ -377,19 +459,116 @@ return status; } -owb_status owb_reset(const OneWireBus * bus, bool* a_device_present) +owb_status owb_reset(const OneWireBus * bus, bool * a_device_present) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus || !a_device_present) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if(!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + status = bus->driver->reset(bus, a_device_present); + } + + return status; +} + +owb_status owb_read_bit(const OneWireBus * bus, uint8_t * out) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus || !a_device_present) + if (!bus || !out) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + bus->driver->read_bits(bus, out, 1); + ESP_LOGD(TAG, "owb_read_bit: %02x", *out); + status = OWB_STATUS_OK; + } + + return status; +} + +owb_status owb_read_byte(const OneWireBus * bus, uint8_t * out) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus || !out) { status = OWB_STATUS_PARAMETER_NULL; - } else if(!_is_init(bus)) + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + bus->driver->read_bits(bus, out, 8); + ESP_LOGD(TAG, "owb_read_byte: %02x", *out); + status = OWB_STATUS_OK; + } + + return status; +} + +owb_status owb_read_bytes(const OneWireBus * bus, uint8_t * buffer, unsigned int len) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus || !buffer) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { - bus->driver->reset(bus, a_device_present); + for (int i = 0; i < len; ++i) + { + uint8_t out; + bus->driver->read_bits(bus, &out, 8); + buffer[i] = out; + } + + ESP_LOGD(TAG, "owb_read_bytes, len %d:", len); + ESP_LOG_BUFFER_HEX_LEVEL(TAG, buffer, len, ESP_LOG_DEBUG); + + status = OWB_STATUS_OK; + } + + return status; +} + +owb_status owb_write_bit(const OneWireBus * bus, const uint8_t bit) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + ESP_LOGD(TAG, "owb_write_bit: %02x", bit); + bus->driver->write_bits(bus, bit & 0x01u, 1); status = OWB_STATUS_OK; } @@ -398,16 +577,19 @@ owb_status owb_write_byte(const OneWireBus * bus, uint8_t data) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus) + if (!bus) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { + ESP_LOGD(TAG, "owb_write_byte: %02x", data); bus->driver->write_bits(bus, data, 8); status = OWB_STATUS_OK; } @@ -415,62 +597,23 @@ return status; } -owb_status owb_read_byte(const OneWireBus * bus, uint8_t *out) +owb_status owb_write_bytes(const OneWireBus * bus, const uint8_t * buffer, size_t len) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus || !out) - { - status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) - { - status = OWB_STATUS_NOT_INITIALIZED; - } else - { - bus->driver->read_bits(bus, out, 8); - status = OWB_STATUS_OK; - } - - return status; -} - -owb_status owb_read_bytes(const OneWireBus * bus, uint8_t * buffer, unsigned int len) -{ - owb_status status; - - if(!bus || !buffer) + if (!bus || !buffer) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { - for (int i = 0; i < len; ++i) - { - uint8_t out; - bus->driver->read_bits(bus, &out, 8); - buffer[i] = out; - } - - status = OWB_STATUS_OK; - } + ESP_LOGD(TAG, "owb_write_bytes, len %d:", len); + ESP_LOG_BUFFER_HEX_LEVEL(TAG, buffer, len, ESP_LOG_DEBUG); - return status; -} - -owb_status owb_write_bytes(const OneWireBus * bus, const uint8_t * buffer, unsigned int len) -{ - owb_status status; - - if(!bus || !buffer) - { - status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) - { - status = OWB_STATUS_NOT_INITIALIZED; - } else - { for (int i = 0; i < len; i++) { bus->driver->write_bits(bus, buffer[i], 8); @@ -484,15 +627,17 @@ owb_status owb_write_rom_code(const OneWireBus * bus, OneWireBus_ROMCode rom_code) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus) + if (!bus) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { owb_write_bytes(bus, (uint8_t*)&rom_code, sizeof(rom_code)); status = OWB_STATUS_OK; @@ -511,18 +656,20 @@ return _calc_crc_block(crc, data, len); } -owb_status owb_search_first(const OneWireBus * bus, OneWireBus_SearchState * state, bool* found_device) +owb_status owb_search_first(const OneWireBus * bus, OneWireBus_SearchState * state, bool * found_device) { bool result; - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; - if(!bus || !state || !found_device) + if (!bus || !state || !found_device) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { memset(&state->rom_code, 0, sizeof(state->rom_code)); state->last_discrepancy = 0; @@ -537,18 +684,20 @@ return status; } -owb_status owb_search_next(const OneWireBus * bus, OneWireBus_SearchState * state, bool* found_device) +owb_status owb_search_next(const OneWireBus * bus, OneWireBus_SearchState * state, bool * found_device) { - owb_status status; + owb_status status = OWB_STATUS_NOT_SET; bool result = false; - if(!bus || !state || !found_device) + if (!bus || !state || !found_device) { status = OWB_STATUS_PARAMETER_NULL; - } else if (!_is_init(bus)) + } + else if (!_is_init(bus)) { status = OWB_STATUS_NOT_INITIALIZED; - } else + } + else { _search(bus, state, &result); status = OWB_STATUS_OK; @@ -568,3 +717,29 @@ } return buffer; } + +owb_status owb_set_strong_pullup(const OneWireBus * bus, bool enable) +{ + owb_status status = OWB_STATUS_NOT_SET; + + if (!bus) + { + status = OWB_STATUS_PARAMETER_NULL; + } + else if (!_is_init(bus)) + { + status = OWB_STATUS_NOT_INITIALIZED; + } + else + { + if (bus->use_parasitic_power && bus->strong_pullup_gpio != GPIO_NUM_NC) + { + gpio_set_level(bus->strong_pullup_gpio, enable ? 1 : 0); + ESP_LOGD(TAG, "strong pullup GPIO %d", enable); + } // else ignore + + status = OWB_STATUS_OK; + } + + return status; +}
--- a/components/esp32-owb/owb_gpio.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/owb_gpio.c Mon Jun 24 17:05:20 2024 +0200 @@ -38,6 +38,8 @@ #include "esp_log.h" #include "sdkconfig.h" #include "driver/gpio.h" +#include "rom/ets_sys.h" // for ets_delay_us() +#include "rom/gpio.h" // for gpio_pad_select_gpio() #include "owb.h" #include "owb_gpio.h" @@ -63,7 +65,7 @@ { uint32_t A, B, C, D, E, F, G, H, I, J; }; -//// @endcond +/// @endcond // 1-Wire timing delays (standard) in microseconds. // Labels and values are from https://www.maximintegrated.com/en/app-notes/index.mvp/id/126 @@ -85,7 +87,9 @@ ets_delay_us(time_us); } +/// @cond ignore #define info_from_bus(owb) container_of(owb, owb_gpio_driver_info, bus) +/// @endcond /** * @brief Generate a 1-Wire reset (initialization). @@ -259,13 +263,14 @@ .read_bits = _read_bits }; -OneWireBus* owb_gpio_initialize(owb_gpio_driver_info *driver_info, int gpio) +OneWireBus* owb_gpio_initialize(owb_gpio_driver_info * driver_info, int gpio) { - ESP_LOGI(TAG, "%s(): gpio %d\n", __func__, gpio); + ESP_LOGD(TAG, "%s(): gpio %d\n", __func__, gpio); driver_info->gpio = gpio; driver_info->bus.driver = &gpio_function_table; driver_info->bus.timing = &_StandardTiming; + driver_info->bus.strong_pullup_gpio = GPIO_NUM_NC; // platform specific: gpio_pad_select_gpio(driver_info->gpio);
--- a/components/esp32-owb/owb_rmt.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/esp32-owb/owb_rmt.c Mon Jun 24 17:05:20 2024 +0200 @@ -1,463 +1,665 @@ -/* -Created by Chris Morgan based on the nodemcu project driver. -Copyright 2017 Chris Morgan <chmorgan@gmail.com> - -Ported to ESP32 RMT peripheral for low-level signal generation by Arnim Laeuger. - -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. - -Much of the code was inspired by Derek Yerger's code, though I don't -think much of that remains. In any event that was.. - (copyleft) 2006 by Derek Yerger - Free to distribute freely. +/** + * Copyright (c) 2023 mjcross + * + * SPDX-License-Identifier: MIT +**/ -The CRC code was excerpted and inspired by the Dallas Semiconductor -sample code bearing this copyright. -//--------------------------------------------------------------------------- -// Copyright (C) 2000 Dallas Semiconductor Corporation, All Rights Reserved. -// -// 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 DALLAS SEMICONDUCTOR 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. -// -// Except as contained in this notice, the name of Dallas Semiconductor -// shall not be used except as stated in the Dallas Semiconductor -// Branding Policy. -//-------------------------------------------------------------------------- -*/ +#include "esp_log.h" +#include "driver/rmt_tx.h" +#include "driver/rmt_rx.h" #include "owb.h" +#include "owb_rmt_bus_timings.h" +#include "owb_rmt_bus_symbols.h" -#include "driver/rmt.h" -#include "driver/gpio.h" -#include "esp_log.h" +#define OWB_RMT_CLK_HZ 1000000 // run the RMT at 1MHz to get 1us ticks +#define OWB_RMT_TX_MEM_BLOCK_SYMBOLS 64 // size of TX memory block in units of rmt_symbol_word_t (must be even) +#define OWB_RMT_TX_QUEUE_DEPTH 4 // max pending TX transfers +#define OWB_RMT_MAX_READ_BITS 64 // maximum number of bits that will be read at once (used to calculate buffer size) +#define OWB_RMT_RX_MEM_BLOCK_SYMBOLS (OWB_RMT_MAX_READ_BITS + 2) // size of RX memory block in units of rmt_symbol_word_t (must be even) +#define OWB_RMT_RX_MIN_NS 1000 // RMT receive channel glitch rejection threshold (ns) +#define OWB_RMT_TIMEOUT_MS 1000 // timeout threshold for an RMT task (ms) +#define OWB_TIMING_MARGIN 3 // timing variation permitted by our event parsing functions (in microsec) + +// debug parsing of RMT raw symbols +//#define OWB_RMT_DEBUG + +// tag for log messages +static const char * TAG = "owb_rmt"; + + +//------ +// private API functions and constants +//------ -#undef OW_DEBUG +// onewire bus symbols as rmt_symbol_word_t +static const rmt_symbol_word_t owb_rmt_symbol_0bit = OWB_RMT_SYMBOL_0BIT; +static const rmt_symbol_word_t owb_rmt_symbol_1bit = OWB_RMT_SYMBOL_1BIT; +static const rmt_symbol_word_t owb_rmt_symbol_reset = OWB_RMT_SYMBOL_RESET; + +// RMT transmit configuration for the OWB: transmit symbols once then release the bus +static const rmt_transmit_config_t owb_rmt_transmit_config = { + .loop_count = 0, // don't send any repeats + .flags = { + .eot_level = OWB_RMT_BUS_RELEASED // release the bus after the transmission + } +}; + +// RMT receiver configuration for a onewire reset pulse +static const rmt_receive_config_t rx_config_owb_reset = { + .signal_range_min_ns = OWB_RMT_RX_MIN_NS, // glitch rejection threshold (ns) + .signal_range_max_ns = (OWB_TIMING_PARAM_H + OWB_TIMING_PARAM_I) * 1000 // stop condition (ns) +}; + +// RMT receiver configuration for a sequence of onewire data bits +static const rmt_receive_config_t rx_config_owb_bits = { + .signal_range_min_ns = OWB_RMT_RX_MIN_NS, // glitch rejection threshold (ns) + .signal_range_max_ns = (OWB_TIMING_PARAM_A + OWB_TIMING_PARAM_B) * 1000 // stop condition (ns) +}; -// bus reset: duration of low phase [us] -#define OW_DURATION_RESET 480 -// overall slot duration -#define OW_DURATION_SLOT 75 -// write 1 slot and read slot durations [us] -#define OW_DURATION_1_LOW 2 -#define OW_DURATION_1_HIGH (OW_DURATION_SLOT - OW_DURATION_1_LOW) -// write 0 slot durations [us] -#define OW_DURATION_0_LOW 65 -#define OW_DURATION_0_HIGH (OW_DURATION_SLOT - OW_DURATION_0_LOW) -// sample time for read slot -#define OW_DURATION_SAMPLE (15-2) -// RX idle threshold -// needs to be larger than any duration occurring during write slots -#define OW_DURATION_RX_IDLE (OW_DURATION_SLOT + 2) +/** + * @brief Uninstalls a onewire bus driver and releases the associated resources. + * @param bus A previously-initialised OneWireBus. + * @return owb_status OWB_STATUS_OK on success, otherwise an error code (see owb.h) + */ +static owb_status _uninitialize(const OneWireBus *bus) { + + // fetch the parent `owb_rmt_driver_info` structure for `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); // (pointer, type, member) + if (info == NULL) { + ESP_LOGE(TAG, "err uninitialize: no bus container"); + return OWB_STATUS_PARAMETER_NULL; + } + + // release RMT device symbol buffer and queue + free (info->rx_buffer); + vQueueDelete (info->rx_queue); + + // disable and release RMT resources + if (rmt_disable (info->rx_channel_handle) == ESP_OK && + rmt_del_channel (info->rx_channel_handle) == ESP_OK && + rmt_disable (info->tx_channel_handle) == ESP_OK && + rmt_del_channel (info->tx_channel_handle) == ESP_OK && + rmt_del_encoder (info->copy_encoder_handle) == ESP_OK && + rmt_del_encoder (info->bytes_encoder_handle) == ESP_OK ) { + // all resources successfully released + return OWB_STATUS_OK; + } + + // an error occurred + ESP_LOGE(TAG, "err uninitializing"); + return OWB_STATUS_HW_ERROR; +} -static const char * TAG = "owb_rmt"; +/** + * @brief Parses the RMT symbols received during a onewire bus reset. + * @param[in] num_symbols The number of symbols passed. + * @param[in] symbols An array of RMT symbols. + * @param[out] slave_is_present Whether a slave presence signal was detected. + * @return OWB_STATUS_OK if the symbols pass basic valdation; otherwise an error code (see owb.h). + */ +static owb_status _parse_reset_symbols (size_t num_symbols, rmt_symbol_word_t *symbols, bool *slave_is_present) { + *slave_is_present = false; -#define info_of_driver(owb) container_of(owb, owb_rmt_driver_info, bus) + if (num_symbols == 0 || symbols == NULL) { + return OWB_STATUS_PARAMETER_NULL; + } + + #ifdef OWB_RMT_DEBUG + // display raw RMT symbols + ESP_LOGI(TAG, "parse reset: %d symbols", (int)num_symbols); + for (int i = 0; i < num_symbols; i += 1) { + ESP_LOGI (TAG, "\t%u (%uus), %u (%uus)", symbols->level0, symbols->duration0, + symbols->level1, symbols->duration1); + } + #endif -// flush any pending/spurious traces from the RX channel -static void onewire_flush_rmt_rx_buf(const OneWireBus * bus) -{ - void *p; - size_t s; + // check the duration of the reset pulse + if (abs (symbols[0].duration0 - OWB_TIMING_PARAM_H) > OWB_TIMING_MARGIN) { + return OWB_STATUS_HW_ERROR; + } + + // check for a valid 'no slave' event + if (num_symbols == 1 && symbols[0].duration1 == 0) { + *slave_is_present = false; + return OWB_STATUS_OK; + } - owb_rmt_driver_info *i = info_of_driver(bus); + // check for a valid 'slave present' event + if (num_symbols == 2 && // no 'extra' symbols after the presence pulse + symbols[0].duration1 < OWB_TIMING_PARAM_I && // presence pulse must arrive before the sample point + (symbols[1].duration0 + symbols[0].duration1) >= OWB_TIMING_PARAM_I // presence pulse must not finish before the sample point + ) { + *slave_is_present = true; + return OWB_STATUS_OK; + } - while ((p = xRingbufferReceive(i->rb, &s, 0))) - { - ESP_LOGD(TAG, "flushing entry"); - vRingbufferReturnItem(i->rb, p); - } + // anything else is invalid + return OWB_STATUS_HW_ERROR; } -static owb_status _reset(const OneWireBus *bus, bool *is_present) -{ - rmt_item32_t tx_items[1]; - bool _is_present = false; - int res = OWB_STATUS_OK; - owb_rmt_driver_info *i = info_of_driver(bus); - - tx_items[0].duration0 = OW_DURATION_RESET; - tx_items[0].level0 = 0; - tx_items[0].duration1 = 0; - tx_items[0].level1 = 1; +/** + * @brief Parses the RMT symbols received during the transmission of up to 64 onewire bits. + * @param[in] num_symbols The number of symbols passed. + * @param[in] symbols An array of RMT symbols. + * @param[out] result The decoded bits (max 64, lsb first) + * @return int The number of bits decoded + */ +static int _parse_bit_symbols (size_t num_symbols, rmt_symbol_word_t *p_symbol, uint64_t *result) { + *result = 0; + int bit_count = 0; + rmt_symbol_word_t *p_last_symbol = p_symbol + num_symbols; - uint16_t old_rx_thresh; - rmt_get_rx_idle_thresh(i->rx_channel, &old_rx_thresh); - rmt_set_rx_idle_thresh(i->rx_channel, OW_DURATION_RESET+60); + #ifdef OWB_RMT_DEBUG + // display raw RMT symbols + ESP_LOGI(TAG, "parse bits: %d symbols", (int)num_symbols); + #endif - onewire_flush_rmt_rx_buf(bus); - rmt_rx_start(i->rx_channel, true); - if (rmt_write_items(i->tx_channel, tx_items, 1, true) == ESP_OK) - { - size_t rx_size; - rmt_item32_t* rx_items = (rmt_item32_t *)xRingbufferReceive(i->rb, &rx_size, 100 / portTICK_PERIOD_MS); + while (p_symbol < p_last_symbol && bit_count < 64) { + #ifdef OWB_RMT_DEBUG + ESP_LOGI (TAG, "\t%u (%uus), %u (%uus)", p_symbol->level0, p_symbol->duration0, + p_symbol->level1, p_symbol->duration1); + #endif + if (abs (p_symbol->duration0 - OWB_TIMING_PARAM_A) <= OWB_TIMING_MARGIN && + (p_symbol->duration1 == 0 || p_symbol->duration1 >= OWB_TIMING_PARAM_E)) { + // bus was released at the sample point: detect a '1' + *result |= (1ull << bit_count); + bit_count += 1; - if (rx_items) - { - if (rx_size >= (1 * sizeof(rmt_item32_t))) - { -#ifdef OW_DEBUG - ESP_LOGI(TAG, "rx_size: %d", rx_size); + #ifdef OWB_RMT_DEBUG + ESP_LOGI (TAG, "\t\tdetect '1' -> 0x%llx", *result); + #endif - for (int i = 0; i < (rx_size / sizeof(rmt_item32_t)); i++) - { - ESP_LOGI(TAG, "i: %d, level0: %d, duration %d", i, rx_items[i].level0, rx_items[i].duration0); - ESP_LOGI(TAG, "i: %d, level1: %d, duration %d", i, rx_items[i].level1, rx_items[i].duration1); - } -#endif + } else if (p_symbol->duration0 >= (OWB_TIMING_PARAM_A + OWB_TIMING_PARAM_E)) { + // bus was asserted at the sample point: detect a '0' + bit_count += 1; + + #ifdef OWB_RMT_DEBUG + ESP_LOGI (TAG, "\t\tdetect '0' -> 0x%llx", *result); + #endif + } + p_symbol += 1; // next symbol + } + + return bit_count; +} + - // parse signal and search for presence pulse - if ((rx_items[0].level0 == 0) && (rx_items[0].duration0 >= OW_DURATION_RESET - 2)) - { - if ((rx_items[0].level1 == 1) && (rx_items[0].duration1 > 0)) - { - if (rx_items[1].level0 == 0) - { - _is_present = true; - } - } - } - } +/** + * @brief Sends a onewire bus reset pulse and listens for slave presence responses. + * @param[in] bus Points to the OneWireBus structure (see owb.h). + * @param[out] is_present Points to a bool that will receive the detection result. + * @return OWB_STATUS_OK if the call succeeded; otherwise an owb_status error code (see owb.h). + */ +static owb_status _reset (const OneWireBus *bus, bool *is_present) { + + esp_err_t esp_status; - vRingbufferReturnItem(i->rb, (void *)rx_items); - } - else - { - // time out occurred, this indicates an unconnected / misconfigured bus - ESP_LOGE(TAG, "rx_items == 0"); - res = OWB_STATUS_HW_ERROR; - } - } - else - { - // error in tx channel - ESP_LOGE(TAG, "Error tx"); - res = OWB_STATUS_HW_ERROR; + // identify the rmt_driver_info structure that contains `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); + + // start the receiver before the transmitter so that it sees the leading edge of the pulse + esp_status = rmt_receive ( + info->rx_channel_handle, + info->rx_buffer, + info->rx_buffer_size_in_bytes, + &rx_config_owb_reset); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_reset: rx err"); + return OWB_STATUS_HW_ERROR; } - rmt_rx_stop(i->rx_channel); - rmt_set_rx_idle_thresh(i->rx_channel, old_rx_thresh); + // encode and transmit the reset pulse using the RMT 'copy' encoder + esp_status = rmt_transmit ( + info->tx_channel_handle, + info->copy_encoder_handle, + &owb_rmt_symbol_reset, + sizeof (owb_rmt_symbol_reset), + &owb_rmt_transmit_config); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_reset: tx err"); + return OWB_STATUS_HW_ERROR; + } - *is_present = _is_present; + // wait for the transmission to finish (or timeout with an error) + if (rmt_tx_wait_all_done (info->tx_channel_handle, OWB_RMT_TIMEOUT_MS) != ESP_OK) { + ESP_LOGE(TAG, "owb_reset: tx timeout"); + return OWB_STATUS_DEVICE_NOT_RESPONDING; // tx timeout + } - ESP_LOGD(TAG, "_is_present %d", _is_present); - - return res; + // wait for the recv_done event data from our callback + rmt_rx_done_event_data_t rx_done_event_data; + if (xQueueReceive (info->rx_queue, &rx_done_event_data, pdMS_TO_TICKS(OWB_RMT_TIMEOUT_MS)) != pdTRUE) { + ESP_LOGE(TAG, "owb_reset: no rx symbol"); // rx timeout + return OWB_STATUS_DEVICE_NOT_RESPONDING; + } + + // parse the event data and return the result + return _parse_reset_symbols (rx_done_event_data.num_symbols, rx_done_event_data.received_symbols, is_present); } -static rmt_item32_t _encode_write_slot(uint8_t val) -{ - rmt_item32_t item; +/** + * @brief Writes a number of bytes to the onewire bus (slightly more efficient than sending them individually). + * @param bus A previously-initialised OneWireBus. + * @param bytes The bytes to be sent. + * @param number_of_bytes_to_write How many bytes to send. + * @return owb_status OWB_STATUS_OK on success, otherwise an error code (see owb.h). + */ +static owb_status _write_bytes(const OneWireBus *bus, uint8_t *bytes, int number_of_bytes_to_write) { + esp_err_t esp_status; - item.level0 = 0; - item.level1 = 1; - if (val) - { - // write "1" slot - item.duration0 = OW_DURATION_1_LOW; - item.duration1 = OW_DURATION_1_HIGH; - } - else - { - // write "0" slot - item.duration0 = OW_DURATION_0_LOW; - item.duration1 = OW_DURATION_0_HIGH; + // identify the rmt_driver_info structure that contains `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); + + // encode and transmit the bits using the RMT 'bytes' encoder + esp_status = rmt_transmit ( + info->tx_channel_handle, + info->bytes_encoder_handle, + bytes, + (size_t)number_of_bytes_to_write, + &owb_rmt_transmit_config); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_write: tx err"); + return OWB_STATUS_HW_ERROR; } - return item; + // wait for the transmission to finish (or timeout with an error) + if (rmt_tx_wait_all_done (info->tx_channel_handle, OWB_RMT_TIMEOUT_MS) != ESP_OK) { + return OWB_STATUS_DEVICE_NOT_RESPONDING; // tx timeout + } + return OWB_STATUS_OK; } -/** NOTE: The data is shifted out of the low bits, eg. it is written in the order of lsb to msb */ -static owb_status _write_bits(const OneWireBus * bus, uint8_t out, int number_of_bits_to_write) -{ - rmt_item32_t tx_items[number_of_bits_to_write + 1]; - owb_rmt_driver_info *info = info_of_driver(bus); - if (number_of_bits_to_write > 8) - { +/** + * @brief Writes 1-8 bits to the onewire bus. + * @param bus A previously-initialised OneWireBus. + * @param bytes A byte with the bits to be sent (lsb first). + * @param number_of_bits_to_write How many bits to send (maximum 8). + * @return owb_status OWB_STATUS_OK on success, otherwise an error code (see owb.h). + */ +static owb_status _write_bits(const OneWireBus *bus, uint8_t out, int number_of_bits_to_write) { + + // send 8 bits as a byte instead + if (number_of_bits_to_write == 8) { + return _write_bytes (bus, &out, 1); + } + + if (number_of_bits_to_write < 1 || number_of_bits_to_write > 8) { + ESP_LOGE(TAG, "owb_write_bits: bad num of bits (%d)", number_of_bits_to_write); return OWB_STATUS_TOO_MANY_BITS; } - // write requested bits as pattern to TX buffer - for (int i = 0; i < number_of_bits_to_write; i++) - { - tx_items[i] = _encode_write_slot(out & 0x01); - out >>= 1; - } - - // end marker - tx_items[number_of_bits_to_write].level0 = 1; - tx_items[number_of_bits_to_write].duration0 = 0; - - owb_status status; - - if (rmt_write_items(info->tx_channel, tx_items, number_of_bits_to_write+1, true) == ESP_OK) - { - status = OWB_STATUS_OK; - } - else - { - status = OWB_STATUS_HW_ERROR; - ESP_LOGE(TAG, "rmt_write_items() failed"); - } - - return status; -} + // identify the rmt_driver_info structure that contains `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); -static rmt_item32_t _encode_read_slot(void) -{ - rmt_item32_t item; - - // construct pattern for a single read time slot - item.level0 = 0; - item.duration0 = OW_DURATION_1_LOW; // shortly force 0 - item.level1 = 1; - item.duration1 = OW_DURATION_1_HIGH; // release high and finish slot - return item; -} + // send data as individual bits using the `copy` encoder + const rmt_symbol_word_t *symbol_ptr; + esp_err_t esp_status; + for (int b = 0; b < number_of_bits_to_write; b += 1) { + if ((out & (1 << b)) == 0) { + symbol_ptr = &owb_rmt_symbol_0bit; + } else { + symbol_ptr = &owb_rmt_symbol_1bit; + } -/** NOTE: Data is read into the high bits, eg. each bit read is shifted down before the next bit is read */ -static owb_status _read_bits(const OneWireBus * bus, uint8_t *in, int number_of_bits_to_read) -{ - rmt_item32_t tx_items[number_of_bits_to_read + 1]; - uint8_t read_data = 0; - int res = OWB_STATUS_OK; - - owb_rmt_driver_info *info = info_of_driver(bus); - - if (number_of_bits_to_read > 8) - { - ESP_LOGE(TAG, "_read_bits() OWB_STATUS_TOO_MANY_BITS"); - return OWB_STATUS_TOO_MANY_BITS; - } - - // generate requested read slots - for (int i = 0; i < number_of_bits_to_read; i++) - { - tx_items[i] = _encode_read_slot(); + // send bit symbol + esp_status = rmt_transmit ( + info->tx_channel_handle, + info->copy_encoder_handle, + symbol_ptr, + sizeof (rmt_symbol_word_t), + &owb_rmt_transmit_config); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_write_bit: tx err"); + return OWB_STATUS_HW_ERROR; + } } - // end marker - tx_items[number_of_bits_to_read].level0 = 1; - tx_items[number_of_bits_to_read].duration0 = 0; - - onewire_flush_rmt_rx_buf(bus); - rmt_rx_start(info->rx_channel, true); - if (rmt_write_items(info->tx_channel, tx_items, number_of_bits_to_read+1, true) == ESP_OK) - { - size_t rx_size; - rmt_item32_t* rx_items = (rmt_item32_t *)xRingbufferReceive(info->rb, &rx_size, portMAX_DELAY); - - if (rx_items) - { -#ifdef OW_DEBUG - for (int i = 0; i < rx_size / 4; i++) - { - ESP_LOGI(TAG, "level: %d, duration %d", rx_items[i].level0, rx_items[i].duration0); - ESP_LOGI(TAG, "level: %d, duration %d", rx_items[i].level1, rx_items[i].duration1); - } -#endif - - if (rx_size >= number_of_bits_to_read * sizeof(rmt_item32_t)) - { - for (int i = 0; i < number_of_bits_to_read; i++) - { - read_data >>= 1; - // parse signal and identify logical bit - if (rx_items[i].level1 == 1) - { - if ((rx_items[i].level0 == 0) && (rx_items[i].duration0 < OW_DURATION_SAMPLE)) - { - // rising edge occured before 15us -> bit 1 - read_data |= 0x80; - } - } - } - read_data >>= 8 - number_of_bits_to_read; - } - - vRingbufferReturnItem(info->rb, (void *)rx_items); - } - else - { - // time out occurred, this indicates an unconnected / misconfigured bus - ESP_LOGE(TAG, "rx_items == 0"); - res = OWB_STATUS_HW_ERROR; - } + // wait for the transmission to finish (or timeout with an error) + if (rmt_tx_wait_all_done (info->tx_channel_handle, OWB_RMT_TIMEOUT_MS) != ESP_OK) { + return OWB_STATUS_DEVICE_NOT_RESPONDING; // tx timeout } - else - { - // error in tx channel - ESP_LOGE(TAG, "Error tx"); - res = OWB_STATUS_HW_ERROR; - } - - rmt_rx_stop(info->rx_channel); - - *in = read_data; - return res; -} - -static owb_status _uninitialize(const OneWireBus *bus) -{ - owb_rmt_driver_info * info = info_of_driver(bus); - - rmt_driver_uninstall(info->tx_channel); - rmt_driver_uninstall(info->rx_channel); return OWB_STATUS_OK; } -static struct owb_driver rmt_function_table = -{ + +/** + * @brief Reads up to 8 bytes from the onewire bus (this is faster than reading individual bits). + * @param bus A previously-initialised OneWireBus. + * @param result The resulting data, stored lsb first in a uint64_t. + * @param number_of_bytes_to_read The number of bytes to read. + * @return owb_status OWB_STATUS_OK on success, otherwise and error code (see owb.h) + */ +static owb_status _read_bytes(const OneWireBus *bus, uint64_t *result_ptr, int number_of_bytes_to_read) { + static uint8_t ff_bytes[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + esp_err_t esp_status; + + if (number_of_bytes_to_read > 8) { + ESP_LOGE(TAG, "owb_read_bytes: max 8"); + return OWB_STATUS_TOO_MANY_BITS; + } + + // identify the rmt_driver_info structure that contains `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); + + // start the receiver before the transmitter so that it sees the first edge + esp_status = rmt_receive ( + info->rx_channel_handle, + info->rx_buffer, + info->rx_buffer_size_in_bytes, + &rx_config_owb_bits); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_read_bytes: rx err"); + return OWB_STATUS_HW_ERROR; + } + + // generate read slots + esp_status = rmt_transmit ( + info->tx_channel_handle, + info->bytes_encoder_handle, + ff_bytes, + (size_t)number_of_bytes_to_read, + &owb_rmt_transmit_config); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_read_bytes: tx err"); + return OWB_STATUS_HW_ERROR; + } + + // wait for the transmission to finish (or timeout with an error) + if (rmt_tx_wait_all_done (info->tx_channel_handle, OWB_RMT_TIMEOUT_MS) != ESP_OK) { + return OWB_STATUS_DEVICE_NOT_RESPONDING; // tx timeout + } + + // wait for the recv_done event data from our callback + rmt_rx_done_event_data_t rx_done_event_data; + if (xQueueReceive (info->rx_queue, &rx_done_event_data, pdMS_TO_TICKS(OWB_RMT_TIMEOUT_MS)) != pdTRUE) { + ESP_LOGE(TAG, "owb_read_bytes: no rx symbols"); // rx timeout + return OWB_STATUS_DEVICE_NOT_RESPONDING; + } + + // decode upto 64 data bits from the received RMT symbols + if (_parse_bit_symbols(rx_done_event_data.num_symbols, rx_done_event_data.received_symbols, result_ptr) == 0) { + ESP_LOGE(TAG, "owb_read_bytes: no bits"); + } + + return OWB_STATUS_OK; +} + + +/** + * @brief Reads up to 8 bits from the onewire bus. + * @param bus A previously-initialised OneWireBus. + * @param result A byte containing the bits read (lsb first). + * @param number_of_bits_to_read The number of bits to read. + * @return owb_status OWB_STATUS_OK on success, otherwise an error code (see owb.h) + */ +static owb_status _read_bits(const OneWireBus *bus, uint8_t *result, int number_of_bits_to_read) { + esp_err_t esp_status; + + if (number_of_bits_to_read > 8) { + ESP_LOGE(TAG, "owb_read_bits: max 8"); + return OWB_STATUS_TOO_MANY_BITS; + } + + // it's quicker to read 8 bits as a whole byte + if (number_of_bits_to_read == 8) { + uint64_t result_64; + owb_status status; + status = _read_bytes (bus, &result_64, 1); + *result = (uint8_t)result_64; + return status; + } + + // identify the rmt_driver_info structure that contains `bus` + owb_rmt_driver_info *info = __containerof(bus, owb_rmt_driver_info, bus); + + // with the copy encoder then it's most efficient to receive each bit individually + // because we don't accurately know the interval between bits. + // It would be nice to use `rmt_transmit_config.loop_count` here, but it's not supported + // on all chips. In any case the user almost certainly only wants a single bit. + *result = 0; + for (int bit_index = 0; bit_index < number_of_bits_to_read; bit_index += 1) { + + // start the receiver before the transmitter so that it sees the first edge + esp_status = rmt_receive ( + info->rx_channel_handle, + info->rx_buffer, + info->rx_buffer_size_in_bytes, + &rx_config_owb_bits); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_read_bits: rx err"); + return OWB_STATUS_HW_ERROR; + } + + // send a '1' symbol to generate a read slot + esp_status = rmt_transmit ( + info->tx_channel_handle, + info->copy_encoder_handle, + &owb_rmt_symbol_1bit, + sizeof (rmt_symbol_word_t), + &owb_rmt_transmit_config); + if (esp_status != ESP_OK) { + ESP_LOGE(TAG, "owb_read_bits: tx err"); + return OWB_STATUS_HW_ERROR; + } + + // wait for the transmission to finish (or timeout with an error) + if (rmt_tx_wait_all_done (info->tx_channel_handle, OWB_RMT_TIMEOUT_MS) != ESP_OK) { + return OWB_STATUS_DEVICE_NOT_RESPONDING; // tx timeout + } + + // wait for the recv_done event data from our callback + rmt_rx_done_event_data_t rx_done_event_data; + if (xQueueReceive (info->rx_queue, &rx_done_event_data, pdMS_TO_TICKS(OWB_RMT_TIMEOUT_MS)) != pdTRUE) { + ESP_LOGE(TAG, "owb_read_bits: no rx symbol"); // rx timeout + return OWB_STATUS_DEVICE_NOT_RESPONDING; + } + + // parse the event data + uint64_t bits = 0; + if (_parse_bit_symbols (rx_done_event_data.num_symbols, rx_done_event_data.received_symbols, &bits) == 0) { + ESP_LOGE(TAG, "owb_read_bits: no bits"); + return OWB_STATUS_HW_ERROR; + } + + // add the bit to `result` (lsb is received first) + if ((bits & 1) != 0) { + *result |= (1 << bit_index); + } + } + + return OWB_STATUS_OK; +} + + +/** + * @brief Handle the RMT `recv_done` event by copying the event data structure to the specified queue. + * @param[in] channel The handle of the RMT channel that generated the event. + * @param[in] edata A pointer to the RMT event data structure (the pointer is valid only within this function). + * @param[in] context A pointer to the user-provided context, in this case the queue handle. + * @return True if sending to the queue caused a higher priority task to unblock; otherwise False. + */ +static bool IRAM_ATTR _recv_done_callback (rmt_channel_handle_t channel, const rmt_rx_done_event_data_t *event_data, void *user_data) { + // Copy a pointer to the event data structure to the queue identified in the user_data. + //* NOTE: this is an interrupt handler so it needs IRAM_ATTR, may only use `ISR` calls and must return promptly. + // + BaseType_t pxHigherPriorityTaskWoken = pdFALSE; + + xQueueSendFromISR ((QueueHandle_t)user_data, event_data, &pxHigherPriorityTaskWoken); + if (pxHigherPriorityTaskWoken == pdTRUE) { + return true; + } + return false; +} + + +//----- +// Public API functions +//----- + +// RMT version of the OWB driver api (will be stored as info->bus->driver) +// +static struct owb_driver rmt_driver_functions = { .name = "owb_rmt", .uninitialize = _uninitialize, .reset = _reset, .write_bits = _write_bits, - .read_bits = _read_bits + .write_bytes = _write_bytes, // new addition to the API + .read_bits = _read_bits, + .read_bytes = _read_bytes // new addition to the API }; -static owb_status _init(owb_rmt_driver_info *info, uint8_t gpio_num, - rmt_channel_t tx_channel, rmt_channel_t rx_channel) -{ - owb_status status = OWB_STATUS_HW_ERROR; - // Ensure the RMT peripheral is not already running - // Note: if using RMT elsewhere, don't call this here, call it at the start of your prgoram instead. - //periph_module_disable(PERIPH_RMT_MODULE); - //periph_module_enable(PERIPH_RMT_MODULE); +// configure and allocate resources +// +OneWireBus* owb_rmt_initialize (owb_rmt_driver_info *info, gpio_num_t gpio_num, int tx_channel, int rx_channel) +{ + //* The function now ignores tx_channel and rx_channel as the new RMT driver allocates channels on demand. + //* The parameters are kept in the call to preserve compatibility with previous versions. + + // the steps to enable the RMT resources are documented in: + // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/rmt.html - info->bus.driver = &rmt_function_table; - info->tx_channel = tx_channel; - info->rx_channel = rx_channel; - info->gpio = gpio_num; + // Note: keeping the TX and RX initialisations together in one function simplifies the error handling + + (void)tx_channel; // avoid compiler warning about unused parameter + (void)rx_channel; // avoid compiler warning about unused parameter -#ifdef OW_DEBUG - ESP_LOGI(TAG, "RMT TX channel: %d", info->tx_channel); - ESP_LOGI(TAG, "RMT RX channel: %d", info->rx_channel); -#endif + // sanity check + if (info == NULL) { + ESP_LOGE(TAG, "info is NULL"); + goto exit_err; + } + + // ----- receive channel ----- - rmt_config_t rmt_tx; - rmt_tx.channel = info->tx_channel; - rmt_tx.gpio_num = gpio_num; - rmt_tx.mem_block_num = 1; - rmt_tx.clk_div = 80; - rmt_tx.tx_config.loop_en = false; - rmt_tx.tx_config.carrier_en = false; - rmt_tx.tx_config.idle_level = 1; - rmt_tx.tx_config.idle_output_en = true; - rmt_tx.rmt_mode = RMT_MODE_TX; - if (rmt_config(&rmt_tx) == ESP_OK) - { - if (rmt_driver_install(rmt_tx.channel, 0, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED) == ESP_OK) - { - rmt_config_t rmt_rx; - rmt_rx.channel = info->rx_channel; - rmt_rx.gpio_num = gpio_num; - rmt_rx.clk_div = 80; - rmt_rx.mem_block_num = 1; - rmt_rx.rmt_mode = RMT_MODE_RX; - rmt_rx.rx_config.filter_en = true; - rmt_rx.rx_config.filter_ticks_thresh = 30; - rmt_rx.rx_config.idle_threshold = OW_DURATION_RX_IDLE; - if (rmt_config(&rmt_rx) == ESP_OK) - { - if (rmt_driver_install(rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED) == ESP_OK) - { - rmt_get_ringbuf_handle(info->rx_channel, &info->rb); - status = OWB_STATUS_OK; - } - else - { - ESP_LOGE(TAG, "failed to install rx driver"); - } - } - else - { - status = OWB_STATUS_HW_ERROR; - ESP_LOGE(TAG, "failed to configure rx, uninstalling rmt driver on tx channel"); - rmt_driver_uninstall(rmt_tx.channel); - } + // channel config + const rmt_rx_channel_config_t rx_channel_config = { + .gpio_num = (int)gpio_num, + .clk_src = RMT_CLK_SRC_APB, // use the APB clock (might reduce during light sleep) + .resolution_hz = OWB_RMT_CLK_HZ, + .mem_block_symbols = (size_t)OWB_RMT_RX_MEM_BLOCK_SYMBOLS, + .flags = { + .invert_in = 0, // don't hardware invert the input + .with_dma = 0, // don't enable DMA + .io_loop_back = 0 // we define the loopback in the tx config } - else - { - ESP_LOGE(TAG, "failed to install tx driver"); - } + }; + + // request channel + //* note: to get a wired-OR bus you must apply the rx_config first, _then_ the rx_config + if (rmt_new_rx_channel (&rx_channel_config, &(info->rx_channel_handle)) != ESP_OK) { + ESP_LOGE(TAG, "err requesting rx_channel"); + goto exit_err; + } + + // create queue for RMT `rx_done` event data struct (from callback) + info->rx_queue = xQueueCreate (1, sizeof (rmt_rx_done_event_data_t)); + if (info->rx_queue == NULL) { + ESP_LOGE(TAG, "err creating rx_queue"); + goto exit_delete_rx_channel; } - else - { - ESP_LOGE(TAG, "failed to configure tx"); + + // allocate rx symbol buffer for RMT driver + info->rx_buffer_size_in_bytes = OWB_RMT_MAX_READ_BITS * sizeof (rmt_symbol_word_t); + info->rx_buffer = (rmt_symbol_word_t *)malloc (info->rx_buffer_size_in_bytes); + if (info->rx_buffer == NULL) { + ESP_LOGE(TAG, "err allocating rx_buffer"); + goto exit_delete_rx_queue; + } + + // register rx channel callback (rx_queue is passed as user context) + const rmt_rx_event_callbacks_t rmt_rx_event_callbacks = { + .on_recv_done = _recv_done_callback + }; + if (rmt_rx_register_event_callbacks (info->rx_channel_handle, &rmt_rx_event_callbacks, info->rx_queue) != ESP_OK) { + ESP_LOGE(TAG, "err registering rx_callbacks"); + goto exit_release_rx_buffer; + } + + // enable channel + if (rmt_enable (info->rx_channel_handle) != ESP_OK) { + ESP_LOGE(TAG, "err enabling rx_channel"); + goto exit_release_rx_buffer; } - // attach GPIO to previous pin - if (gpio_num < 32) - { - GPIO.enable_w1ts = (0x1 << gpio_num); + // ----- transmit channel ----- + + // channel config + const rmt_tx_channel_config_t tx_channel_config = { + .gpio_num = (int)gpio_num, + .clk_src = RMT_CLK_SRC_APB, // use the APB clock (might reduce during light sleep) + .resolution_hz = OWB_RMT_CLK_HZ, + .mem_block_symbols = (size_t)OWB_RMT_TX_MEM_BLOCK_SYMBOLS, + .trans_queue_depth = OWB_RMT_TX_QUEUE_DEPTH, + .flags = { + .invert_out = 1, // invert the output (so that the bus is initially released) + .with_dma = 0, // don't enable DMA + .io_loop_back = 1, // enable reading of actual voltage of output pin + .io_od_mode = 1 // enable open-drain output, so as to achieve a 'wired-OR' bus + } + }; + + // request channel + if (rmt_new_tx_channel (&tx_channel_config, &(info->tx_channel_handle)) != ESP_OK) { + ESP_LOGE(TAG, "err requesting tx_channel"); + goto exit_disable_rx_channel; } - else - { - GPIO.enable1_w1ts.data = (0x1 << (gpio_num - 32)); + + // enable channel + if (rmt_enable (info->tx_channel_handle) != ESP_OK) { + ESP_LOGE(TAG, "err enabling tx_channel"); + goto exit_delete_tx_channel; + } + + // obtain a 'copy' encoder (an RMT built-in used for sending fixed bit patterns) + const rmt_copy_encoder_config_t rmt_copy_encoder_config = {}; // config is "reserved for future expansion" + if (rmt_new_copy_encoder (&rmt_copy_encoder_config, &(info->copy_encoder_handle)) != ESP_OK) { + ESP_LOGE(TAG, "err requesting copy encoder"); + goto exit_disable_tx_channel; } - // attach RMT channels to new gpio pin - // ATTENTION: set pin for rx first since gpio_output_disable() will - // remove rmt output signal in matrix! - rmt_set_pin(info->rx_channel, RMT_MODE_RX, gpio_num); - rmt_set_pin(info->tx_channel, RMT_MODE_TX, gpio_num); - - // force pin direction to input to enable path to RX channel - PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[gpio_num]); - - // enable open drain - GPIO.pin[gpio_num].pad_driver = 1; - - return status; -} - -OneWireBus * owb_rmt_initialize(owb_rmt_driver_info *info, uint8_t gpio_num, - rmt_channel_t tx_channel, rmt_channel_t rx_channel) -{ - ESP_LOGD(TAG, "%s: gpio_num: %d, tx_channel: %d, rx_channel: %d", - __func__, gpio_num, tx_channel, rx_channel); - - owb_status status = _init(info, gpio_num, tx_channel, rx_channel); - if(status != OWB_STATUS_OK) - { - ESP_LOGE(TAG, "_init() failed with status %d", status); + // otain a 'bytes' encoder (an RMT built-in used for sending variable bit patterns) + const rmt_bytes_encoder_config_t rmt_bytes_encoder_config = { + .bit0 = OWB_RMT_SYMBOL_0BIT, + .bit1 = OWB_RMT_SYMBOL_1BIT, + .flags = { + .msb_first = 0 // onewire bus on-the-wire bit order is lsb first + } + }; + if (rmt_new_bytes_encoder(&rmt_bytes_encoder_config, &info->bytes_encoder_handle) != ESP_OK) { + ESP_LOGE(TAG, "err requesting bytes encoder"); + goto exit_delete_copy_encoder; } + + // ----- success ------ + info->gpio = gpio_num; + info->bus.driver = &rmt_driver_functions; // route driver API calls to the functions in this file + ESP_LOGI(TAG, "%s: OK", __func__); return &(info->bus); + + // ----- error: unwind allocated resources ----- +exit_delete_copy_encoder: + ESP_ERROR_CHECK(rmt_del_encoder(info->copy_encoder_handle)); +exit_disable_tx_channel: + ESP_ERROR_CHECK(rmt_disable (info->tx_channel_handle)); +exit_delete_tx_channel: + ESP_ERROR_CHECK(rmt_del_channel (info->tx_channel_handle)); +exit_disable_rx_channel: + ESP_ERROR_CHECK(rmt_disable (info->rx_channel_handle)); +exit_release_rx_buffer: + free (info->rx_buffer); +exit_delete_rx_queue: + vQueueDelete (info->rx_queue); +exit_delete_rx_channel: + ESP_ERROR_CHECK(rmt_del_channel (info->rx_channel_handle)); +exit_err: + ESP_LOGE(TAG, "%s: failed", __func__); + return NULL; }
--- a/components/spidriver/CMakeLists.txt Mon Feb 19 15:07:28 2024 +0100 +++ b/components/spidriver/CMakeLists.txt Mon Jun 24 17:05:20 2024 +0200 @@ -1,2 +1,15 @@ -idf_component_register(SRCS spi_master_lobo.c INCLUDE_DIRS .) +if (NOT IDF_VERSION_MAJOR) + set(IDF_VERSION_MAJOR 3) +endif() + +if (IDF_VERSION_MAJOR LESS 5) + message(FATAL_ERROR "Can't build: requires ESP-IDF version 5.0 or above.") +endif() +set(COMPONENT_ADD_INCLUDEDIRS .) +set(COMPONENT_SRCS "spi_master_lobo.c") +set(COMPONENT_REQUIRES "soc" "driver" "esp_rom") +register_component() + +#idf_component_register(SRCS spi_master_lobo.c INCLUDE_DIRS .) +
--- a/components/spidriver/spi_master_lobo.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/spidriver/spi_master_lobo.c Mon Jun 24 17:05:20 2024 +0200 @@ -61,10 +61,6 @@ #include "freertos/FreeRTOS.h" #include <string.h> #include <stdio.h> -#include "soc/gpio_sig_map.h" -#include "soc/spi_reg.h" -#include "soc/dport_reg.h" -#include "soc/rtc_cntl_reg.h" #include "esp32/rom/ets_sys.h" #include "esp_types.h" #include "esp_attr.h" @@ -73,17 +69,21 @@ #include "freertos/semphr.h" #include "freertos/xtensa_api.h" #include "freertos/task.h" -#include "freertos/ringbuf.h" -#include "soc/soc.h" -#include "soc/dport_reg.h" -#include "soc/uart_struct.h" #include "driver/uart.h" #include "driver/gpio.h" -#include "driver/periph_ctrl.h" +//#include "driver/periph_ctrl.h" +#include "esp_private/periph_ctrl.h" #include "esp_heap_caps.h" -#include "driver/periph_ctrl.h" #include "spi_master_lobo.h" +#include "rom/gpio.h" +#include "soc/soc.h" +#include "soc/io_mux_reg.h" +#include "soc/gpio_periph.h" +#include "soc/periph_defs.h" +#include "soc/dport_reg.h" +#include "soc/spi_reg.h" + static spi_lobo_host_t *spihost[3] = {NULL}; @@ -635,8 +635,8 @@ if (spihost[handle->host_dev]->device[x] !=NULL) break; } if (x == NO_DEV) { + spi_lobo_bus_free(handle->host_dev, 1); free(handle); - spi_lobo_bus_free(handle->host_dev, 1); } else free(handle);
--- a/components/spidriver/spi_master_lobo.h Mon Feb 19 15:07:28 2024 +0100 +++ b/components/spidriver/spi_master_lobo.h Mon Jun 24 17:05:20 2024 +0200 @@ -16,6 +16,9 @@ #ifndef _DRIVER_SPI_MASTER_LOBO_H_ #define _DRIVER_SPI_MASTER_LOBO_H_ +#include <stdbool.h> +#include <stdint.h> + #include "esp_err.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h"
--- a/components/tft/CMakeLists.txt Mon Feb 19 15:07:28 2024 +0100 +++ b/components/tft/CMakeLists.txt Mon Jun 24 17:05:20 2024 +0200 @@ -1,2 +1,15 @@ -idf_component_register(SRCS comic24.c DefaultFont.c def_small.c DejaVuSans18.c DejaVuSans24.c minya24.c SmallFont.c tft.c tftspi.c tooney32.c Ubuntu16.c - REQUIRES spidriver INCLUDE_DIRS .) +if (NOT IDF_VERSION_MAJOR) + set(IDF_VERSION_MAJOR 3) +endif() + +if (IDF_VERSION_MAJOR LESS 5) + message(FATAL_ERROR "Can't build: requires ESP-IDF version 5.0 or above.") +endif() + +set(COMPONENT_ADD_INCLUDEDIRS .) +set(COMPONENT_SRCS "comic24.c DefaultFont.c def_small.c DejaVuSans18.c DejaVuSans24.c minya24.c SmallFont.c tft.c tftspi.c tooney32.c Ubuntu16.c") +set(COMPONENT_REQUIRES "soc" "driver" "esp_rom" "spidriver") +register_component() + +#idf_component_register(SRCS comic24.c DefaultFont.c def_small.c DejaVuSans18.c DejaVuSans24.c minya24.c SmallFont.c tft.c tftspi.c tooney32.c Ubuntu16.c +# REQUIRES spidriver INCLUDE_DIRS .)
--- a/components/tft/tftspi.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/tft/tftspi.c Mon Jun 24 17:05:20 2024 +0200 @@ -606,14 +606,14 @@ void stmpe610_Init() { stmpe610_write_reg(STMPE610_REG_SYS_CTRL1, 0x02); // Software chip reset - vTaskDelay(10 / portTICK_RATE_MS); + vTaskDelay(10 / portTICK_PERIOD_MS); stmpe610_write_reg(STMPE610_REG_SYS_CTRL2, 0x04); // Temperature sensor clock off, GPIO clock off, touch clock on, ADC clock on stmpe610_write_reg(STMPE610_REG_INT_EN, 0x00); // Don't Interrupt on INT pin stmpe610_write_reg(STMPE610_REG_ADC_CTRL1, 0x48); // ADC conversion time = 80 clock ticks, 12-bit ADC, internal voltage refernce - vTaskDelay(2 / portTICK_RATE_MS); + vTaskDelay(2 / portTICK_PERIOD_MS); stmpe610_write_reg(STMPE610_REG_ADC_CTRL2, 0x01); // ADC speed 3.25MHz stmpe610_write_reg(STMPE610_REG_GPIO_AF, 0x00); // GPIO alternate function - OFF stmpe610_write_reg(STMPE610_REG_TSC_CFG, 0xE3); // Averaging 8, touch detect delay 1ms, panel driver settling time 1ms @@ -761,7 +761,7 @@ if(ms) { ms = *addr++; // Read post-command delay time (ms) if(ms == 255) ms = 500; // If 255, delay for 500 ms - vTaskDelay(ms / portTICK_RATE_MS); + vTaskDelay(ms / portTICK_PERIOD_MS); } } } @@ -863,11 +863,11 @@ void TFT_PinsInit() { // Route all used pins to GPIO control - gpio_pad_select_gpio(PIN_NUM_CS); - gpio_pad_select_gpio(PIN_NUM_MISO); - gpio_pad_select_gpio(PIN_NUM_MOSI); - gpio_pad_select_gpio(PIN_NUM_CLK); - gpio_pad_select_gpio(PIN_NUM_DC); + esp_rom_gpio_pad_select_gpio(PIN_NUM_CS); + esp_rom_gpio_pad_select_gpio(PIN_NUM_MISO); + esp_rom_gpio_pad_select_gpio(PIN_NUM_MOSI); + esp_rom_gpio_pad_select_gpio(PIN_NUM_CLK); + esp_rom_gpio_pad_select_gpio(PIN_NUM_DC); gpio_set_direction(PIN_NUM_MISO, GPIO_MODE_INPUT); gpio_set_pull_mode(PIN_NUM_MISO, GPIO_PULLUP_ONLY); @@ -877,17 +877,17 @@ gpio_set_direction(PIN_NUM_DC, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_DC, 0); #if USE_TOUCH - gpio_pad_select_gpio(PIN_NUM_TCS); + esp_rom_gpio_pad_select_gpio(PIN_NUM_TCS); gpio_set_direction(PIN_NUM_TCS, GPIO_MODE_OUTPUT); #endif #if PIN_NUM_BCKL - gpio_pad_select_gpio(PIN_NUM_BCKL); + esp_rom_gpio_pad_select_gpio(PIN_NUM_BCKL); gpio_set_direction(PIN_NUM_BCKL, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_BCKL, PIN_BCKL_OFF); #endif #if PIN_NUM_RST - gpio_pad_select_gpio(PIN_NUM_RST); + esp_rom_gpio_pad_select_gpio(PIN_NUM_RST); gpio_set_direction(PIN_NUM_RST, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_RST, 0); #endif
--- a/main/CMakeLists.txt Mon Feb 19 15:07:28 2024 +0100 +++ b/main/CMakeLists.txt Mon Jun 24 17:05:20 2024 +0200 @@ -1,5 +1,5 @@ -idf_component_register(SRCS automation.c brewboard.c buttons.c calibration.c config.c files.c - manual.c recipes.c setup.c - task_driver.c task_ds18b20.c task_http.c task_sdcard.c task_sound.c task_tft.c task_wifi.c updates.c - INCLUDE_DIRS ".") +set (srcs automation.c brewboard.c buttons.c calibration.c config.c files.c manual.c recipes.c setup.c + task_driver.c task_ds18b20.c task_http.c task_sdcard.c task_sound.c task_tft.c task_wifi.c updates.c) +idf_component_register(SRCS "${srcs}" INCLUDE_DIRS ".") +
--- a/main/automation.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/automation.c Mon Jun 24 17:05:20 2024 +0200 @@ -11,7 +11,7 @@ char temp_buf[64]; ///< Temporary buffer char logline[128]; ///< Log line buffer char strftime_buf[64]; ///< Time buffer -bool loop; ///< Loop flag +bool a_loop; ///< Loop flag bool CoolBeep = false; ///< Did beep during cooling bool Resume = false; ///< Resume brew flag bool pumpRest = false; ///< Pump is resting @@ -40,6 +40,11 @@ bool _UseHLT = false; ///< Use HLT slave flag bool _Prompt = false; ///< Prompt display flag +extern my_config_t config; +extern my_runtime_t runtime; +extern my_equipment_t equipment; +extern my_recipe_t recipe; + extern bool System_TimeOk; ///< System time is valid extern sButton Buttons[MAXBUTTONS]; ///< Buttons definitions extern int Main_Screen; ///< Current screen @@ -133,10 +138,10 @@ Buttons_Add(200, 100, 80, 40, (char *)"Nee", 1); Buttons_Show(); SoundPlay(SOUND_Prompt); - loop = true; - while (loop) { + a_loop = true; + while (a_loop) { switch (Buttons_Scan()) { - case 0: loop = false; + case 0: a_loop = false; Resume = true; Main_Screen = runtime.StageResume; TimeLeft = runtime.StageTimeLeft; @@ -160,7 +165,7 @@ return true; break; - case 1: loop = false; + case 1: a_loop = false; Resume = false; break; @@ -431,7 +436,7 @@ /* - * Automation loop screens. Mostly non-blocking. + * Automation a_loop screens. Mostly non-blocking. */ bool Automation_Loop(void) { @@ -524,14 +529,14 @@ Buttons_Add(250, 210, 70, 30, (char *)"Start" , 1); Buttons[0].dark = true; Buttons_Show(); - loop = true; - while (loop) { + a_loop = true; + while (a_loop) { switch (Buttons_Scan()) { - case 0: loop = false; + case 0: a_loop = false; Main_Screen = MAIN_AUTO_ABORT; break; - case 1: loop = false; + case 1: a_loop = false; Main_Screen = MAIN_AUTO_INIT2; log_msg(TAG, "Brew `%s' on `%s'", recipe.Name, equipment.Name); break; @@ -553,13 +558,13 @@ Buttons_Add(200, 100, 80, 40, (char *)"Nee", 1); Buttons_Show(); SoundPlay(SOUND_Prompt); - loop = true; - while (loop) { + a_loop = true; + while (a_loop) { switch (Buttons_Scan()) { - case 0: loop = false; + case 0: a_loop = false; break; - case 1: loop = false; + case 1: a_loop = false; Main_Screen = MAIN_AUTO_ABORT; break; @@ -573,14 +578,14 @@ if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) { TopMessage((char *)"Spoelwater aanwezig?"); SoundPlay(SOUND_Prompt); - loop = true; - while (loop) { + a_loop = true; + while (a_loop) { switch (Buttons_Scan()) { - case 0: loop = false; + case 0: a_loop = false; _UseHLT = true; break; - case 1: loop = false; + case 1: a_loop = false; break; default: break;
--- a/main/brewboard.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/brewboard.c Mon Jun 24 17:05:20 2024 +0200 @@ -19,6 +19,9 @@ extern SemaphoreHandle_t xSemaphoreWiFi; extern WIFI_State *wifi_state; +extern my_config_t config; + + int Main_Screen = MAIN_MODE_UNKNOWN; ///< Screen number int Old_Screen = MAIN_MODE_UNKNOWN; ///< Previous screen number int Sub_Screen = 0; ///< Subscreen during mash @@ -30,6 +33,7 @@ { int tempy; char temp[64]; + esp_err_t ret; ESP_LOGI(TAG, "Starting"); init_tft_display(); @@ -37,10 +41,20 @@ TFT_setFont(DEJAVU24_FONT, NULL); _fg = TFT_YELLOW; tempy = TFT_getfontheight() + 4; - app_desc = esp_ota_get_app_description(); + app_desc = esp_app_get_description(); sprintf(temp, "BrewBoard %s", app_desc->version); TFT_print(temp, CENTER, 4); + /* + * Initialize NVS + */ + ret = nvs_flash_init(); + if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) { + ESP_ERROR_CHECK(nvs_flash_erase()); + ret = nvs_flash_init(); + } + ESP_ERROR_CHECK(ret); + TFT_setFont(DEJAVU18_FONT, NULL); _fg = TFT_CYAN; TFT_print((char *)"Mount /spiffs ", 0, LASTY+tempy); @@ -52,10 +66,12 @@ .max_files = 5, .format_if_mount_failed = true }; - - // Use settings defined above to initialize and mount SPIFFS filesystem. - // Note: esp_vfs_spiffs_register is an all-in-one convenience function. - esp_err_t ret = esp_vfs_spiffs_register(&conf); + + /* + * Use settings defined above to initialize and mount SPIFFS filesystem. + * Note: esp_vfs_spiffs_register is an all-in-one convenience function. + */ + ret = esp_vfs_spiffs_register(&conf); if (ret != ESP_OK) { if (ret == ESP_FAIL) {
--- a/main/calibration.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/calibration.c Mon Jun 24 17:05:20 2024 +0200 @@ -8,6 +8,7 @@ static const char *TAG = "calibration"; +extern my_config_t config; extern uint16_t tp_xleft; ///< Testpoint X left extern uint16_t tp_xright; ///< Testpoint X right
--- a/main/config.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/config.c Mon Jun 24 17:05:20 2024 +0200 @@ -7,6 +7,14 @@ static const char *TAG = "config"; +my_config_t config; +my_equipment_hdr_t equipment_hdr; +my_equipment_t equipment; +my_wifiStation_t wifiStation; +my_runtime_t runtime; +my_recipe_hdr_t recipe_hdr; +my_recipe_t recipe; + void write_config() { uint8_t *dst = (uint8_t *)&config; @@ -143,7 +151,7 @@ uint32_t oldsize = equipment_hdr.recsize; FILE *nf = fopen("/spiffs/etc/equipments.new", "w"); - ESP_LOGW(TAG, "/spiffs/etc/equipments.conf version %d, new %d", equipment_hdr.version, EQUIPMENT_VERSION); + ESP_LOGW(TAG, "/spiffs/etc/equipments.conf version %u, new %d", (unsigned)equipment_hdr.version, EQUIPMENT_VERSION); dst = (uint8_t*)&equipment_hdr; memset(dst, 0, sizeof(equipment_hdr)); // Update the header with new sizes @@ -160,7 +168,7 @@ equipment.Max_watt = 3000; bytes = fwrite(dst, 1, sizeof(equipment), nf); if (bytes != sizeof(equipment)) { - ESP_LOGE(TAG, "/spiffs/etc/equipments.new write data, %d/%d bytes", bytes, sizeof(equipment)); + ESP_LOGE(TAG, "/spiffs/etc/equipments.new write data, %u/%d bytes", (unsigned)bytes, sizeof(equipment)); } } fclose(nf); @@ -178,7 +186,7 @@ bytes = fread(dst, 1, equipment_hdr.recsize, f); fclose(f); if (bytes != equipment_hdr.recsize) { - ESP_LOGE(TAG, "/spiffs/etc/equipments.conf read record %d, %d/%d bytes", RecNo, bytes, equipment_hdr.recsize); + ESP_LOGE(TAG, "/spiffs/etc/equipments.conf read record %d, %u/%u bytes", RecNo, (unsigned)bytes, (unsigned)equipment_hdr.recsize); } else { ESP_LOGI(TAG, "/spiffs/etc/equipments.conf read %d bytes, record %d: %s", bytes, RecNo, equipment.Name); } @@ -201,9 +209,9 @@ size_t bytes = fwrite(dst, 1, equipment_hdr.recsize, f); fclose(f); if (bytes != equipment_hdr.recsize) - ESP_LOGE(TAG, "/spiffs/etc/equipments.conf write record %d, %d/%d bytes", RecNo, bytes, equipment_hdr.recsize); + ESP_LOGE(TAG, "/spiffs/etc/equipments.conf write record %d, %u/%u bytes", RecNo, (unsigned)bytes, (unsigned)equipment_hdr.recsize); else - ESP_LOGI(TAG, "/spiffs/etc/equipments.conf update record %d, %d bytes", RecNo, bytes); + ESP_LOGI(TAG, "/spiffs/etc/equipments.conf update record %d, %u bytes", RecNo, (unsigned)bytes); } @@ -469,7 +477,7 @@ size_t bytes = fwrite(dst, 1, recipe_hdr.recsize, f); fclose(f); if (bytes != recipe_hdr.recsize) { - ESP_LOGE(TAG, "/spiffs/etc/recipe.conf write record %d, %d/%d bytes", RecNo, bytes, recipe_hdr.recsize); + ESP_LOGE(TAG, "/spiffs/etc/recipe.conf write record %d, %u/%u bytes", RecNo, (unsigned)bytes, (unsigned)recipe_hdr.recsize); } }
--- a/main/config.h Mon Feb 19 15:07:28 2024 +0100 +++ b/main/config.h Mon Jun 24 17:05:20 2024 +0200 @@ -4,8 +4,8 @@ * spiffs filesystem in a flash partition. */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef _G_CONFIG_H +#define _G_CONFIG_H // Global includes for the project @@ -14,6 +14,7 @@ #include <string.h> #include <stdbool.h> #include <time.h> +#include <inttypes.h> #include <errno.h> #include <sys/unistd.h> #include <sys/fcntl.h> @@ -24,38 +25,32 @@ #include "freertos/semphr.h" #include "freertos/event_groups.h" #include "freertos/queue.h" +#include "driver/gpio.h" #include "driver/i2c.h" #include "driver/ledc.h" #include "esp_log.h" #include "esp_spiffs.h" -#include "esp_event.h" +#include "esp_vfs.h" +#include "esp_system.h" +#include "esp_chip_info.h" +#include "esp_netif.h" +#include "esp_mac.h" #include "esp_wifi.h" -#include "esp_wifi_types.h" -#include "esp_system.h" - +#include "esp_wpa2.h" +#include "esp_event.h" +#include "esp_timer.h" #include "esp_ota_ops.h" #include "esp_http_client.h" -#include "esp_https_ota.h" - -#include "esp_vfs.h" -#include "esp_vfs_fat.h" -#include "nvs.h" +#include "esp_app_format.h" +#include "esp_sntp.h" #include "nvs_flash.h" -#include "esp32/rom/crc.h" -#include "mdns.h" #include "lwip/sockets.h" -#include "lwip/api.h" -#include "lwip/err.h" +#include "lwip/dns.h" #include "lwip/netdb.h" -#include "lwip/dns.h" -#include "lwip/opt.h" -#include "lwip/memp.h" -#include "lwip/ip.h" -#include "lwip/raw.h" -#include "lwip/udp.h" -#include "sdkconfig.h" -#include "esp_sntp.h" -#include "expat.h" + +#include <expat.h> + +#include "esp32/rom/crc.h" #include "tftspi.h" #include "tft.h" @@ -157,7 +152,7 @@ /** * @brief Global configuration. File /spiffs/config.conf */ -struct strConfig { +typedef struct { uint8_t Version; ///< Record version number for updates. uint8_t Unit; ///< Celsius or Farenheit (not used yet). float BoilTemperature; ///< The temperature when water boils. @@ -180,7 +175,7 @@ int RecipeRec; ///< Current recipe record. char uuid[37]; ///< Sort of uuid code. char lastSSID[32]; ///< Last connected station. -} config; ///< Config record. +} my_config_t; /** * @brief Write configuration to disk. @@ -198,13 +193,13 @@ /** * @brief Equipment configuration. File /spiffs/equipments.conf */ -struct hdrEquipment { +typedef struct { uint32_t version; ///< Structure version. uint32_t hdrsize; ///< Size of this header. uint32_t recsize; ///< Size of a record. -} equipment_hdr; +} my_equipment_hdr_t; -struct strEquipment { +typedef struct { int MLT_watt; ///< MLT watts. int HLT_watt; ///< HLT watts. char Name[32]; ///< Equipment name. @@ -228,7 +223,7 @@ bool Hendi; ///< HendiControl in use. int RampPower; ///< The power percentage to ramp to boil. int Max_watt; ///< MLT plus HLT peak, shut off HLT if higher. -} equipment; ///< Equipment record. +} my_equipment_t; ///< Equipment record. /** * @brief Append equipments record to disk. @@ -260,11 +255,11 @@ /** * @brief Records with WiFi stations we have succesfully connected. */ -struct strStations { +typedef struct { char SSID[32]; ///< Station SSID char Password[64]; ///< Station password bool hide; ///< Hide from AP scan. -} wifiStation; ///< Station record. +} my_wifiStation_t; ///< Station record. /** * @brief Add a new station record. @@ -292,7 +287,7 @@ /** * @brief Runtime configuration. File /spiffs/runtime.conf */ -struct strRuntime { +typedef struct { uint8_t Version; ///< Record version number for updates. bool AutoModeStarted; ///< Running automode. int StageResume; ///< Current Resume Stage. @@ -309,7 +304,7 @@ bool MaltAdded; ///< If malt was added. TickType_t MLT_usage; ///< MLT usage counter. TickType_t HLT_usage; ///< HLT usage counter. -} runtime; ///< Runtime record. +} my_runtime_t; ///< Runtime record. /** @@ -356,7 +351,7 @@ /** * @brief Mash steps */ -typedef struct strMashStep { +typedef struct { char Name[32]; ///< Step name. uint8_t Type; ///< Step Type. float Step_temp; ///< Step start temperature. @@ -370,7 +365,7 @@ /** * @brief Hop and other additions */ -typedef struct strAddition { +typedef struct { uint16_t Time; ///< Time for addition. uint8_t Type; ///< Addition type, Hop, Syrop ... char Name[64]; ///< Addition name. @@ -380,15 +375,15 @@ * @brief Recipes database. Starts with a header block for future upgrades, * followed by the actual recpie records. */ -struct hdrRecipe { +typedef struct { uint32_t version; ///< Structure version. uint32_t hdrsize; ///< Size of this header. uint32_t recsize; ///< Size of a record. uint8_t mashmax; ///< Maximum mash steps. uint8_t additionmax; ///< Maximum additions. -} recipe_hdr; +} my_recipe_hdr_t; -struct strRecipe { +typedef struct { char Name[128]; ///< Recipe name. char Code[32]; ///< Recipe code. uint16_t BoilTime; ///< Boil time. @@ -402,7 +397,7 @@ float SpargeTemp; ///< Sparge water temperature. mashstep_t MashStep[MASH_MAX]; ///< Mash steps. addition_t Addition[ADDITION_MAX]; ///< Additions. -} recipe; ///< Recipe record. +} my_recipe_t; ///< Recipe record. /** * @brief Append a recipe record. Create file if it doesn't exist.
--- a/main/manual.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/manual.c Mon Jun 24 17:05:20 2024 +0200 @@ -9,6 +9,9 @@ bool _ManualMLT = false; ///< Use Mash/Boil kettle bool loop; +extern my_runtime_t runtime; +extern my_equipment_t equipment; + extern sButton Buttons[MAXBUTTONS]; extern int Main_Screen; extern DS18B20_State *ds18b20_state;
--- a/main/recipes.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/recipes.c Mon Jun 24 17:05:20 2024 +0200 @@ -13,6 +13,10 @@ extern sButton Buttons[MAXBUTTONS]; ///< Buttons definitions extern int Main_Screen; ///< Current screen +extern my_config_t config; +extern my_equipment_t equipment; +extern my_recipe_hdr_t recipe_hdr; +extern my_recipe_t recipe; bool r_UpdateRec = false; ///< Update record flag int r_CurrentRec = 1; ///< Current record
--- a/main/setup.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/setup.c Mon Jun 24 17:05:20 2024 +0200 @@ -6,6 +6,11 @@ #include "config.h" +extern my_config_t config; +extern my_equipment_hdr_t equipment_hdr; +extern my_equipment_t equipment; +extern my_runtime_t runtime; + extern sButton Buttons[MAXBUTTONS]; extern int Main_Screen;
--- a/main/task_driver.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_driver.c Mon Jun 24 17:05:20 2024 +0200 @@ -22,6 +22,9 @@ #define HENDI_SWITCH 6 ///< Hendi power on/off at % +extern my_equipment_t equipment; +extern my_runtime_t runtime; + bool outEnable = false; ///< Enable outputs flag DRIVER_State * driver_state; ///< Driver state SemaphoreHandle_t xSemaphoreDriver = NULL; ///< Driver state lock @@ -205,11 +208,14 @@ /* * Configure IOMUX register. */ - gpio_pad_select_gpio(SSR_MLT); + gpio_reset_pin(SSR_MLT); + //gpio_pad_select_gpio(SSR_MLT); gpio_set_direction(SSR_MLT, GPIO_MODE_OUTPUT); - gpio_pad_select_gpio(SSR_HLT); + gpio_reset_pin(SSR_HLT); + //gpio_pad_select_gpio(SSR_HLT); gpio_set_direction(SSR_HLT, GPIO_MODE_OUTPUT); - gpio_pad_select_gpio(SSR_PUMP); + gpio_reset_pin(SSR_PUMP); + //gpio_pad_select_gpio(SSR_PUMP); gpio_set_direction(SSR_PUMP, GPIO_MODE_OUTPUT); // Prepare and then apply the LEDC PWM timer configuration
--- a/main/task_http.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_http.c Mon Jun 24 17:05:20 2024 +0200 @@ -318,11 +318,11 @@ break; case WEBSOCKET_DISCONNECT_INTERNAL: - ESP_LOGI(TAG,"Websocket client %i was disconnected",num); + ESP_LOGI(TAG,"Websocket client %u was disconnected",(unsigned)num); break; case WEBSOCKET_DISCONNECT_ERROR: - ESP_LOGI(TAG,"Websocket client %i was disconnected due to an error",num); + ESP_LOGI(TAG,"Websocket client %u was disconnected due to an error",(unsigned)num); break; case WEBSOCKET_TEXT: @@ -347,15 +347,15 @@ } } // Log if the message in not processed. - ESP_LOGI(TAG,"Websocket client %i sent text message of size %i:\n%s",num,(uint32_t)len,msg); + ESP_LOGI(TAG,"Websocket client %u sent text message of size %u:\n%s",(unsigned)num,(unsigned)len,msg); break; case WEBSOCKET_BIN: - ESP_LOGI(TAG,"Websocket client %i sent bin message of size %i:\n",num,(uint32_t)len); + ESP_LOGI(TAG,"Websocket client %u sent bin message of size %u:\n",(unsigned)num,(unsigned)len); break; case WEBSOCKET_PING: - ESP_LOGI(TAG,"client %i pinged us with message of size %i:\n%s",num,(uint32_t)len,msg); + ESP_LOGI(TAG,"client %u pinged us with message of size %u:\n%s",(unsigned)num,(unsigned)len,msg); break; case WEBSOCKET_PONG:
--- a/main/task_sdcard.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_sdcard.c Mon Jun 24 17:05:20 2024 +0200 @@ -22,6 +22,9 @@ #include "config.h" +extern my_runtime_t runtime; +extern my_recipe_t recipe; + SDCARD_State *sdcard_state; ///< SD card status JSON_log *json_log; ///< JSON log array @@ -120,7 +123,7 @@ void log_json(void) { - char filename[64], strftime_buf[64]; + char filename[96], strftime_buf[64]; FILE *f; bool addcomma = true; @@ -164,7 +167,7 @@ void log_annotation(int annotation_type, char *label) { - char filename[64]; + char filename[96]; char bordercolor[9], color[9], pos[8]; FILE *f; bool addcomma = true; @@ -452,7 +455,7 @@ sdmmc_card_t* card; esp_err_t ret; EventBits_t uxBits; - char filename[64]; + char filename[96]; sdcard_state = malloc(sizeof(SDCARD_State)); sdcard_state->host_ok = false; @@ -579,7 +582,7 @@ // Close the logfile. if (strlen(sdcard_state->logfile) && (sdcard_state->card_present == true)) { log_msg(TAG, "Closing logfile"); - char destname[64]; + char destname[96]; sprintf(destname, "/sdcard/w/log"); int rc = mkdir(destname, 0755); if (rc && (errno != EEXIST)) {
--- a/main/task_sdcard.h Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_sdcard.h Mon Jun 24 17:05:20 2024 +0200 @@ -31,7 +31,7 @@ typedef struct { bool host_ok; ///< SPI host is Ok. bool card_present; ///< If card is present in the slot. - char logfile[32]; ///< Current logfile name. + char logfile[64]; ///< Current logfile name. } SDCARD_State; /**
--- a/main/task_sound.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_sound.c Mon Jun 24 17:05:20 2024 +0200 @@ -95,7 +95,9 @@ ESP_LOGI(TAG, "Start sound"); - gpio_pad_select_gpio(PIEZO_BUZZER); +// gpio_pad_select_gpio(PIEZO_BUZZER); +// gpio_set_direction(PIEZO_BUZZER, GPIO_MODE_OUTPUT); + gpio_reset_pin(PIEZO_BUZZER); gpio_set_direction(PIEZO_BUZZER, GPIO_MODE_OUTPUT); xEventGroupSound = xEventGroupCreate();
--- a/main/task_tft.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_tft.c Mon Jun 24 17:05:20 2024 +0200 @@ -18,6 +18,10 @@ char s_timer[16]; ///< Timer string buffer char s_top_msg[64]; ///< Top message string buffer +extern my_config_t config; +extern my_equipment_t equipment; +extern my_runtime_t runtime; + extern float stageTemp; extern uint16_t stageTime; extern uint16_t TimeWhirlPool; @@ -127,7 +131,7 @@ assert(ret == ESP_OK); ESP_LOGD(TAG, "SPI: attached display, spi bus: %d, speed: %u, bus uses native pins: %s", - SPI_BUS, spi_lobo_get_speed(spi), spi_lobo_uses_native_pins(spi) ? "true" : "false"); + SPI_BUS, (unsigned)spi_lobo_get_speed(spi), spi_lobo_uses_native_pins(spi) ? "true" : "false"); ESP_LOGI(TAG, "TS pins : miso=%d, mosi=%d, sck=%d, cs=%d", PIN_NUM_MISO, PIN_NUM_MOSI, PIN_NUM_CLK, PIN_NUM_TCS); @@ -141,7 +145,7 @@ ret = spi_lobo_device_deselect(tsspi); assert(ret == ESP_OK); - ESP_LOGD(TAG, "SPI: attached TS device, spi bus: %d, speed: %u", SPI_BUS, spi_lobo_get_speed(tsspi)); + ESP_LOGD(TAG, "SPI: attached TS device, spi bus: %d, speed: %u", SPI_BUS, (unsigned)spi_lobo_get_speed(tsspi)); // ==== Initialize the Display ==== TFT_display_init(); @@ -151,7 +155,7 @@ // ==== Set SPI clock used for display operations ==== spi_lobo_set_speed(spi, DEFAULT_SPI_CLOCK); - ESP_LOGD(TAG, "SPI: Max rd speed: %u, changed speed to %u", max_rdclock, spi_lobo_get_speed(spi)); + ESP_LOGD(TAG, "SPI: Max rd speed: %u, changed speed to %u", (unsigned)max_rdclock, (unsigned)spi_lobo_get_speed(spi)); font_rotate = 0; text_wrap = 0;
--- a/main/task_wifi.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/task_wifi.c Mon Jun 24 17:05:20 2024 +0200 @@ -10,6 +10,9 @@ static const char *TAG = "task_wifi"; +extern my_config_t config; +extern my_runtime_t runtime; +extern my_wifiStation_t wifiStation; SemaphoreHandle_t xSemaphoreWiFi = NULL; ///< Semaphore WiFi task. EventGroupHandle_t xEventGroupWifi; ///< Events WiFi task. @@ -68,7 +71,7 @@ * @param event The event * @return Esp error code. */ -esp_err_t task_wifi_EventHandler(void *ctx, system_event_t *event); +//esp_err_t task_wifi_EventHandler(void *ctx, system_event_t *event); /** * @brief local callback function. Is called when the timesync is valid @@ -162,7 +165,7 @@ break; case WIFI_EVENT_STA_CONNECTED: { - system_event_sta_connected_t* event = (wifi_event_sta_connected_t*) event_data; + wifi_event_sta_connected_t* event = (wifi_event_sta_connected_t*) event_data; wifi_ap_record_t ap_info; esp_wifi_sta_get_ap_info(&ap_info); ESP_LOGI(TAG, "Event STA connected, ssid:%s, bssid:" MACSTR ", channel:%d, rssi: %d, authmode:%s", @@ -195,7 +198,7 @@ } xEventGroupClearBits(xEventGroupWifi, TASK_WIFI_STA_CONNECTED); xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED); - sntp_stop(); + esp_sntp_stop(); if (disconnected->reason == WIFI_REASON_NO_AP_FOUND && ! _wifi_ScanAPs) { ESP_LOGI(TAG, "Request scan for another AP"); @@ -238,7 +241,7 @@ break; } default: - ESP_LOGW(TAG, "Unknown WiFi event %d", event_id); + ESP_LOGW(TAG, "Unknown WiFi event %d", (int)event_id); break; } } @@ -269,13 +272,13 @@ * empty. And if you are on a different lan someday, there is no extra * delay because the hostname will not be found. */ - sntp_stop(); + esp_sntp_stop(); if (strlen(config.ntp_server)) - sntp_setservername(0, config.ntp_server); - sntp_setservername(1, (char *)"pool.ntp.org"); // Will get you servers nearby - sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED); - sntp_set_time_sync_notification_cb(time_sync_notification_cb); - sntp_init(); + esp_sntp_setservername(0, config.ntp_server); + esp_sntp_setservername(1, (char *)"pool.ntp.org"); // Will get you servers nearby + esp_sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED); + esp_sntp_set_time_sync_notification_cb(time_sync_notification_cb); + esp_sntp_init(); #if 0 if (strlen(config.ntp_server)) ESP_LOGI(TAG, "NTP server %s", sntp_getservername(0)); @@ -295,7 +298,7 @@ } else { ESP_LOGE(TAG, "got_ip_event_handler() lock error IP_EVENT_STA_LOST_IP"); } - sntp_stop(); + esp_sntp_stop(); break; case IP_EVENT_AP_STAIPASSIGNED: @@ -303,7 +306,7 @@ break; default: - ESP_LOGW(TAG, "Unknown IP event %d", event_id); + ESP_LOGW(TAG, "Unknown IP event %d", (int)event_id); break; } } @@ -405,7 +408,7 @@ * user requested a disconnect, this will in effect disconnect the wifi but also erase NVS memory */ ESP_LOGI(TAG, "Request STA disconnect"); - sntp_stop(); + esp_sntp_stop(); ESP_ERROR_CHECK(esp_wifi_disconnect()); xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY );
--- a/main/updates.c Mon Feb 19 15:07:28 2024 +0100 +++ b/main/updates.c Mon Jun 24 17:05:20 2024 +0200 @@ -70,7 +70,7 @@ esp_http_client_cleanup(client); goto updateerr; } - ESP_LOGI(TAG, "Update to partition subtype %d at offset 0x%x", update_partition->subtype, update_partition->address); + ESP_LOGI(TAG, "Update to partition subtype %d at offset 0x%x", update_partition->subtype, (unsigned)update_partition->address); err = esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle); if (err != ESP_OK) {
--- a/sdkconfig Mon Feb 19 15:07:28 2024 +0100 +++ b/sdkconfig Mon Jun 24 17:05:20 2024 +0200 @@ -2,41 +2,236 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # +CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined" +CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined" +CONFIG_SOC_DPORT_WORKAROUND="Not determined" +CONFIG_SOC_CAPS_ECO_VER_MAX=301 +CONFIG_SOC_ADC_SUPPORTED=y +CONFIG_SOC_DAC_SUPPORTED=y +CONFIG_SOC_UART_SUPPORTED=y +CONFIG_SOC_MCPWM_SUPPORTED=y +CONFIG_SOC_GPTIMER_SUPPORTED=y +CONFIG_SOC_SDMMC_HOST_SUPPORTED=y +CONFIG_SOC_BT_SUPPORTED=y +CONFIG_SOC_PCNT_SUPPORTED=y +CONFIG_SOC_WIFI_SUPPORTED=y +CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y +CONFIG_SOC_TWAI_SUPPORTED=y +CONFIG_SOC_EMAC_SUPPORTED=y +CONFIG_SOC_ULP_SUPPORTED=y +CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y +CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y +CONFIG_SOC_RTC_SLOW_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_GPSPI_SUPPORTED=y +CONFIG_SOC_LEDC_SUPPORTED=y +CONFIG_SOC_I2C_SUPPORTED=y +CONFIG_SOC_SUPPORT_COEXISTENCE=y +CONFIG_SOC_AES_SUPPORTED=y +CONFIG_SOC_MPI_SUPPORTED=y +CONFIG_SOC_SHA_SUPPORTED=y +CONFIG_SOC_FLASH_ENC_SUPPORTED=y +CONFIG_SOC_SECURE_BOOT_SUPPORTED=y +CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y +CONFIG_SOC_BOD_SUPPORTED=y +CONFIG_SOC_ULP_FSM_SUPPORTED=y +CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5 +CONFIG_SOC_XTAL_SUPPORT_26M=y +CONFIG_SOC_XTAL_SUPPORT_40M=y +CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y +CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y +CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y +CONFIG_SOC_ADC_DMA_SUPPORTED=y +CONFIG_SOC_ADC_PERIPH_NUM=2 +CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10 +CONFIG_SOC_ADC_ATTEN_NUM=4 +CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2 +CONFIG_SOC_ADC_PATT_LEN_MAX=16 +CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=9 +CONFIG_SOC_ADC_DIGI_MAX_BITWIDTH=12 +CONFIG_SOC_ADC_DIGI_RESULT_BYTES=2 +CONFIG_SOC_ADC_DIGI_DATA_BYTES_PER_CONV=4 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20 +CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9 +CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12 +CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y +CONFIG_SOC_CPU_CORES_NUM=2 +CONFIG_SOC_CPU_INTR_NUM=32 +CONFIG_SOC_CPU_HAS_FPU=y +CONFIG_SOC_CPU_BREAKPOINTS_NUM=2 +CONFIG_SOC_CPU_WATCHPOINTS_NUM=2 +CONFIG_SOC_CPU_WATCHPOINT_SIZE=64 +CONFIG_SOC_DAC_CHAN_NUM=2 +CONFIG_SOC_DAC_RESOLUTION=8 +CONFIG_SOC_DAC_DMA_16BIT_ALIGN=y +CONFIG_SOC_GPIO_PORT=1 +CONFIG_SOC_GPIO_PIN_COUNT=40 +CONFIG_SOC_GPIO_VALID_GPIO_MASK=0xFFFFFFFFFF +CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA +CONFIG_SOC_I2C_NUM=2 +CONFIG_SOC_I2C_FIFO_LEN=32 +CONFIG_SOC_I2C_SUPPORT_SLAVE=y +CONFIG_SOC_I2C_SUPPORT_APB=y +CONFIG_SOC_I2S_NUM=2 +CONFIG_SOC_I2S_HW_VERSION_1=y +CONFIG_SOC_I2S_SUPPORTS_APLL=y +CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y +CONFIG_SOC_I2S_SUPPORTS_PDM=y +CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y +CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1 +CONFIG_SOC_I2S_SUPPORTS_PDM_RX=y +CONFIG_SOC_I2S_PDM_MAX_RX_LINES=1 +CONFIG_SOC_I2S_SUPPORTS_ADC_DAC=y +CONFIG_SOC_I2S_SUPPORTS_ADC=y +CONFIG_SOC_I2S_SUPPORTS_DAC=y +CONFIG_SOC_I2S_SUPPORTS_LCD_CAMERA=y +CONFIG_SOC_I2S_TRANS_SIZE_ALIGN_WORD=y +CONFIG_SOC_I2S_LCD_I80_VARIANT=y +CONFIG_SOC_LCD_I80_SUPPORTED=y +CONFIG_SOC_LCD_I80_BUSES=2 +CONFIG_SOC_LCD_I80_BUS_WIDTH=24 +CONFIG_SOC_LEDC_HAS_TIMER_SPECIFIC_MUX=y +CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y +CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y +CONFIG_SOC_LEDC_SUPPORT_HS_MODE=y +CONFIG_SOC_LEDC_CHANNEL_NUM=8 +CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=20 +CONFIG_SOC_MCPWM_GROUPS=2 +CONFIG_SOC_MCPWM_TIMERS_PER_GROUP=3 +CONFIG_SOC_MCPWM_OPERATORS_PER_GROUP=3 +CONFIG_SOC_MCPWM_COMPARATORS_PER_OPERATOR=2 +CONFIG_SOC_MCPWM_GENERATORS_PER_OPERATOR=2 +CONFIG_SOC_MCPWM_TRIGGERS_PER_OPERATOR=2 +CONFIG_SOC_MCPWM_GPIO_FAULTS_PER_GROUP=3 +CONFIG_SOC_MCPWM_CAPTURE_TIMERS_PER_GROUP=y +CONFIG_SOC_MCPWM_CAPTURE_CHANNELS_PER_TIMER=3 +CONFIG_SOC_MCPWM_GPIO_SYNCHROS_PER_GROUP=3 +CONFIG_SOC_MMU_PERIPH_NUM=2 +CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=3 +CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000 +CONFIG_SOC_MPU_REGIONS_MAX_NUM=8 +CONFIG_SOC_PCNT_GROUPS=1 +CONFIG_SOC_PCNT_UNITS_PER_GROUP=8 +CONFIG_SOC_PCNT_CHANNELS_PER_UNIT=2 +CONFIG_SOC_PCNT_THRES_POINT_PER_UNIT=2 +CONFIG_SOC_RMT_GROUPS=1 +CONFIG_SOC_RMT_TX_CANDIDATES_PER_GROUP=8 +CONFIG_SOC_RMT_RX_CANDIDATES_PER_GROUP=8 +CONFIG_SOC_RMT_CHANNELS_PER_GROUP=8 +CONFIG_SOC_RMT_MEM_WORDS_PER_CHANNEL=64 +CONFIG_SOC_RMT_SUPPORT_REF_TICK=y +CONFIG_SOC_RMT_SUPPORT_APB=y +CONFIG_SOC_RMT_CHANNEL_CLK_INDEPENDENT=y +CONFIG_SOC_RTCIO_PIN_COUNT=18 +CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y +CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y +CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y +CONFIG_SOC_SDM_GROUPS=1 +CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8 +CONFIG_SOC_SDM_CLK_SUPPORT_APB=y +CONFIG_SOC_SPI_HD_BOTH_INOUT_SUPPORTED=y +CONFIG_SOC_SPI_AS_CS_SUPPORTED=y +CONFIG_SOC_SPI_PERIPH_NUM=3 +CONFIG_SOC_SPI_DMA_CHAN_NUM=2 +CONFIG_SOC_SPI_MAX_CS_NUM=3 +CONFIG_SOC_SPI_SUPPORT_CLK_APB=y +CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=64 +CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192 +CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_40M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_26M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_20M_SUPPORTED=y +CONFIG_SOC_TIMER_GROUPS=2 +CONFIG_SOC_TIMER_GROUP_TIMERS_PER_GROUP=2 +CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=64 +CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=4 +CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y +CONFIG_SOC_TOUCH_VERSION_1=y +CONFIG_SOC_TOUCH_SENSOR_NUM=10 +CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF +CONFIG_SOC_TWAI_CONTROLLER_NUM=1 +CONFIG_SOC_TWAI_BRP_MIN=2 +CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y +CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y +CONFIG_SOC_UART_NUM=3 +CONFIG_SOC_UART_SUPPORT_APB_CLK=y +CONFIG_SOC_UART_SUPPORT_REF_TICK=y +CONFIG_SOC_UART_FIFO_LEN=128 +CONFIG_SOC_UART_BITRATE_MAX=5000000 +CONFIG_SOC_SPIRAM_SUPPORTED=y +CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y +CONFIG_SOC_SHA_SUPPORT_PARALLEL_ENG=y +CONFIG_SOC_SHA_SUPPORT_SHA1=y +CONFIG_SOC_SHA_SUPPORT_SHA256=y +CONFIG_SOC_SHA_SUPPORT_SHA384=y +CONFIG_SOC_SHA_SUPPORT_SHA512=y +CONFIG_SOC_RSA_MAX_BIT_LEN=4096 +CONFIG_SOC_AES_SUPPORT_AES_128=y +CONFIG_SOC_AES_SUPPORT_AES_192=y +CONFIG_SOC_AES_SUPPORT_AES_256=y +CONFIG_SOC_SECURE_BOOT_V1=y +CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=y +CONFIG_SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX=32 +CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21 +CONFIG_SOC_PM_SUPPORT_EXT0_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_EXT1_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y +CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y +CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y +CONFIG_SOC_PM_SUPPORT_RC_FAST_PD=y +CONFIG_SOC_PM_SUPPORT_VDDSDIO_PD=y +CONFIG_SOC_PM_SUPPORT_MODEM_PD=y +CONFIG_SOC_CONFIGURABLE_VDDSDIO_SUPPORTED=y +CONFIG_SOC_CLK_APLL_SUPPORTED=y +CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000 +CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000 +CONFIG_SOC_APLL_MIN_HZ=5303031 +CONFIG_SOC_APLL_MAX_HZ=125000000 +CONFIG_SOC_CLK_RC_FAST_D256_SUPPORTED=y +CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y +CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y +CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y +CONFIG_SOC_SDMMC_USE_IOMUX=y +CONFIG_SOC_SDMMC_NUM_SLOTS=2 +CONFIG_SOC_WIFI_WAPI_SUPPORT=y +CONFIG_SOC_WIFI_CSI_SUPPORT=y +CONFIG_SOC_WIFI_MESH_SUPPORT=y +CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y +CONFIG_SOC_WIFI_NAN_SUPPORT=y +CONFIG_SOC_BLE_SUPPORTED=y +CONFIG_SOC_BLE_MESH_SUPPORTED=y +CONFIG_SOC_BT_CLASSIC_SUPPORTED=y CONFIG_IDF_CMAKE=y +CONFIG_IDF_TARGET_ARCH_XTENSA=y +CONFIG_IDF_TARGET_ARCH="xtensa" CONFIG_IDF_TARGET="esp32" CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set -# end of SDK tool configuration - -# # Build type # CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y -# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set +# CONFIG_APP_BUILD_TYPE_RAM is not set CONFIG_APP_BUILD_GENERATE_BINARIES=y CONFIG_APP_BUILD_BOOTLOADER=y CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y +# CONFIG_APP_REPRODUCIBLE_BUILD is not set +# CONFIG_APP_NO_BLOBS is not set +# CONFIG_APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # end of Build type # -# Application manager -# -CONFIG_APP_COMPILE_TIME_DATE=y -# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set -# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set -# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set -CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 -# end of Application manager - -# # Bootloader config # +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set @@ -52,30 +247,53 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y # CONFIG_BOOTLOADER_FACTORY_RESET is not set # CONFIG_BOOTLOADER_APP_TEST is not set +CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE=y # CONFIG_BOOTLOADER_WDT_ENABLE is not set # CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set +# CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set +# CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set +CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # end of Bootloader config # # Security features # +CONFIG_SECURE_BOOT_V1_SUPPORTED=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set # end of Security features # +# Application manager +# +CONFIG_APP_COMPILE_TIME_DATE=y +# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set +# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set +# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set +CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 +# end of Application manager + +CONFIG_ESP_ROM_HAS_CRC_LE=y +CONFIG_ESP_ROM_HAS_CRC_BE=y +CONFIG_ESP_ROM_HAS_MZ_CRC32=y +CONFIG_ESP_ROM_HAS_JPEG_DECODE=y +CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y +CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y +CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y + +# # Serial flasher config # -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_WITH_STUB=y +# CONFIG_ESPTOOLPY_NO_STUB is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set 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 is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y @@ -87,22 +305,17 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="4MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y # CONFIG_ESPTOOLPY_AFTER_NORESET is not set CONFIG_ESPTOOLPY_AFTER="hard_reset" -# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y -# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # end of Serial flasher config @@ -110,6 +323,7 @@ # Partition Table # # CONFIG_PARTITION_TABLE_SINGLE_APP is not set +# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" @@ -142,6 +356,10 @@ 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=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 +# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set +CONFIG_COMPILER_HIDE_PATHS_MACROS=y # CONFIG_COMPILER_CXX_EXCEPTIONS is not set # CONFIG_COMPILER_CXX_RTTI is not set # CONFIG_COMPILER_STACK_CHECK_MODE_NONE is not set @@ -150,7 +368,8 @@ # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set CONFIG_COMPILER_STACK_CHECK=y # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set -# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set +# CONFIG_COMPILER_DISABLE_GCC12_WARNINGS is not set +# CONFIG_COMPILER_DUMP_RTL_FILES is not set # end of Compiler options # @@ -160,8 +379,12 @@ # # Application Level Tracing # -# CONFIG_APPTRACE_DEST_TRAX is not set +# CONFIG_APPTRACE_DEST_JTAG is not set CONFIG_APPTRACE_DEST_NONE=y +# CONFIG_APPTRACE_DEST_UART1 is not set +# CONFIG_APPTRACE_DEST_UART2 is not set +CONFIG_APPTRACE_DEST_UART_NONE=y +CONFIG_APPTRACE_UART_TASK_PRIO=1 CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing @@ -169,64 +392,122 @@ # Bluetooth # # CONFIG_BT_ENABLED is not set -CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 -CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 -CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 -CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 -CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 -CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -CONFIG_BT_RESERVE_DRAM=0 # end of Bluetooth # -# CoAP Configuration -# -CONFIG_COAP_MBEDTLS_PSK=y -# CONFIG_COAP_MBEDTLS_PKI is not set -# CONFIG_COAP_MBEDTLS_DEBUG is not set -CONFIG_COAP_LOG_DEFAULT_LEVEL=0 -# end of CoAP Configuration - -# -# Driver configurations +# Driver Configurations # # -# ADC configuration +# Legacy ADC Configuration # -# CONFIG_ADC_FORCE_XPD_FSM is not set CONFIG_ADC_DISABLE_DAC=y -# end of ADC configuration +# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set # -# SPI configuration +# Legacy ADC Calibration Configuration +# +# CONFIG_ADC_CAL_EFUSE_TP_ENABLE is not set +# CONFIG_ADC_CAL_EFUSE_VREF_ENABLE is not set +# CONFIG_ADC_CAL_LUT_ENABLE is not set +# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set +# end of Legacy ADC Calibration Configuration +# end of Legacy ADC Configuration + +# +# SPI Configuration # # CONFIG_SPI_MASTER_IN_IRAM is not set CONFIG_SPI_MASTER_ISR_IN_IRAM=y # CONFIG_SPI_SLAVE_IN_IRAM is not set CONFIG_SPI_SLAVE_ISR_IN_IRAM=y -# end of SPI configuration +# end of SPI Configuration + +# +# TWAI Configuration +# +# CONFIG_TWAI_ISR_IN_IRAM is not set +CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y +CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y +CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y +CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y +CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y +# end of TWAI Configuration + +# +# UART Configuration +# +# CONFIG_UART_ISR_IN_IRAM is not set +# end of UART Configuration # -# TWAI configuration +# GPIO Configuration +# +# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set +# CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set +# end of GPIO Configuration + +# +# Sigma Delta Modulator Configuration # -# CONFIG_TWAI_ISR_IN_IRAM is not set -# end of TWAI configuration +# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set +# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_SDM_ENABLE_DEBUG_LOG is not set +# end of Sigma Delta Modulator Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set +# end of GPTimer Configuration # -# UART configuration +# PCNT Configuration # -# CONFIG_UART_ISR_IN_IRAM is not set -# end of UART configuration +# CONFIG_PCNT_CTRL_FUNC_IN_IRAM is not set +# CONFIG_PCNT_ISR_IRAM_SAFE is not set +# CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_PCNT_ENABLE_DEBUG_LOG is not set +# end of PCNT Configuration + +# +# RMT Configuration +# +# CONFIG_RMT_ISR_IRAM_SAFE is not set +# CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_RMT_ENABLE_DEBUG_LOG is not set +# end of RMT Configuration # -# RTCIO configuration +# MCPWM Configuration +# +# CONFIG_MCPWM_ISR_IRAM_SAFE is not set +# CONFIG_MCPWM_CTRL_FUNC_IN_IRAM is not set +# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set +# end of MCPWM Configuration + +# +# I2S Configuration # -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration -# end of Driver configurations +# CONFIG_I2S_ISR_IRAM_SAFE is not set +# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_I2S_ENABLE_DEBUG_LOG is not set +# end of I2S Configuration + +# +# DAC Configuration +# +# CONFIG_DAC_CTRL_FUNC_IN_IRAM is not set +# CONFIG_DAC_ISR_IRAM_SAFE is not set +# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_DAC_ENABLE_DEBUG_LOG is not set +CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y +# end of DAC Configuration +# end of Driver Configurations # # eFuse Bit Manager @@ -244,107 +525,38 @@ # CONFIG_ESP_TLS_USING_MBEDTLS=y # CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set +# 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 is not set # end of ESP-TLS # -# ESP32-specific +# ADC and ADC Calibration # -CONFIG_ESP32_REV_MIN_0=y -# CONFIG_ESP32_REV_MIN_1 is not set -# CONFIG_ESP32_REV_MIN_2 is not set -# CONFIG_ESP32_REV_MIN_3 is not set -CONFIG_ESP32_REV_MIN=0 -CONFIG_ESP32_DPORT_WORKAROUND=y -# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set -# CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -# CONFIG_ESP32_SPIRAM_SUPPORT is not set -# CONFIG_ESP32_TRAX is not set -CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO=y -# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR is not set -CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=2 -# CONFIG_ESP32_ULP_COPROC_ENABLED is not set -CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 -# CONFIG_ESP32_DEBUG_OCDAWARE is not set -CONFIG_ESP32_BROWNOUT_DET=y -CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set -CONFIG_ESP32_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set -CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32_XTAL_FREQ_40=y -# CONFIG_ESP32_XTAL_FREQ_26 is not set -# CONFIG_ESP32_XTAL_FREQ_AUTO is not set -CONFIG_ESP32_XTAL_FREQ=40 -# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_ESP32_NO_BLOBS is not set -# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set -# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set -CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 -# end of ESP32-specific +# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set +# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set # -# Power Management +# ADC Calibration Configurations # -# CONFIG_PM_ENABLE is not set -# end of Power Management +CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y +CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CALI_LUT_ENABLE=y +# end of ADC Calibration Configurations + +CONFIG_ADC_DISABLE_DAC_OUTPUT=y +# end of ADC and ADC Calibration # -# ADC-Calibration +# Wireless Coexistence # -# CONFIG_ADC_CAL_EFUSE_TP_ENABLE is not set -# CONFIG_ADC_CAL_EFUSE_VREF_ENABLE is not set -# CONFIG_ADC_CAL_LUT_ENABLE is not set -# end of ADC-Calibration +# end of Wireless Coexistence # # Common ESP-related # -# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set -CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584 -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y -CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 -CONFIG_ESP_CONSOLE_UART_DEFAULT=y -# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set -# CONFIG_ESP_CONSOLE_UART_NONE is not set -CONFIG_ESP_CONSOLE_UART_NUM=0 -CONFIG_ESP_CONSOLE_UART_TX_GPIO=1 -CONFIG_ESP_CONSOLE_UART_RX_GPIO=3 -CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_INT_WDT=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 -CONFIG_ESP_INT_WDT_CHECK_CPU1=y -CONFIG_ESP_TASK_WDT=y -# CONFIG_ESP_TASK_WDT_PANIC is not set -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_ESP_PANIC_HANDLER_IRAM is not set -CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y -CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y -CONFIG_ESP_MAC_ADDR_UNIVERSE_BT_OFFSET=1 +CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # end of Common ESP-related # @@ -359,7 +571,8 @@ # Event Loop Library # # CONFIG_ESP_EVENT_LOOP_PROFILING is not set -# CONFIG_ESP_EVENT_POST_FROM_ISR is not set +CONFIG_ESP_EVENT_POST_FROM_ISR=y +CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y # end of Event Loop Library # @@ -372,6 +585,7 @@ # # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set +# CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH is not set # end of ESP HTTP client # @@ -383,12 +597,14 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 # CONFIG_HTTPD_LOG_PURGE_DATA is not set # CONFIG_HTTPD_WS_SUPPORT is not set +# CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set # end of HTTP Server # # ESP HTTPS OTA # -# CONFIG_OTA_ALLOW_HTTP is not set +# CONFIG_ESP_HTTPS_OTA_DECRYPT_CB is not set +# CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP is not set # end of ESP HTTPS OTA # @@ -398,77 +614,318 @@ # end of ESP HTTPS server # +# Hardware Settings +# + +# +# Chip revision +# +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 +CONFIG_ESP_REV_MIN_FULL=0 + +# +# Maximum Supported ESP32 Revision (Rev v3.99) +# +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 +# end of Chip revision + +# +# MAC Config +# +CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y +CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y +CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_TWO=y +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO=y +# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR is not set +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=2 +# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set +# end of MAC Config + +# +# Sleep Config +# +# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set +CONFIG_ESP_SLEEP_RTC_BUS_ISO_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 +CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000 +# end of Sleep Config + +# +# RTC Clock Config +# +CONFIG_RTC_CLK_SRC_INT_RC=y +# CONFIG_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_RTC_CLK_CAL_CYCLES=1024 +# end of RTC Clock Config + +# +# Peripheral Control +# +CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y +# end of Peripheral Control + +# +# Main XTAL Config +# +# CONFIG_XTAL_FREQ_26 is not set +CONFIG_XTAL_FREQ_40=y +# CONFIG_XTAL_FREQ_AUTO is not set +CONFIG_XTAL_FREQ=40 +# end of Main XTAL Config +# end of Hardware Settings + +# +# LCD and Touch Panel +# + +# +# LCD Touch Drivers are maintained in the IDF Component Registry +# + +# +# LCD Peripheral Configuration +# +CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 +# CONFIG_LCD_ENABLE_DEBUG_LOG is not set +# end of LCD Peripheral Configuration +# end of LCD and Touch Panel + +# +# ESP Memory Management +# + +# +# MMAP Configuration +# +# end of ESP Memory Management + +# # ESP NETIF Adapter # CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120 CONFIG_ESP_NETIF_TCPIP_LWIP=y # CONFIG_ESP_NETIF_LOOPBACK is not set -# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set +CONFIG_ESP_NETIF_USES_TCPIP_WITH_BSD_API=y +# CONFIG_ESP_NETIF_L2_TAP is not set +# CONFIG_ESP_NETIF_BRIDGE_EN is not set # end of ESP NETIF Adapter # +# Partition API Configuration +# +# end of Partition API Configuration + +# +# 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=y +# end of PHY + +# +# Power Management +# +# CONFIG_PM_ENABLE is not set +# end of Power Management + +# +# ESP PSRAM +# +# CONFIG_SPIRAM is not set +# end of ESP PSRAM + +# +# ESP Ringbuf +# +# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set +# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set +# end of ESP Ringbuf + +# # ESP System Settings # +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 is not set +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 + +# +# Memory +# +# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set +# end of Memory + +# +# Trace memory +# +# CONFIG_ESP32_TRAX is not set +CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 +# end of Trace memory + # CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set # CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set +# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set + +# +# Memory protection +# +# end of Memory protection + +CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 +CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584 +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y +# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set +# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 +CONFIG_ESP_CONSOLE_UART_DEFAULT=y +# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set +# CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_UART=y +CONFIG_ESP_CONSOLE_MULTIPLE_UART=y +CONFIG_ESP_CONSOLE_UART_NUM=0 +CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 +CONFIG_ESP_INT_WDT=y +CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 +CONFIG_ESP_INT_WDT_CHECK_CPU1=y +CONFIG_ESP_TASK_WDT_EN=y +CONFIG_ESP_TASK_WDT_INIT=y +# CONFIG_ESP_TASK_WDT_PANIC is not set +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_ESP_PANIC_HANDLER_IRAM is not set +# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set +# CONFIG_ESP_DEBUG_OCDAWARE is not set +# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set +CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y + +# +# Brownout Detector +# +CONFIG_ESP_BROWNOUT_DET=y +CONFIG_ESP_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_ESP_BROWNOUT_DET_LVL=0 +# end of Brownout Detector + +# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set +CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y # end of ESP System Settings # +# IPC (Inter-Processor Call) +# +CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 +CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y +CONFIG_ESP_IPC_ISR_ENABLE=y +# end of IPC (Inter-Processor Call) + +# # High resolution timer (esp_timer) # # CONFIG_ESP_TIMER_PROFILING is not set +CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y +CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 -# CONFIG_ESP_TIMER_IMPL_FRC2 is not set +CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 +# CONFIG_ESP_TIMER_SHOW_EXPERIMENTAL is not set +CONFIG_ESP_TIMER_TASK_AFFINITY=0x0 +CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y +CONFIG_ESP_TIMER_ISR_AFFINITY=0x1 +CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y +# CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # end of High resolution timer (esp_timer) # # Wi-Fi # -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 -CONFIG_ESP32_WIFI_RX_BA_WIN=6 -CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y -# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set -CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 -CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set -# CONFIG_ESP32_WIFI_IRAM_OPT is not set -# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set -CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y +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 +CONFIG_ESP_WIFI_RX_BA_WIN=6 +CONFIG_ESP_WIFI_NVS_ENABLED=y +CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y +# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set +CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP_WIFI_IRAM_OPT=y +CONFIG_ESP_WIFI_RX_IRAM_OPT=y +CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y +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_STA_DISCONNECTED_PM_ENABLE=y +# 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_NAN_ENABLE is not set +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_WPS_STRICT 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_DEBUG_PRINT is not set +# CONFIG_ESP_WIFI_TESTING_OPTIONS is not set # end of Wi-Fi # -# PHY -# -# CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE is not set -# 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 -# end of PHY - -# # Core dump # -# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set -# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set -CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set +# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set +CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # end of Core dump # # FAT Filesystem support # +CONFIG_FATFS_VOLUME_COUNT=2 +# CONFIG_FATFS_LFN_NONE is not set +CONFIG_FATFS_LFN_HEAP=y +# CONFIG_FATFS_LFN_STACK is not set +# CONFIG_FATFS_SECTOR_512 is not set +CONFIG_FATFS_SECTOR_4096=y # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set CONFIG_FATFS_CODEPAGE_437=y # CONFIG_FATFS_CODEPAGE_720 is not set @@ -492,76 +949,79 @@ # CONFIG_FATFS_CODEPAGE_949 is not set # CONFIG_FATFS_CODEPAGE_950 is not set CONFIG_FATFS_CODEPAGE=437 -# CONFIG_FATFS_LFN_NONE is not set -CONFIG_FATFS_LFN_HEAP=y -# CONFIG_FATFS_LFN_STACK is not set CONFIG_FATFS_MAX_LFN=255 CONFIG_FATFS_API_ENCODING_ANSI_OEM=y -# CONFIG_FATFS_API_ENCODING_UTF_16 is not set # CONFIG_FATFS_API_ENCODING_UTF_8 is not set CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 # CONFIG_FATFS_PER_FILE_CACHE is not set +# CONFIG_FATFS_USE_FASTSEEK is not set +CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0 # end of FAT Filesystem support # -# Modbus configuration -# -CONFIG_FMB_COMM_MODE_RTU_EN=y -# CONFIG_FMB_COMM_MODE_ASCII_EN is not set -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_SLAVE_ID_SUPPORT is not set -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_FMB_TIMER_ISR_IN_IRAM is not set -# end of Modbus configuration - -# # FreeRTOS # + +# +# Kernel +# +# CONFIG_FREERTOS_SMP is not set # CONFIG_FREERTOS_UNICORE is not set -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_CORETIMER_0=y -# CONFIG_FREERTOS_CORETIMER_1 is not set CONFIG_FREERTOS_HZ=1000 -# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE=y # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY is not set -# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 -# CONFIG_FREERTOS_LEGACY_HOOKS is not set +CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 +# CONFIG_FREERTOS_USE_IDLE_HOOK is not set +# CONFIG_FREERTOS_USE_TICK_HOOK is not set CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y -# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set +# CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY is not set 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_TASK_NOTIFICATION_ARRAY_ENTRIES=1 # CONFIG_FREERTOS_USE_TRACE_FACILITY is not set # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set +# end of Kernel + +# +# Port +# +# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set +CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y +# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y +CONFIG_FREERTOS_ISR_STACKSIZE=1536 +CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y +# CONFIG_FREERTOS_FPU_IN_ISR is not set +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y +# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set +# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set -# CONFIG_FREERTOS_FPU_IN_ISR is not set +CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y +# end of Port + +CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF +CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y # end of FreeRTOS # +# Hardware Abstraction Layer (HAL) and Low Level (LL) +# +CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y +# CONFIG_HAL_ASSERTION_DISABLE is not set +# CONFIG_HAL_ASSERTION_SILENT is not set +# CONFIG_HAL_ASSERTION_ENABLE is not set +CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 +# end of Hardware Abstraction Layer (HAL) and Low Level (LL) + +# # Heap memory debugging # # CONFIG_HEAP_POISONING_DISABLED is not set @@ -575,19 +1035,6 @@ # end of Heap memory debugging # -# jsmn -# -# CONFIG_JSMN_PARENT_LINKS is not set -# CONFIG_JSMN_STRICT is not set -# end of jsmn - -# -# libsodium -# -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of libsodium - -# # Log output # # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set @@ -597,6 +1044,10 @@ # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y +# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set +# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set +CONFIG_LOG_MAXIMUM_LEVEL=3 CONFIG_LOG_COLORS=y # CONFIG_LOG_TIMESTAMP_SOURCE_RTOS is not set CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM=y @@ -606,6 +1057,9 @@ # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# CONFIG_LWIP_NETIF_API is not set +# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set +# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set # CONFIG_LWIP_IRAM_OPTIMIZATION is not set @@ -621,31 +1075,43 @@ CONFIG_LWIP_IP6_FRAG=y # CONFIG_LWIP_IP4_REASSEMBLY is not set # CONFIG_LWIP_IP6_REASSEMBLY is not set +CONFIG_LWIP_IP_REASS_MAX_PBUFS=10 # CONFIG_LWIP_IP_FORWARD is not set # CONFIG_LWIP_STATS is not set -# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 +CONFIG_LWIP_ESP_MLDV6_REPORT=y +CONFIG_LWIP_MLDV6_TMR_INTERVAL=40 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 -# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set +CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y +# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set +CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set +CONFIG_LWIP_DHCP_OPTIONS_LEN=68 +CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0 +CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1 # # DHCP server # +CONFIG_LWIP_DHCPS=y CONFIG_LWIP_DHCPS_LEASE_UNIT=60 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=4 # end of DHCP server # CONFIG_LWIP_AUTOIP is not set +CONFIG_LWIP_IPV4=y +CONFIG_LWIP_IPV6=y # CONFIG_LWIP_IPV6_AUTOCONFIG is not set +CONFIG_LWIP_IPV6_NUM_ADDRESSES=3 +# CONFIG_LWIP_IPV6_FORWARD is not set +# CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set CONFIG_LWIP_NETIF_LOOPBACK=y CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 # # TCP # -CONFIG_LWIP_TCP_ISN_HOOK=y CONFIG_LWIP_MAX_ACTIVE_TCP=16 CONFIG_LWIP_MAX_LISTENING_TCP=16 CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y @@ -654,12 +1120,12 @@ CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 +CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744 CONFIG_LWIP_TCP_WND_DEFAULT=5744 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y # CONFIG_LWIP_TCP_SACK_OUT is not set -# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set @@ -673,7 +1139,15 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 # end of UDP -CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560 +# +# Checksums +# +# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set +# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set +CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y +# end of Checksums + +CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set @@ -681,10 +1155,12 @@ # CONFIG_LWIP_PPP_SUPPORT is not set CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5 +# CONFIG_LWIP_SLIP_SUPPORT is not set # # ICMP # +CONFIG_LWIP_ICMP=y # CONFIG_LWIP_MULTICAST_PING is not set # CONFIG_LWIP_BROADCAST_PING is not set # end of ICMP @@ -698,11 +1174,35 @@ # # SNTP # -CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=3 +CONFIG_LWIP_SNTP_MAX_SERVERS=1 +# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 # end of SNTP +CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7 CONFIG_LWIP_ESP_LWIP_ASSERT=y + +# +# Hooks +# +# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set +CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y +# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set +CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y +# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set +# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set +CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y +# CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set +# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set +CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y +# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set +# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set +CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +# CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT is not set +# CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM is not set +# end of Hooks + +# CONFIG_LWIP_DEBUG is not set # end of LWIP # @@ -713,10 +1213,26 @@ # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set -# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set # CONFIG_MBEDTLS_DEBUG is not set # +# mbedTLS v3.x related +# +# CONFIG_MBEDTLS_SSL_PROTO_TLS1_3 is not set +# CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH is not set +# CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set +# CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set +CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y + +# +# DTLS-based configurations +# +# CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID is not set +# CONFIG_MBEDTLS_SSL_DTLS_SRTP is not set +# end of DTLS-based configurations +# end of mbedTLS v3.x related + +# # Certificate Bundle # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y @@ -724,6 +1240,7 @@ # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 # end of Certificate Bundle # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set @@ -731,9 +1248,11 @@ CONFIG_MBEDTLS_HARDWARE_AES=y # CONFIG_MBEDTLS_HARDWARE_MPI is not set # CONFIG_MBEDTLS_HARDWARE_SHA is not set +CONFIG_MBEDTLS_ROM_MD5=y # CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set # CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set CONFIG_MBEDTLS_HAVE_TIME=y +# CONFIG_MBEDTLS_PLATFORM_TIME_ALT is not set # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y CONFIG_MBEDTLS_SHA512_C=y @@ -750,11 +1269,9 @@ # CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=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 @@ -763,10 +1280,8 @@ # end of TLS Key Exchange Methods CONFIG_MBEDTLS_SSL_RENEGOTIATION=y -# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y +# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set CONFIG_MBEDTLS_SSL_PROTO_DTLS=y CONFIG_MBEDTLS_SSL_ALPN=y CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y @@ -778,13 +1293,11 @@ CONFIG_MBEDTLS_AES_C=y # CONFIG_MBEDTLS_CAMELLIA_C is not set # CONFIG_MBEDTLS_DES_C is not set -CONFIG_MBEDTLS_RC4_DISABLED=y -# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set -# CONFIG_MBEDTLS_RC4_ENABLED is not set # CONFIG_MBEDTLS_BLOWFISH_C is not set # CONFIG_MBEDTLS_XTEA_C is not set CONFIG_MBEDTLS_CCM_C=y CONFIG_MBEDTLS_GCM_C=y +# CONFIG_MBEDTLS_NIST_KW_C is not set # end of Symmetric Ciphers # CONFIG_MBEDTLS_RIPEMD160_C is not set @@ -799,6 +1312,7 @@ # end of Certificates CONFIG_MBEDTLS_ECP_C=y +# CONFIG_MBEDTLS_DHM_C is not set CONFIG_MBEDTLS_ECDH_C=y CONFIG_MBEDTLS_ECDSA_C=y # CONFIG_MBEDTLS_ECJPAKE_C is not set @@ -823,26 +1337,15 @@ # end of mbedTLS # -# mDNS -# -CONFIG_MDNS_MAX_SERVICES=5 -CONFIG_MDNS_TASK_PRIORITY=1 -CONFIG_MDNS_TASK_STACK_SIZE=4096 -# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set -CONFIG_MDNS_TASK_AFFINITY_CPU0=y -# CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set -CONFIG_MDNS_TASK_AFFINITY=0x0 -CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000 -# CONFIG_MDNS_STRICT_MODE is not set -CONFIG_MDNS_TIMER_PERIOD_MS=100 -# end of mDNS - -# # ESP-MQTT Configurations # # CONFIG_MQTT_PROTOCOL_311 is not set +# CONFIG_MQTT_PROTOCOL_5 is not set # CONFIG_MQTT_TRANSPORT_SSL is not set # CONFIG_MQTT_TRANSPORT_WEBSOCKET is not set +# CONFIG_MQTT_MSG_ID_INCREMENTAL is not set +# CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set +# CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set # CONFIG_MQTT_USE_CUSTOM_CONFIG is not set # CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set # CONFIG_MQTT_CUSTOM_OUTBOX is not set @@ -858,20 +1361,31 @@ # CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y # CONFIG_NEWLIB_NANO_FORMAT is not set +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y +# CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC is not set +# CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT is not set +# CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE is not set # end of Newlib # # NVS # +# CONFIG_NVS_ASSERT_ERROR_CHECK is not set # end of NVS # -# OpenSSL +# OpenThread +# +# CONFIG_OPENTHREAD_ENABLED is not set +# end of OpenThread + # -# CONFIG_OPENSSL_DEBUG is not set -CONFIG_OPENSSL_ASSERT_DO_NOTHING=y -# CONFIG_OPENSSL_ASSERT_EXIT is not set -# end of OpenSSL +# Protocomm +# +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2=y +# end of Protocomm # # PThreads @@ -887,6 +1401,14 @@ # end of PThreads # +# MMU Config +# +CONFIG_MMU_PAGE_SIZE_64KB=y +CONFIG_MMU_PAGE_MODE="64KB" +CONFIG_MMU_PAGE_SIZE=0x10000 +# end of MMU Config + +# # SPI Flash driver # # CONFIG_SPI_FLASH_VERIFY_WRITE is not set @@ -895,20 +1417,37 @@ CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set -# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1 +CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192 # CONFIG_SPI_FLASH_SIZE_OVERRIDE is not set +# CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set +# CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set + +# +# SPI Flash behavior when brownout +# +CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y +CONFIG_SPI_FLASH_BROWNOUT_RESET=y +# end of SPI Flash behavior when brownout # # Auto-detect flash chips # +CONFIG_SPI_FLASH_VENDOR_XMC_SUPPORTED=y +CONFIG_SPI_FLASH_VENDOR_GD_SUPPORTED=y +CONFIG_SPI_FLASH_VENDOR_ISSI_SUPPORTED=y +CONFIG_SPI_FLASH_VENDOR_MXIC_SUPPORTED=y +CONFIG_SPI_FLASH_VENDOR_WINBOND_SUPPORTED=y CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y +# CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP is not set +# CONFIG_SPI_FLASH_SUPPORT_TH_CHIP is not set # end of Auto-detect flash chips # CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE is not set @@ -934,39 +1473,47 @@ CONFIG_SPIFFS_OBJ_NAME_LEN=32 # CONFIG_SPIFFS_FOLLOW_SYMLINKS is not set CONFIG_SPIFFS_USE_MAGIC=y -# CONFIG_SPIFFS_USE_MAGIC_LENGTH is not set +CONFIG_SPIFFS_USE_MAGIC_LENGTH=y CONFIG_SPIFFS_META_LENGTH=4 CONFIG_SPIFFS_USE_MTIME=y # # Debug Configuration # -CONFIG_SPIFFS_DBG=y -CONFIG_SPIFFS_API_DBG=y +# CONFIG_SPIFFS_DBG is not set +# CONFIG_SPIFFS_API_DBG is not set # CONFIG_SPIFFS_GC_DBG is not set # CONFIG_SPIFFS_CACHE_DBG is not set -CONFIG_SPIFFS_CHECK_DBG=y +# CONFIG_SPIFFS_CHECK_DBG is not set # CONFIG_SPIFFS_TEST_VISUALISATION is not set # end of Debug Configuration # end of SPIFFS Configuration # -# TinyUSB +# TCP Transport # # -# Descriptor configuration +# Websocket # -CONFIG_USB_DESC_CUSTOM_VID=0x1234 -CONFIG_USB_DESC_CUSTOM_PID=0x5678 -# end of Descriptor configuration -# end of TinyUSB +CONFIG_WS_TRANSPORT=y +CONFIG_WS_BUFFER_SIZE=1024 +# CONFIG_WS_DYNAMIC_BUFFER is not set +# 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 # CONFIG_UNITY_ENABLE_FLOAT=y CONFIG_UNITY_ENABLE_DOUBLE=y +# CONFIG_UNITY_ENABLE_64BIT is not set # CONFIG_UNITY_ENABLE_COLOR is not set CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # CONFIG_UNITY_ENABLE_FIXTURE is not set @@ -974,6 +1521,11 @@ # end of Unity unit testing library # +# Root Hub configuration +# +# end of Root Hub configuration + +# # Virtual file system # CONFIG_VFS_SUPPORT_IO=y @@ -986,7 +1538,6 @@ # Host File System I/O (Semihosting) # CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 # end of Host File System I/O (Semihosting) # end of Virtual file system @@ -1003,18 +1554,12 @@ # CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 +# CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set +CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y +# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set # end of Wi-Fi Provisioning Manager # -# Supplicant -# -CONFIG_WPA_MBEDTLS_CRYPTO=y -# CONFIG_WPA_DEBUG_PRINT is not set -# CONFIG_WPA_TESTING_OPTIONS is not set -# CONFIG_WPA_WPS_WARS is not set -# end of Supplicant - -# # WebSocket Server # CONFIG_WEBSOCKET_SERVER_MAX_CLIENTS=10 @@ -1025,14 +1570,12 @@ # end of WebSocket Server # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32-elf-" +# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set +# CONFIG_NO_BLOBS is not set +# CONFIG_ESP32_NO_BLOBS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set @@ -1046,20 +1589,15 @@ # CONFIG_FLASHMODE_QOUT is not set CONFIG_FLASHMODE_DIO=y # CONFIG_FLASHMODE_DOUT is not set -# CONFIG_MONITOR_BAUD_9600B is not set -# CONFIG_MONITOR_BAUD_57600B is not set -CONFIG_MONITOR_BAUD_115200B=y -# CONFIG_MONITOR_BAUD_230400B is not set -# CONFIG_MONITOR_BAUD_921600B is not set -# CONFIG_MONITOR_BAUD_2MB is not set -# CONFIG_MONITOR_BAUD_OTHER is not set -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_MONITOR_BAUD=115200 +# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set +CONFIG_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y # CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set +CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2 # CONFIG_CXX_EXCEPTIONS is not set # CONFIG_STACK_CHECK_NONE is not set CONFIG_STACK_CHECK_NORM=y @@ -1067,87 +1605,138 @@ # CONFIG_STACK_CHECK_ALL is not set CONFIG_STACK_CHECK=y # CONFIG_WARN_WRITE_STRINGS is not set -# CONFIG_DISABLE_GCC8_WARNINGS is not set # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 CONFIG_ADC2_DISABLE_DAC=y -# CONFIG_SPIRAM_SUPPORT is not set -CONFIG_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_MCPWM_ISR_IN_IRAM is not set +# CONFIG_EVENT_LOOP_PROFILING is not set +CONFIG_POST_EVENTS_FROM_ISR=y +CONFIG_POST_EVENTS_FROM_IRAM_ISR=y +# CONFIG_OTA_ALLOW_HTTP is not set CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=y # CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS is not set CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=2 -# CONFIG_ULP_COPROC_ENABLED is not set -CONFIG_ULP_COPROC_RESERVE_MEM=0 -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y -# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set -CONFIG_BROWNOUT_DET_LVL=0 +# CONFIG_ESP_SYSTEM_PD_FLASH is not set +CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y +# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set +# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set +# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set +CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 +# CONFIG_ESP32_XTAL_FREQ_26 is not set +CONFIG_ESP32_XTAL_FREQ_40=y +# CONFIG_ESP32_XTAL_FREQ_AUTO is not set +CONFIG_ESP32_XTAL_FREQ=40 +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=y -CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y -# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set -# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set -# CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set -# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_NO_BLOBS is not set -# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +CONFIG_ESP32_REDUCE_PHY_TX_POWER=y +# CONFIG_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set +# CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 +CONFIG_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_PANIC_PRINT_HALT is not set +# CONFIG_ESP32_PANIC_PRINT_REBOOT is not set +CONFIG_ESP32_PANIC_SILENT_REBOOT=y +# CONFIG_ESP32_PANIC_GDBSTUB is not set CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_MAIN_TASK_STACK_SIZE=3584 -CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_CONSOLE_UART_DEFAULT=y # CONFIG_CONSOLE_UART_CUSTOM is not set # CONFIG_CONSOLE_UART_NONE is not set +# CONFIG_ESP_CONSOLE_UART_NONE is not set +CONFIG_CONSOLE_UART=y CONFIG_CONSOLE_UART_NUM=0 -CONFIG_CONSOLE_UART_TX_GPIO=1 -CONFIG_CONSOLE_UART_RX_GPIO=3 CONFIG_CONSOLE_UART_BAUDRATE=115200 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_INT_WDT_CHECK_CPU1=y CONFIG_TASK_WDT=y +CONFIG_ESP_TASK_WDT=y # CONFIG_TASK_WDT_PANIC is not set CONFIG_TASK_WDT_TIMEOUT_S=5 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -# CONFIG_EVENT_LOOP_PROFILING is not set -# CONFIG_POST_EVENTS_FROM_ISR is not set -# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set -# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set -CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y -# CONFIG_ESP32S2_PANIC_GDBSTUB is not set +# CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set +# CONFIG_ESP32_DEBUG_OCDAWARE is not set +CONFIG_BROWNOUT_DET=y +CONFIG_ESP32_BROWNOUT_DET=y +CONFIG_BROWNOUT_DET_LVL_SEL_0=y +CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_BROWNOUT_DET_LVL=0 +# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set +CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 -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_SLAVE_ID_SUPPORT is not set -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_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set +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 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +CONFIG_ESP32_WIFI_NVS_ENABLED=y +CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y +# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set +CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +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_WPS_STRICT is not set +# CONFIG_WPA_11KV_SUPPORT is not set +# CONFIG_WPA_MBO_SUPPORT is not set +# CONFIG_WPA_DPP_SUPPORT is not set +# CONFIG_WPA_11R_SUPPORT is not set +# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set +# CONFIG_WPA_DEBUG_PRINT is not set +# CONFIG_WPA_TESTING_OPTIONS is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_QUEUE_LENGTH=10 +# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set +# CONFIG_HAL_ASSERTION_SILIENT is not set # CONFIG_L2_TO_L3_COPY is not set -# CONFIG_USE_ONLY_LWIP_SELECT is not set CONFIG_ESP_GRATUITOUS_ARP=y CONFIG_GARP_TMR_INTERVAL=60 CONFIG_TCPIP_RECVMBOX_SIZE=32 @@ -1159,17 +1748,22 @@ CONFIG_TCP_WND_DEFAULT=5744 CONFIG_TCP_RECVMBOX_SIZE=6 CONFIG_TCP_QUEUE_OOSEQ=y -# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set CONFIG_TCP_OVERSIZE_MSS=y # CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_TCP_OVERSIZE_DISABLE is not set CONFIG_UDP_RECVMBOX_SIZE=6 -CONFIG_TCPIP_TASK_STACK_SIZE=2560 +CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set # CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF # CONFIG_PPP_SUPPORT is not set +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_HRT=y +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_HRT is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 CONFIG_ESP32_PTHREAD_STACK_MIN=768 @@ -1181,8 +1775,8 @@ CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set +# CONFIG_ESP32_ULP_COPROC_ENABLED is not set CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y # CONFIG_SUPPORT_TERMIOS is not set CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 -CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 # End of deprecated options
