From 0c7301a020365736cd5aeb3ff4f4e65bfd3ea4dc Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 14:00:20 +0100 Subject: [PATCH 1/3] TYPE has param --- interface/src/app/settings/ApplicationSettings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx index 7cda3cb2b..3359ae477 100644 --- a/interface/src/app/settings/ApplicationSettings.tsx +++ b/interface/src/app/settings/ApplicationSettings.tsx @@ -554,7 +554,7 @@ const ApplicationSettings = () => { Date: Sun, 23 Mar 2025 14:00:35 +0100 Subject: [PATCH 2/3] add led_type to comment --- src/core/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index e51e8c4d6..441d3ee6f 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1821,7 +1821,7 @@ bool System::command_test(const char * value, const int8_t id) { // takes a board profile and populates a data array with GPIO configurations // returns false if profile is unknown // -// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode +// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode, led_type // // clock modes: // 0 = RMII clock input to GPIO0 From e5e9d4c71359b4a6d14e382a1e83a1570923fd8e Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 14:00:46 +0100 Subject: [PATCH 3/3] fix test data with led_type --- mock-api/rest_server.ts | 42 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index 55e65d15f..a09430301 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -58,6 +58,7 @@ let settings = { eth_power: 15, eth_phy_addr: 0, eth_clock_mode: 1, + led_type: 0, platform: 'ESP32', modbus_enabled: false, modbus_port: 502, @@ -175,7 +176,7 @@ switch (emulate_esp as string) { settings.platform = 'ESP32'; break; - // ESP32S3 + // ESP32 S3 case 'ESP32S3': default: system_status.esp_platform = 'ESP32S3'; @@ -185,7 +186,7 @@ switch (emulate_esp as string) { system_status.psram = true; system_status.psram_size = 8189; system_status.free_psram = 8166; - settings.board_profile = 'S3'; + settings.board_profile = 'S32S3'; settings.platform = 'ESP32S3'; break; } @@ -4864,7 +4865,8 @@ router phy_type: settings.phy_type, eth_power: settings.eth_power, eth_phy_addr: settings.eth_phy_addr, - eth_clock_mode: settings.eth_clock_mode + eth_clock_mode: settings.eth_clock_mode, + led_type: settings.led_type }; if (board_profile == 'S32') { @@ -4878,6 +4880,19 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; + } else if (board_profile == 'S32S3') { + // BBQKees Gateway S3 + data.led_gpio = 2; + data.dallas_gpio = 18; + data.rx_gpio = 5; + data.tx_gpio = 17; + data.pbutton_gpio = 0; + data.phy_type = 0; + data.eth_power = 0; + data.eth_phy_addr = 0; + data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'E32') { // BBQKees Gateway E32 data.led_gpio = 2; @@ -4889,6 +4904,19 @@ router data.eth_power = 16; data.eth_phy_addr = 1; data.eth_clock_mode = 0; + data.led_type = 0; + } else if (board_profile == 'E32V2') { + // BBQKees Gateway E32 V2 + data.led_gpio = 2; + data.dallas_gpio = 14; + data.rx_gpio = 4; + data.tx_gpio = 5; + data.pbutton_gpio = 34; + data.phy_type = 1; + data.eth_power = 15; + data.eth_phy_addr = 0; + data.eth_clock_mode = 1; + data.led_type = 0; } else if (board_profile == 'MH-ET') { // MH-ET Live D1 Mini data.led_gpio = 2; @@ -4900,6 +4928,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'NODEMCU') { // NodeMCU 32S data.led_gpio = 2; @@ -4911,6 +4940,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'LOLIN') { // Lolin D32 data.led_gpio = 2; @@ -4922,6 +4952,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'OLIMEX') { // Olimex ESP32-EVB (uses U1TXD/U1RXD/BUTTON, no LED or Dallas) data.led_gpio = 0; @@ -4933,6 +4964,7 @@ router data.eth_power = -1; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'OLIMEXPOE') { // Olimex ESP32-POE data.led_gpio = 0; @@ -4944,6 +4976,7 @@ router data.eth_power = 12; data.eth_phy_addr = 0; data.eth_clock_mode = 3; + data.led_type = 0; } else if (board_profile == 'C3MINI') { // Lolin C3 mini data.led_gpio = 7; @@ -4955,6 +4988,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'S2MINI') { // Lolin C3 mini data.led_gpio = 15; @@ -4966,6 +5000,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'S3MINI') { // Liligo S3 mini data.led_gpio = 17; @@ -4977,6 +5012,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } data.board_profile =