patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PowerMeter: Whitespace and {} fixes

Browse Source
This commit is contained in:
berni2288 2023-04-07 20:22:35 +02:00
parent 00def1d8d1
commit 19b2dd4c7a
No known key found for this signature in database
GPG Key ID: 713D4DB28836DC41
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PowerMeter.cpp
View File

@ -53,19 +53,19 @@ void PowerMeterClass::init()
if(config.PowerMeter_Source == SOURCE_SDM1PH || config.PowerMeter_Source == SOURCE_SDM3PH) { if(config.PowerMeter_Source == SOURCE_SDM1PH || config.PowerMeter_Source == SOURCE_SDM3PH) {
sdm.begin(); sdm.begin();
} }
if (config.PowerMeter_Source == SOURCE_HTTP) { if (config.PowerMeter_Source == SOURCE_HTTP) {
HttpPowerMeter.init(); HttpPowerMeter.init();
} }
if(config.PowerMeter_Source == SOURCE_SML) { if (config.PowerMeter_Source == SOURCE_SML) {
pinMode(SML_RX_PIN, INPUT); pinMode(SML_RX_PIN, INPUT);
inputSerial.begin(9600, SWSERIAL_8N1, SML_RX_PIN, -1, false, 128, 95); inputSerial.begin(9600, SWSERIAL_8N1, SML_RX_PIN, -1, false, 128, 95);
inputSerial.enableRx(true); inputSerial.enableRx(true);
inputSerial.enableTx(false); inputSerial.enableTx(false);
inputSerial.flush(); inputSerial.flush();
} }
mqttInitDone = true; mqttInitDone = true;
} }
@ -184,14 +184,16 @@ bool PowerMeterClass::smlReadLoop()
unsigned char smlCurrentChar = inputSerial.read(); unsigned char smlCurrentChar = inputSerial.read();
sml_states_t smlCurrentState = smlState(smlCurrentChar); sml_states_t smlCurrentState = smlState(smlCurrentChar);
if (smlCurrentState == SML_LISTEND) { if (smlCurrentState == SML_LISTEND) {
for(auto& handler: smlHandlerList) { for (auto& handler: smlHandlerList) {
if (smlOBISCheck(handler.OBIS)) { if (smlOBISCheck(handler.OBIS)) {
handler.Fn(readVal); handler.Fn(readVal);
*handler.Arg = readVal; *handler.Arg = readVal;
} }
} }
} else if (smlCurrentState == SML_FINAL) } else if (smlCurrentState == SML_FINAL) {
return true; return true;
}
} }
return false; return false;
} }