diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 2a3c27795..13234a685 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -8,6 +8,7 @@ ## Fixed - Don't create Home Assistant MQTT discovery entries for device values that don't exists (#756 on EMS-ESP repo) - Update shower MQTT when a shower start is detected +- S32 board profile ## Changed @@ -16,5 +17,6 @@ - moved mqtt-topics and texts to local_EN, all topics lower case - Re-enabled Shower Alert (still experimental) - lowercased Flow temp in commands +- system console commands to main ## Removed diff --git a/interface/src/project/EMSESPBoardProfiles.tsx b/interface/src/project/EMSESPBoardProfiles.tsx index a8d768206..b13eced75 100644 --- a/interface/src/project/EMSESPBoardProfiles.tsx +++ b/interface/src/project/EMSESPBoardProfiles.tsx @@ -9,7 +9,7 @@ export const BOARD_PROFILES: BoardProfiles = { "S32": "BBQKees Gateway S32", "E32": "BBQKees Gateway E32", "NODEMCU": "NodeMCU 32S", - "MT-ET": "MT-ET Live D1 Mini", + "MH-ET": "MH-ET Live D1 Mini", "LOLIN": "Lolin D32", "OLIMEX": "Olimex ESP32-EVB", "TLK110": "Generic Ethernet (TLK110)", diff --git a/mock-api/server.js b/mock-api/server.js index 104d1a6f3..3d1466b51 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -285,7 +285,7 @@ app.post(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => { if (board_profile == "S32") { // BBQKees Gateway S32 data.led_gpio = 2; - data.dallas_gpio = 3; + data.dallas_gpio = 18; data.rx_gpio = 23; data.tx_gpio = 5; data.pbutton_gpio = 0; @@ -295,7 +295,7 @@ app.post(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => { data.rx_gpio = 5; data.tx_gpio = 17; data.pbutton_gpio = 33; - } else if (board_profile == "MT-ET") { // MT-ET Live D1 Mini + } else if (board_profile == "MH-ET") { // MH-ET Live D1 Mini data.led_gpio = 2; data.dallas_gpio = 18; data.rx_gpio = 23; diff --git a/src/system.cpp b/src/system.cpp index f5722d829..31765afb6 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -913,11 +913,11 @@ bool System::command_test(const char * value, const int8_t id) { // returns false if profile is not found bool System::load_board_profile(std::vector & data, const std::string & board_profile) { if (board_profile == "S32") { - data = {2, 3, 23, 5, 0}; // BBQKees Gateway S32 + data = {2, 18, 23, 5, 0}; // BBQKees Gateway S32 } else if (board_profile == "E32") { data = {2, 4, 5, 17, 33}; // BBQKees Gateway E32 - } else if (board_profile == "MT-ET") { - data = {2, 18, 23, 5, 0}; // MT-ET Live D1 Mini + } else if (board_profile == "MH-ET") { + data = {2, 18, 23, 5, 0}; // MH-ET Live D1 Mini } else if (board_profile == "NODEMCU") { data = {2, 18, 23, 5, 0}; // NodeMCU 32S } else if (board_profile == "LOLIN") {