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

Fixed accidental clearing more than just GPIO

Browse Source
This commit is contained in:
Gunnar Skjold
2024-04-10 20:36:43 +02:00
parent 84ff999c4c
commit e7ae24b26f
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AmsConfiguration/include/AmsConfiguration.h
View File

@@ -295,7 +295,7 @@ public:
bool getGpioConfig(GpioConfig&); bool getGpioConfig(GpioConfig&);
bool setGpioConfig(GpioConfig&); bool setGpioConfig(GpioConfig&);
void clearGpio(GpioConfig&); void clearGpio(GpioConfig& config, bool all=true);
void print(Print* debugger); void print(Print* debugger);

17
lib/AmsConfiguration/src/AmsConfiguration.cpp
View File

@@ -518,7 +518,7 @@ bool AmsConfiguration::setGpioConfig(GpioConfig& config) {
return ret; return ret;
} }
void AmsConfiguration::clearGpio(GpioConfig& config) { void AmsConfiguration::clearGpio(GpioConfig& config, bool all) {
config.apPin = 0xFF; config.apPin = 0xFF;
config.ledPin = 0xFF; config.ledPin = 0xFF;
config.ledInverted = true; config.ledInverted = true;
@@ -529,13 +529,16 @@ void AmsConfiguration::clearGpio(GpioConfig& config) {
config.tempSensorPin = 0xFF; config.tempSensorPin = 0xFF;
config.tempAnalogSensorPin = 0xFF; config.tempAnalogSensorPin = 0xFF;
config.vccPin = 0xFF; config.vccPin = 0xFF;
config.vccOffset = 0;
config.vccMultiplier = 1000;
config.vccBootLimit = 0;
config.vccResistorGnd = 0;
config.vccResistorVcc = 0;
config.ledDisablePin = 0xFF; config.ledDisablePin = 0xFF;
config.ledBehaviour = LED_BEHAVIOUR_DEFAULT;
if(all) {
config.vccOffset = 0;
config.vccMultiplier = 1000;
config.vccBootLimit = 0;
config.vccResistorGnd = 0;
config.vccResistorVcc = 0;
config.ledBehaviour = LED_BEHAVIOUR_DEFAULT;
}
} }
bool AmsConfiguration::getNtpConfig(NtpConfig& config) { bool AmsConfiguration::getNtpConfig(NtpConfig& config) {

2
src/AmsToMqttBridge.cpp
View File

@@ -280,7 +280,7 @@ void setup() {
if(config.getSystemConfig(sysConfig)) { if(config.getSystemConfig(sysConfig)) {
config.getMeterConfig(meterConfig); config.getMeterConfig(meterConfig);
if(sysConfig.boardType < 20) { if(sysConfig.boardType < 20) {
config.clearGpio(gpioConfig); config.clearGpio(gpioConfig, false);
hw.applyBoardConfig(sysConfig.boardType, gpioConfig, meterConfig, meterConfig.rxPin); hw.applyBoardConfig(sysConfig.boardType, gpioConfig, meterConfig, meterConfig.rxPin);
config.setMeterConfig(meterConfig); config.setMeterConfig(meterConfig);
config.setGpioConfig(gpioConfig); config.setGpioConfig(gpioConfig);