From e3c775d0dd04dd4e05b5ba903be219e839affaff Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 21 Jul 2023 12:02:13 +0200 Subject: [PATCH] Add BBQKees Gateway S3, update changelog --- CHANGELOG_LATEST.md | 5 +++++ interface/src/project/types.ts | 3 ++- src/system.cpp | 2 ++ src/web/WebSettingsService.cpp | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 798af6f31..416282b97 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -36,6 +36,9 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r - Support Buderus AM200 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161) - Custom telegram handler [#1155](https://github.com/emsesp/EMS-ESP32/issues/1155) - Added support for TLS in MQTT (ESP32-S3 only) [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178) +- Boardprofile BBQKees Gateway S3 +- Custom entity type RAW [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212) +- API command response [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212) ## Fixed @@ -46,6 +49,7 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r - thermostat modetype is not changing when mode changes (e.g. to night) bugSomething isn't working [#1098](https://github.com/emsesp/EMS-ESP32/issues/1098) - NTP: cant apply changed timezone [#1182](https://github.com/emsesp/EMS-ESP32/issues/1182) - Missing Status of VS1 for Buderus SM200 enhancement [#1034](https://github.com/emsesp/EMS-ESP32/issues/1034) +- Allowed gpios for S3 ## Changed @@ -62,3 +66,4 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r - Use [espMqttClient](https://github.com/bertmelis/espMqttClient) with integrated queue [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178) - Move Sensors from Web dashboard to it's own tab enhancement [#1170](https://github.com/emsesp/EMS-ESP32/issues/1170) - Optimize WebUI dashboard data [#1169](https://github.com/emsesp/EMS-ESP32/issues/1169) +- Response to `system/send`` raw reads gives combined data for telegrams with more parts diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index 79ca34fc8..6cee45832 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -243,7 +243,8 @@ export const BOARD_PROFILES: BoardProfiles = { OLIMEXPOE: 'Olimex ESP32-POE', C3MINI: 'Wemos C3 Mini', S2MINI: 'Wemos S2 Mini', - S3MINI: 'Liligo S3' + S3MINI: 'Liligo S3', + S32S3: 'BBQKees Gateway S3' }; export interface BoardProfile { diff --git a/src/system.cpp b/src/system.cpp index 2a2f2d562..da51825a8 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1450,6 +1450,8 @@ bool System::load_board_profile(std::vector & data, const std::string & data = {15, 7, 11, 12, 0, PHY_type::PHY_TYPE_NONE, 0, 0, 0}; // Lolin S2 Mini } else if (board_profile == "S3MINI") { data = {17, 18, 8, 5, 0, PHY_type::PHY_TYPE_NONE, 0, 0, 0}; // Liligo S3 + } else if (board_profile == "S32S3") { + data = {2, 18, 5, 17, 0, PHY_type::PHY_TYPE_NONE, 0, 0, 0}; // BBQKees Gateway S3 } else if (board_profile == "CUSTOM") { // send back current values data = {(int8_t)EMSESP::system_.led_gpio_, diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp index 51d0537cc..158281526 100644 --- a/src/web/WebSettingsService.cpp +++ b/src/web/WebSettingsService.cpp @@ -91,7 +91,8 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) #elif CONFIG_IDF_TARGET_ESP32S2 settings.board_profile = root["board_profile"] | "S2MINI"; #elif CONFIG_IDF_TARGET_ESP32S3 - settings.board_profile = root["board_profile"] | "S3MINI"; + // settings.board_profile = root["board_profile"] | "S3MINI"; + settings.board_profile = root["board_profile"] | "S32S3"; // BBQKees Gateway S3 #elif CONFIG_IDF_TARGET_ESP32 settings.board_profile = root["board_profile"] | EMSESP_DEFAULT_BOARD_PROFILE; #endif