From 29781162070f6f2596d247522d0b4ffe46ee9c64 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Tue, 16 Aug 2022 11:55:07 +0200 Subject: [PATCH 1/3] Fixed formatting error in HA payload --- web/ha2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ha2.json b/web/ha2.json index 9ffcdaf5..06ab3f26 100644 --- a/web/ha2.json +++ b/web/ha2.json @@ -3,5 +3,5 @@ "tPO" : %.2f, "tQI" : %.2f, "tQO" : %.2f, - "rtc" : %llu + "rtc" : %lu } From 43def1c3119922fde88568baa90eb75d3a2396fc Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Wed, 17 Aug 2022 17:32:53 +0200 Subject: [PATCH 2/3] Fixed Pow-P1 profile --- src/web/AmsWebServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index 13770818..68f65684 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -1044,7 +1044,7 @@ void AmsWebServer::handleSetup() { gpioConfig->vccResistorVcc = 33; break; case 6: // Pow-P1 - gpioConfig->hanPin = 18; + gpioConfig->hanPin = 16; gpioConfig->apPin = 0; gpioConfig->ledPinRed = 13; gpioConfig->ledPinGreen = 14; From 4e451c51e1e06edc3d180a5b749a7331506def80 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Wed, 17 Aug 2022 17:33:06 +0200 Subject: [PATCH 3/3] HW serial fix for S2 --- src/AmsToMqttBridge.ino | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index 19136294..77261984 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -32,6 +32,10 @@ ADC_MODE(ADC_VCC); #endif #define WDT_TIMEOUT 60 +#if defined(CONFIG_IDF_TARGET_ESP32S2) +#include +#endif + #include "version.h" #include "AmsToMqttBridge.h" @@ -619,9 +623,7 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert hwSerial = &Serial2; } #elif defined(CONFIG_IDF_TARGET_ESP32S2) - if(pin == 18) { - hwSerial = &Serial1; - } + hwSerial = &Serial1; #elif defined(CONFIG_IDF_TARGET_ESP32C3) #endif #endif @@ -654,7 +656,11 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert break; } - #if defined(ESP32) + #if defined(CONFIG_IDF_TARGET_ESP32S2) + hwSerial->begin(baud, serialConfig, -1, -1, invert); + hwSerial->setRxBufferSize(768); + uart_set_pin(UART_NUM_1, UART_PIN_NO_CHANGE, pin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE); + #elif defined(ESP32) hwSerial->begin(baud, serialConfig, -1, -1, invert); hwSerial->setRxBufferSize(768); #else