github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-01 05:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lng-parser

Browse Source
This commit is contained in:
Gunnar Skjold
2022-08-17 17:33:24 +02:00
parent a055465ce0 4e451c51e1
commit 940d38af5c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/AmsToMqttBridge.ino
View File

@@ -32,6 +32,10 @@ ADC_MODE(ADC_VCC);
#endif #endif
#define WDT_TIMEOUT 60 #define WDT_TIMEOUT 60
#if defined(CONFIG_IDF_TARGET_ESP32S2)
#include <driver/uart.h>
#endif
#include "version.h" #include "version.h"
#include "AmsToMqttBridge.h" #include "AmsToMqttBridge.h"
@@ -620,9 +624,7 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
hwSerial = &Serial2; hwSerial = &Serial2;
} }
#elif defined(CONFIG_IDF_TARGET_ESP32S2) #elif defined(CONFIG_IDF_TARGET_ESP32S2)
if(pin == 18) { hwSerial = &Serial1;
hwSerial = &Serial1;
}
#elif defined(CONFIG_IDF_TARGET_ESP32C3) #elif defined(CONFIG_IDF_TARGET_ESP32C3)
#endif #endif
#endif #endif
@@ -655,7 +657,11 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
break; 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->begin(baud, serialConfig, -1, -1, invert);
hwSerial->setRxBufferSize(768); hwSerial->setRxBufferSize(768);
#else #else

2
src/web/AmsWebServer.cpp
View File

@@ -1047,7 +1047,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->vccResistorVcc = 33; gpioConfig->vccResistorVcc = 33;
break; break;
case 6: // Pow-P1 case 6: // Pow-P1
gpioConfig->hanPin = 18; gpioConfig->hanPin = 16;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13; gpioConfig->ledPinRed = 13;
gpioConfig->ledPinGreen = 14; gpioConfig->ledPinGreen = 14;

2
web/ha2.json
View File

@@ -3,5 +3,5 @@
"tPO" : %.2f, "tPO" : %.2f,
"tQI" : %.2f, "tQI" : %.2f,
"tQO" : %.2f, "tQO" : %.2f,
"rtc" : %llu "rtc" : %lu
} }