feat(gateway): Update SDK configuration and add 485 control bridge

- Changed flash size configuration from 16MB to 4MB and updated partition table filename.
- Introduced two gateway channels with UART configurations for communication.
- Added support for gateway cache and startup services including BLE and Wi-Fi.
- Enabled SPI RAM and configured its parameters for better memory management.
- Enhanced the gateway bridge service to handle generated Modbus points more efficiently.
- Refactored the gateway Modbus component to improve point management and added new methods for point description and generation.
- Implemented a new Gateway485ControlBridge for handling 485 control communication with UART.
- Added necessary files for the 485 control bridge including configuration and implementation.

Signed-off-by: Tony <tonylu@tony-cloud.com>

apps/gateway/main/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_component_register(
     SRCS "app_main.cpp"
-    REQUIRES gateway_core gateway_controller gateway_network gateway_bridge gateway_cache dali_domain gateway_runtime gateway_ble gateway_usb_setup log
+    REQUIRES gateway_core gateway_controller gateway_network gateway_bridge gateway_cache dali_domain gateway_runtime gateway_ble gateway_usb_setup gateway_485_control log
 )
 
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)

apps/gateway/main/Kconfig.projbuild

@@ -579,6 +579,72 @@ config GATEWAY_USB_SETUP_READ_TIMEOUT_MS
     range 1 1000
     default 20
 
+config GATEWAY_485_CONTROL_ENABLED
+    bool "Enable UART0 Lua control bridge"
+    default n
+    help
+        Claims UART0 for the Lua-compatible framed gateway control channel at boot.
+        This requires moving the ESP-IDF console away from UART0 and prevents Modbus
+        serial from using UART0 at runtime.
+
+config GATEWAY_485_CONTROL_BAUDRATE
+    int "UART0 control baudrate"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 1200 921600
+    default 9600
+
+config GATEWAY_485_CONTROL_TX_PIN
+    int "UART0 control TX pin"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range -1 48
+    default -1
+    help
+        Leave at -1 to keep the current UART0 TX routing.
+
+config GATEWAY_485_CONTROL_RX_PIN
+    int "UART0 control RX pin"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range -1 48
+    default -1
+    help
+        Leave at -1 to keep the current UART0 RX routing.
+
+config GATEWAY_485_CONTROL_RX_BUFFER
+    int "UART0 control RX buffer bytes"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 64 4096
+    default 256
+
+config GATEWAY_485_CONTROL_TX_BUFFER
+    int "UART0 control TX buffer bytes"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 64 4096
+    default 256
+
+config GATEWAY_485_CONTROL_READ_TIMEOUT_MS
+    int "UART0 control read timeout ms"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 1 1000
+    default 20
+
+config GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS
+    int "UART0 control write timeout ms"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 1 1000
+    default 20
+
+config GATEWAY_485_CONTROL_TASK_STACK_SIZE
+    int "UART0 control task stack bytes"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 2048 16384
+    default 4096
+
+config GATEWAY_485_CONTROL_TASK_PRIORITY
+    int "UART0 control task priority"
+    depends on GATEWAY_485_CONTROL_ENABLED
+    range 1 10
+    default 4
+
 endmenu
 
 menu "Gateway Network Services"

apps/gateway/main/app_main.cpp

@@ -6,6 +6,7 @@
 #include "gateway_core.hpp"
 #include "gateway_network.hpp"
 #include "gateway_runtime.hpp"
+#include "gateway_485_control.hpp"
 #include "gateway_usb_setup.hpp"
 
 #include "esp_log.h"
@@ -55,6 +56,42 @@
 #define CONFIG_GATEWAY_USB_SETUP_READ_TIMEOUT_MS 20
 #endif
 
+#ifndef CONFIG_GATEWAY_485_CONTROL_BAUDRATE
+#define CONFIG_GATEWAY_485_CONTROL_BAUDRATE 9600
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_TX_PIN
+#define CONFIG_GATEWAY_485_CONTROL_TX_PIN -1
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_RX_PIN
+#define CONFIG_GATEWAY_485_CONTROL_RX_PIN -1
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_RX_BUFFER
+#define CONFIG_GATEWAY_485_CONTROL_RX_BUFFER 256
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_TX_BUFFER
+#define CONFIG_GATEWAY_485_CONTROL_TX_BUFFER 256
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_READ_TIMEOUT_MS
+#define CONFIG_GATEWAY_485_CONTROL_READ_TIMEOUT_MS 20
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS
+#define CONFIG_GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS 20
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_TASK_STACK_SIZE
+#define CONFIG_GATEWAY_485_CONTROL_TASK_STACK_SIZE 4096
+#endif
+
+#ifndef CONFIG_GATEWAY_485_CONTROL_TASK_PRIORITY
+#define CONFIG_GATEWAY_485_CONTROL_TASK_PRIORITY 4
+#endif
+
 #ifndef CONFIG_GATEWAY_SMARTCONFIG_TIMEOUT_SEC
 #define CONFIG_GATEWAY_SMARTCONFIG_TIMEOUT_SEC 60
 #endif
@@ -257,6 +294,20 @@ constexpr bool kModbusAllowUart0 = true;
 constexpr bool kModbusAllowUart0 = false;
 #endif
 
+#ifdef CONFIG_GATEWAY_485_CONTROL_ENABLED
+constexpr bool k485ControlEnabled = true;
+#else
+constexpr bool k485ControlEnabled = false;
+#endif
+
+#if defined(CONFIG_ESP_CONSOLE_UART) && defined(CONFIG_ESP_CONSOLE_UART_NUM) && CONFIG_ESP_CONSOLE_UART_NUM == 0
+constexpr bool kConsoleOnUart0 = true;
+#elif defined(CONFIG_CONSOLE_UART) && defined(CONFIG_CONSOLE_UART_NUM) && CONFIG_CONSOLE_UART_NUM == 0
+constexpr bool kConsoleOnUart0 = true;
+#else
+constexpr bool kConsoleOnUart0 = false;
+#endif
+
 #ifdef CONFIG_GATEWAY_MODBUS_SERIAL_RS485_ENABLED
 constexpr bool kModbusSerialRs485Enabled = true;
 #else
@@ -270,6 +321,7 @@ std::unique_ptr<gateway::GatewayController> s_controller;
 std::unique_ptr<gateway::GatewayBridgeService> s_bridge;
 std::unique_ptr<gateway::GatewayNetworkService> s_network;
 std::unique_ptr<gateway::GatewayBleBridge> s_ble_bridge;
+std::unique_ptr<gateway::Gateway485ControlBridge> s_uart0_control_bridge;
 std::unique_ptr<gateway::GatewayUsbSetupBridge> s_usb_setup_bridge;
 
 [[maybe_unused]] void LogBindError(const char* channel_name, esp_err_t err) {
@@ -289,6 +341,11 @@ struct ChannelBindingConfig {
 };
 
 bool ValidateChannelBindings() {
+  if (k485ControlEnabled && kConsoleOnUart0) {
+    ESP_LOGE(kTag, "485 control bridge requires moving the ESP-IDF console off UART0");
+    return false;
+  }
+
   ChannelBindingConfig channels[CONFIG_GATEWAY_CHANNEL_COUNT] = {};
 
 #if CONFIG_GATEWAY_CHANNEL1_PHY_NATIVE
@@ -375,6 +432,10 @@ bool ValidateChannelBindings() {
 
   if (kModbusBridgeSupported && kModbusDefaultSerialTransport) {
     const int modbus_uart = CONFIG_GATEWAY_MODBUS_SERIAL_UART_PORT;
+    if (k485ControlEnabled && modbus_uart == 0) {
+      ESP_LOGE(kTag, "Modbus serial UART0 conflicts with the UART0 control bridge");
+      return false;
+    }
     if (modbus_uart == 0 && !kModbusAllowUart0) {
       ESP_LOGE(kTag, "Modbus serial is configured on UART0, but UART0 is reserved for console");
       return false;
@@ -429,10 +490,10 @@ esp_err_t BindConfiguredChannels(gateway::DaliDomainService& dali_domain,
   channel1.query_timeout_ms =
       static_cast<uint32_t>(CONFIG_GATEWAY_CHANNEL1_SERIAL_QUERY_TIMEOUT_MS);
   channel1.name = runtime.gatewayName(channel1.gateway_id);
-  esp_err_t err = dali_domain.bindSerialBus(channel1);
-  LogBindError("channel1 serial DALI", err);
-  if (err != ESP_OK) {
-    return err;
+  esp_err_t err1 = dali_domain.bindSerialBus(channel1);
+  LogBindError("channel1 serial DALI", err1);
+  if (err1 != ESP_OK) {
+    return err1;
   }
 #endif
 
@@ -446,10 +507,10 @@ esp_err_t BindConfiguredChannels(gateway::DaliDomainService& dali_domain,
   channel2.rx_pin = static_cast<uint8_t>(CONFIG_GATEWAY_CHANNEL2_NATIVE_RX_PIN);
   channel2.baudrate = static_cast<uint32_t>(CONFIG_GATEWAY_CHANNEL2_NATIVE_BAUDRATE);
   channel2.name = runtime.gatewayName(channel2.gateway_id);
-  esp_err_t err = dali_domain.bindHardwareBus(channel2);
-  LogBindError("channel2 native DALI", err);
-  if (err != ESP_OK) {
-    return err;
+  esp_err_t err2 = dali_domain.bindHardwareBus(channel2);
+  LogBindError("channel2 native DALI", err2);
+  if (err2 != ESP_OK) {
+    return err2;
   }
 #elif CONFIG_GATEWAY_CHANNEL2_PHY_UART1 || CONFIG_GATEWAY_CHANNEL2_PHY_UART2
   gateway::DaliSerialBusConfig channel2{};
@@ -468,10 +529,10 @@ esp_err_t BindConfiguredChannels(gateway::DaliDomainService& dali_domain,
   channel2.query_timeout_ms =
       static_cast<uint32_t>(CONFIG_GATEWAY_CHANNEL2_SERIAL_QUERY_TIMEOUT_MS);
   channel2.name = runtime.gatewayName(channel2.gateway_id);
-  esp_err_t err = dali_domain.bindSerialBus(channel2);
-  LogBindError("channel2 serial DALI", err);
-  if (err != ESP_OK) {
-    return err;
+  esp_err_t err2 = dali_domain.bindSerialBus(channel2);
+  LogBindError("channel2 serial DALI", err2);
+  if (err2 != ESP_OK) {
+    return err2;
   }
 #endif
 #endif
@@ -535,7 +596,27 @@ extern "C" void app_main(void) {
   s_controller = std::make_unique<gateway::GatewayController>(*s_runtime, *s_dali_domain,
                                                               *s_cache,
                                                               controller_config);
-  ESP_ERROR_CHECK(s_controller->start());
+    if (k485ControlEnabled) {
+    gateway::Gateway485ControlBridgeConfig gateway485_config;
+    gateway485_config.enabled = true;
+    gateway485_config.tx_pin = CONFIG_GATEWAY_485_CONTROL_TX_PIN;
+    gateway485_config.rx_pin = CONFIG_GATEWAY_485_CONTROL_RX_PIN;
+    gateway485_config.baudrate = static_cast<uint32_t>(CONFIG_GATEWAY_485_CONTROL_BAUDRATE);
+    gateway485_config.rx_buffer_size = static_cast<size_t>(CONFIG_GATEWAY_485_CONTROL_RX_BUFFER);
+    gateway485_config.tx_buffer_size = static_cast<size_t>(CONFIG_GATEWAY_485_CONTROL_TX_BUFFER);
+    gateway485_config.read_timeout_ms =
+      static_cast<uint32_t>(CONFIG_GATEWAY_485_CONTROL_READ_TIMEOUT_MS);
+    gateway485_config.write_timeout_ms =
+      static_cast<uint32_t>(CONFIG_GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS);
+    gateway485_config.task_stack_size =
+      static_cast<uint32_t>(CONFIG_GATEWAY_485_CONTROL_TASK_STACK_SIZE);
+    gateway485_config.task_priority =
+      static_cast<UBaseType_t>(CONFIG_GATEWAY_485_CONTROL_TASK_PRIORITY);
+    s_uart0_control_bridge = std::make_unique<gateway::Gateway485ControlBridge>(*s_controller,
+                                            gateway485_config);
+    ESP_ERROR_CHECK(s_uart0_control_bridge->start());
+    }
+    ESP_ERROR_CHECK(s_controller->start());
 
   if (kBridgeSupported) {
     gateway::GatewayBridgeServiceConfig bridge_config;
@@ -552,8 +633,8 @@ extern "C" void app_main(void) {
         static_cast<uint32_t>(CONFIG_GATEWAY_BRIDGE_MODBUS_TASK_STACK_SIZE);
     bridge_config.modbus_task_priority =
       static_cast<UBaseType_t>(CONFIG_GATEWAY_BRIDGE_MODBUS_TASK_PRIORITY);
-    bridge_config.allow_modbus_uart0 = kModbusAllowUart0;
-    if (!kModbusAllowUart0) {
+    bridge_config.allow_modbus_uart0 = kModbusAllowUart0 && !k485ControlEnabled;
+    if (!bridge_config.allow_modbus_uart0) {
       bridge_config.reserved_uart_ports.push_back(0);
     }
   #if CONFIG_GATEWAY_CHANNEL1_PHY_UART1

apps/gateway/partitions-4M-single.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x6000,
+otadata,  data, ota,     0xf000,   0x2000,
+phy_init, data, phy,     0x11000,  0x1000,
+factory,  app,  factory, 0x20000,  0x200000,
+storage,  data, spiffs,  0x220000, 0x180000,

apps/gateway/sdkconfig

@@ -562,13 +562,13 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHFREQ="80m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+# 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="16MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -587,8 +587,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4M-single.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-4M-single.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -602,20 +602,32 @@ CONFIG_GATEWAY_CHANNEL_COUNT=2
 # Gateway Channel 1
 #
 CONFIG_GATEWAY_CHANNEL1_GW_ID=3
-CONFIG_GATEWAY_CHANNEL1_PHY_DISABLED=y
+# CONFIG_GATEWAY_CHANNEL1_PHY_DISABLED is not set
 # CONFIG_GATEWAY_CHANNEL1_PHY_NATIVE is not set
-# CONFIG_GATEWAY_CHANNEL1_PHY_UART1 is not set
+CONFIG_GATEWAY_CHANNEL1_PHY_UART1=y
 # CONFIG_GATEWAY_CHANNEL1_PHY_UART2 is not set
+CONFIG_GATEWAY_CHANNEL1_SERIAL_TX_PIN=1
+CONFIG_GATEWAY_CHANNEL1_SERIAL_RX_PIN=2
+CONFIG_GATEWAY_CHANNEL1_SERIAL_BAUDRATE=9600
+CONFIG_GATEWAY_CHANNEL1_SERIAL_RX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL1_SERIAL_TX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL1_SERIAL_QUERY_TIMEOUT_MS=100
 # end of Gateway Channel 1
 
 #
 # Gateway Channel 2
 #
 CONFIG_GATEWAY_CHANNEL2_GW_ID=4
-CONFIG_GATEWAY_CHANNEL2_PHY_DISABLED=y
+# CONFIG_GATEWAY_CHANNEL2_PHY_DISABLED is not set
 # CONFIG_GATEWAY_CHANNEL2_PHY_NATIVE is not set
 # CONFIG_GATEWAY_CHANNEL2_PHY_UART1 is not set
-# CONFIG_GATEWAY_CHANNEL2_PHY_UART2 is not set
+CONFIG_GATEWAY_CHANNEL2_PHY_UART2=y
+CONFIG_GATEWAY_CHANNEL2_SERIAL_TX_PIN=6
+CONFIG_GATEWAY_CHANNEL2_SERIAL_RX_PIN=7
+CONFIG_GATEWAY_CHANNEL2_SERIAL_BAUDRATE=9600
+CONFIG_GATEWAY_CHANNEL2_SERIAL_RX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL2_SERIAL_TX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL2_SERIAL_QUERY_TIMEOUT_MS=100
 # end of Gateway Channel 2
 
 #
@@ -662,6 +674,16 @@ CONFIG_GATEWAY_BRIDGE_BACNET_TASK_STACK_SIZE=8192
 CONFIG_GATEWAY_BRIDGE_BACNET_TASK_PRIORITY=5
 CONFIG_GATEWAY_USB_STARTUP_DEBUG_JTAG=y
 # CONFIG_GATEWAY_USB_STARTUP_SETUP_SERIAL is not set
+CONFIG_GATEWAY_485_CONTROL_ENABLED=y
+CONFIG_GATEWAY_485_CONTROL_BAUDRATE=9600
+CONFIG_GATEWAY_485_CONTROL_TX_PIN=-1
+CONFIG_GATEWAY_485_CONTROL_RX_PIN=-1
+CONFIG_GATEWAY_485_CONTROL_RX_BUFFER=256
+CONFIG_GATEWAY_485_CONTROL_TX_BUFFER=256
+CONFIG_GATEWAY_485_CONTROL_READ_TIMEOUT_MS=20
+CONFIG_GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS=20
+CONFIG_GATEWAY_485_CONTROL_TASK_STACK_SIZE=4096
+CONFIG_GATEWAY_485_CONTROL_TASK_PRIORITY=4
 # end of Gateway Startup Services
 
 #
@@ -722,6 +744,7 @@ CONFIG_COMPILER_ORPHAN_SECTIONS_WARNING=y
 #
 # CONFIG_APPTRACE_DEST_JTAG is not set
 CONFIG_APPTRACE_DEST_NONE=y
+# CONFIG_APPTRACE_DEST_UART0 is not set
 # CONFIG_APPTRACE_DEST_UART1 is not set
 # CONFIG_APPTRACE_DEST_UART2 is not set
 # CONFIG_APPTRACE_DEST_USB_CDC is not set
@@ -748,6 +771,7 @@ CONFIG_BT_CONTROLLER_ENABLED=y
 # General
 #
 CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set
 # CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
 CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
@@ -1500,8 +1524,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
 #
 # Sleep Config
 #
-# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set
 CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
+CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
 CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
@@ -1640,7 +1664,40 @@ CONFIG_PM_RESTORE_CACHE_TAGMEM_AFTER_LIGHT_SLEEP=y
 #
 # ESP PSRAM
 #
-# CONFIG_SPIRAM is not set
+CONFIG_SPIRAM=y
+
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_CLK_IO=30
+CONFIG_SPIRAM_CS_IO=26
+# CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM_SPEED=80
+CONFIG_SPIRAM_BOOT_HW_INIT=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
 # end of ESP PSRAM
 
 #
@@ -1731,18 +1788,15 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # 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_DEFAULT is not set
 # CONFIG_ESP_CONSOLE_USB_CDC is not set
-# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
-# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set
-CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
 CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=y
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=0
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_CONSOLE_UART_NUM=-1
+CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=4
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
@@ -1895,6 +1949,7 @@ CONFIG_FATFS_CODEPAGE=437
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
+CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
 CONFIG_FATFS_USE_STRFUNC_NONE=y
 # CONFIG_FATFS_USE_STRFUNC_WITHOUT_CRLF_CONV is not set
@@ -1972,6 +2027,7 @@ CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y
 #
 # Extra
 #
+CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM=y
 # end of Extra
 
 CONFIG_FREERTOS_PORT=y
@@ -2256,6 +2312,7 @@ CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT=y
 # mbedTLS
 #
 CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
@@ -2412,12 +2469,15 @@ CONFIG_LIBC_TIME_SYSCALL_USE_RTC_HRT=y
 CONFIG_LIBC_ASSERT_BUFFER_SIZE=200
 # end of LibC
 
+CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
+
 #
 # NVS
 #
 # CONFIG_NVS_ENCRYPTION is not set
 # CONFIG_NVS_ASSERT_ERROR_CHECK is not set
 # CONFIG_NVS_LEGACY_DUP_KEYS_COMPATIBILITY is not set
+# CONFIG_NVS_ALLOCATE_CACHE_IN_SPIRAM is not set
 # end of NVS
 
 #
@@ -2761,6 +2821,7 @@ CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 # CONFIG_BLUEDROID_ENABLED is not set
 CONFIG_NIMBLE_ENABLED=y
 CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set
 # CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
 CONFIG_NIMBLE_PINNED_TO_CORE=0
 CONFIG_NIMBLE_PINNED_TO_CORE_0=y
@@ -2809,7 +2870,6 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_GDBSTUB_SUPPORT_TASKS=y
 CONFIG_GDBSTUB_MAX_TASKS=32
 # CONFIG_OTA_ALLOW_HTTP is not set
-# CONFIG_ESP_SYSTEM_PD_FLASH is not set
 CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
@@ -2845,7 +2905,9 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
 # CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set
 CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y
 CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y
-# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
 # CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set
 CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160=y
 # CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240 is not set
@@ -2853,13 +2915,11 @@ CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=160
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_MAIN_TASK_STACK_SIZE=3584
-CONFIG_CONSOLE_UART_DEFAULT=y
+# CONFIG_CONSOLE_UART_DEFAULT is not set
 # 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_BAUDRATE=115200
+CONFIG_CONSOLE_UART_NUM=-1
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
 CONFIG_INT_WDT_CHECK_CPU1=y
@@ -2912,6 +2972,7 @@ 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_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 # CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y

apps/gateway/sdkconfig.old

@@ -562,13 +562,13 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHFREQ="80m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+# 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="16MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -587,8 +587,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4M-single.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-4M-single.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -596,7 +596,108 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # Gateway App
 #
+CONFIG_GATEWAY_CHANNEL_COUNT=2
+
+#
+# Gateway Channel 1
+#
+CONFIG_GATEWAY_CHANNEL1_GW_ID=3
+# CONFIG_GATEWAY_CHANNEL1_PHY_DISABLED is not set
+# CONFIG_GATEWAY_CHANNEL1_PHY_NATIVE is not set
+CONFIG_GATEWAY_CHANNEL1_PHY_UART1=y
+# CONFIG_GATEWAY_CHANNEL1_PHY_UART2 is not set
+CONFIG_GATEWAY_CHANNEL1_SERIAL_TX_PIN=1
+CONFIG_GATEWAY_CHANNEL1_SERIAL_RX_PIN=2
+CONFIG_GATEWAY_CHANNEL1_SERIAL_BAUDRATE=9600
+CONFIG_GATEWAY_CHANNEL1_SERIAL_RX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL1_SERIAL_TX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL1_SERIAL_QUERY_TIMEOUT_MS=100
+# end of Gateway Channel 1
+
+#
+# Gateway Channel 2
+#
+CONFIG_GATEWAY_CHANNEL2_GW_ID=4
+# CONFIG_GATEWAY_CHANNEL2_PHY_DISABLED is not set
+# CONFIG_GATEWAY_CHANNEL2_PHY_NATIVE is not set
+# CONFIG_GATEWAY_CHANNEL2_PHY_UART1 is not set
+CONFIG_GATEWAY_CHANNEL2_PHY_UART2=y
+CONFIG_GATEWAY_CHANNEL2_SERIAL_TX_PIN=6
+CONFIG_GATEWAY_CHANNEL2_SERIAL_RX_PIN=7
+CONFIG_GATEWAY_CHANNEL2_SERIAL_BAUDRATE=9600
+CONFIG_GATEWAY_CHANNEL2_SERIAL_RX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL2_SERIAL_TX_BUFFER=512
+CONFIG_GATEWAY_CHANNEL2_SERIAL_QUERY_TIMEOUT_MS=100
+# end of Gateway Channel 2
+
+#
+# Gateway Cache
+#
+CONFIG_GATEWAY_CACHE_SUPPORTED=y
+CONFIG_GATEWAY_CACHE_START_ENABLED=y
+CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED=y
+# CONFIG_GATEWAY_CACHE_FULL_STATE_MIRROR is not set
+CONFIG_GATEWAY_CACHE_FLUSH_INTERVAL_MS=5000
+CONFIG_GATEWAY_CACHE_OUTSIDE_BUS_FIRST=y
+# CONFIG_GATEWAY_CACHE_LOCAL_GATEWAY_FIRST is not set
+# end of Gateway Cache
+
 # CONFIG_GATEWAY_ENABLE_DALI_BUS is not set
+
+#
+# Gateway Startup Services
+#
+CONFIG_GATEWAY_BLE_SUPPORTED=y
+CONFIG_GATEWAY_START_BLE_ENABLED=y
+CONFIG_GATEWAY_WIFI_SUPPORTED=y
+# CONFIG_GATEWAY_START_WIFI_STA_ENABLED is not set
+CONFIG_GATEWAY_ESPNOW_SETUP_SUPPORTED=y
+CONFIG_GATEWAY_SMARTCONFIG_SUPPORTED=y
+# CONFIG_GATEWAY_START_ESPNOW_SETUP_ENABLED is not set
+# CONFIG_GATEWAY_START_SMARTCONFIG_ENABLED is not set
+CONFIG_GATEWAY_SMARTCONFIG_TIMEOUT_SEC=60
+CONFIG_GATEWAY_BRIDGE_SUPPORTED=y
+CONFIG_GATEWAY_MODBUS_BRIDGE_SUPPORTED=y
+# CONFIG_GATEWAY_START_MODBUS_BRIDGE_ENABLED is not set
+CONFIG_GATEWAY_MODBUS_DEFAULT_TRANSPORT_TCP=y
+# CONFIG_GATEWAY_MODBUS_DEFAULT_TRANSPORT_RTU is not set
+# CONFIG_GATEWAY_MODBUS_DEFAULT_TRANSPORT_ASCII is not set
+CONFIG_GATEWAY_MODBUS_TCP_PORT=1502
+CONFIG_GATEWAY_MODBUS_UNIT_ID=1
+CONFIG_GATEWAY_BACNET_BRIDGE_SUPPORTED=y
+# CONFIG_GATEWAY_START_BACNET_BRIDGE_ENABLED is not set
+CONFIG_GATEWAY_CLOUD_BRIDGE_SUPPORTED=y
+# CONFIG_GATEWAY_START_CLOUD_BRIDGE_ENABLED is not set
+CONFIG_GATEWAY_BRIDGE_MODBUS_TASK_STACK_SIZE=6144
+CONFIG_GATEWAY_BRIDGE_MODBUS_TASK_PRIORITY=4
+CONFIG_GATEWAY_BRIDGE_BACNET_TASK_STACK_SIZE=8192
+CONFIG_GATEWAY_BRIDGE_BACNET_TASK_PRIORITY=5
+CONFIG_GATEWAY_USB_STARTUP_DEBUG_JTAG=y
+# CONFIG_GATEWAY_USB_STARTUP_SETUP_SERIAL is not set
+CONFIG_GATEWAY_485_CONTROL_ENABLED=y
+CONFIG_GATEWAY_485_CONTROL_BAUDRATE=9600
+CONFIG_GATEWAY_485_CONTROL_TX_PIN=-1
+CONFIG_GATEWAY_485_CONTROL_RX_PIN=-1
+CONFIG_GATEWAY_485_CONTROL_RX_BUFFER=256
+CONFIG_GATEWAY_485_CONTROL_TX_BUFFER=256
+CONFIG_GATEWAY_485_CONTROL_READ_TIMEOUT_MS=20
+CONFIG_GATEWAY_485_CONTROL_WRITE_TIMEOUT_MS=20
+CONFIG_GATEWAY_485_CONTROL_TASK_STACK_SIZE=4096
+CONFIG_GATEWAY_485_CONTROL_TASK_PRIORITY=4
+# end of Gateway Startup Services
+
+#
+# Gateway Network Services
+#
+CONFIG_GATEWAY_NETWORK_HTTP_ENABLED=y
+CONFIG_GATEWAY_NETWORK_HTTP_PORT=80
+CONFIG_GATEWAY_NETWORK_UDP_ROUTER_ENABLED=y
+CONFIG_GATEWAY_NETWORK_UDP_PORT=2020
+CONFIG_GATEWAY_STATUS_LED_GPIO=-1
+CONFIG_GATEWAY_BOOT_BUTTON_GPIO=0
+CONFIG_GATEWAY_BOOT_BUTTON_ACTIVE_LOW=y
+CONFIG_GATEWAY_BOOT_BUTTON_LONG_PRESS_MS=3000
+# end of Gateway Network Services
 # end of Gateway App
 
 #
@@ -669,6 +770,7 @@ CONFIG_BT_CONTROLLER_ENABLED=y
 # General
 #
 CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set
 # CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
 CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
@@ -1421,8 +1523,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
 #
 # Sleep Config
 #
-# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set
 CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
+CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
 CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
@@ -1561,7 +1663,40 @@ CONFIG_PM_RESTORE_CACHE_TAGMEM_AFTER_LIGHT_SLEEP=y
 #
 # ESP PSRAM
 #
-# CONFIG_SPIRAM is not set
+CONFIG_SPIRAM=y
+
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_CLK_IO=30
+CONFIG_SPIRAM_CS_IO=26
+# CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
+CONFIG_SPIRAM_SPEED_80M=y
+# CONFIG_SPIRAM_SPEED_40M is not set
+CONFIG_SPIRAM_SPEED=80
+CONFIG_SPIRAM_BOOT_HW_INIT=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
 # end of ESP PSRAM
 
 #
@@ -1816,6 +1951,7 @@ CONFIG_FATFS_CODEPAGE=437
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
+CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
 CONFIG_FATFS_USE_STRFUNC_NONE=y
 # CONFIG_FATFS_USE_STRFUNC_WITHOUT_CRLF_CONV is not set
@@ -1893,6 +2029,7 @@ CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y
 #
 # Extra
 #
+CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM=y
 # end of Extra
 
 CONFIG_FREERTOS_PORT=y
@@ -2177,6 +2314,7 @@ CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT=y
 # mbedTLS
 #
 CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
@@ -2333,12 +2471,15 @@ CONFIG_LIBC_TIME_SYSCALL_USE_RTC_HRT=y
 CONFIG_LIBC_ASSERT_BUFFER_SIZE=200
 # end of LibC
 
+CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
+
 #
 # NVS
 #
 # CONFIG_NVS_ENCRYPTION is not set
 # CONFIG_NVS_ASSERT_ERROR_CHECK is not set
 # CONFIG_NVS_LEGACY_DUP_KEYS_COMPATIBILITY is not set
+# CONFIG_NVS_ALLOCATE_CACHE_IN_SPIRAM is not set
 # end of NVS
 
 #