diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp index ed2651f..e19e46c 100644 --- a/lib/Hoymiles/src/Hoymiles.cpp +++ b/lib/Hoymiles/src/Hoymiles.cpp @@ -47,7 +47,7 @@ void HoymilesClass::loop() } // Fetch dev info (but first fetch stats) - if (iv->Statistics()->getLastUpdate() > 0 && (iv->DevInfo()->getLastUpdateAll() == 0 || iv->DevInfo()->getLastUpdateSample() == 0)) { + if (iv->Statistics()->getLastUpdate() > 0 && (iv->DevInfo()->getLastUpdateAll() == 0 || iv->DevInfo()->getLastUpdateSimple() == 0)) { Serial.println(F("Request device info")); iv->sendDevInfoRequest(_radio.get()); } diff --git a/lib/Hoymiles/src/commands/DevInfoSimpleCommand.cpp b/lib/Hoymiles/src/commands/DevInfoSimpleCommand.cpp index dd935e9..7b583c9 100644 --- a/lib/Hoymiles/src/commands/DevInfoSimpleCommand.cpp +++ b/lib/Hoymiles/src/commands/DevInfoSimpleCommand.cpp @@ -28,6 +28,6 @@ bool DevInfoSimpleCommand::handleResponse(InverterAbstract* inverter, fragment_t inverter->DevInfo()->appendFragmentSimple(offs, fragment[i].fragment, fragment[i].len); offs += (fragment[i].len); } - inverter->DevInfo()->setLastUpdateSample(millis()); + inverter->DevInfo()->setLastUpdateSimple(millis()); return true; } \ No newline at end of file diff --git a/lib/Hoymiles/src/inverters/HM_Abstract.cpp b/lib/Hoymiles/src/inverters/HM_Abstract.cpp index a4636bf..e1c80cf 100644 --- a/lib/Hoymiles/src/inverters/HM_Abstract.cpp +++ b/lib/Hoymiles/src/inverters/HM_Abstract.cpp @@ -69,9 +69,9 @@ bool HM_Abstract::sendDevInfoRequest(HoymilesRadio* radio) cmdAll->setTime(now); cmdAll->setTargetAddress(serial()); - DevInfoSimpleCommand* cmdSample = radio->enqueCommand(); - cmdSample->setTime(now); - cmdSample->setTargetAddress(serial()); + DevInfoSimpleCommand* cmdSimple = radio->enqueCommand(); + cmdSimple->setTime(now); + cmdSimple->setTargetAddress(serial()); return true; } diff --git a/lib/Hoymiles/src/parser/DevInfoParser.cpp b/lib/Hoymiles/src/parser/DevInfoParser.cpp index 419dab0..cefdfb7 100644 --- a/lib/Hoymiles/src/parser/DevInfoParser.cpp +++ b/lib/Hoymiles/src/parser/DevInfoParser.cpp @@ -26,7 +26,7 @@ void DevInfoParser::clearBufferSimple() void DevInfoParser::appendFragmentSimple(uint8_t offset, uint8_t* payload, uint8_t len) { if (offset + len > DEV_INFO_SIZE) { - Serial.printf("FATAL: (%s, %d) dev info Sample packet too large for buffer\n", __FILE__, __LINE__); + Serial.printf("FATAL: (%s, %d) dev info Simple packet too large for buffer\n", __FILE__, __LINE__); return; } memcpy(&_payloadDevInfoSimple[offset], payload, len); @@ -44,14 +44,14 @@ void DevInfoParser::setLastUpdateAll(uint32_t lastUpdate) setLastUpdate(lastUpdate); } -uint32_t DevInfoParser::getLastUpdateSample() +uint32_t DevInfoParser::getLastUpdateSimple() { - return _lastUpdateSample; + return _lastUpdateSimple; } -void DevInfoParser::setLastUpdateSample(uint32_t lastUpdate) +void DevInfoParser::setLastUpdateSimple(uint32_t lastUpdate) { - _lastUpdateSample = lastUpdate; + _lastUpdateSimple = lastUpdate; setLastUpdate(lastUpdate); } diff --git a/lib/Hoymiles/src/parser/DevInfoParser.h b/lib/Hoymiles/src/parser/DevInfoParser.h index de0c177..0718efa 100644 --- a/lib/Hoymiles/src/parser/DevInfoParser.h +++ b/lib/Hoymiles/src/parser/DevInfoParser.h @@ -15,8 +15,8 @@ public: uint32_t getLastUpdateAll(); void setLastUpdateAll(uint32_t lastUpdate); - uint32_t getLastUpdateSample(); - void setLastUpdateSample(uint32_t lastUpdate); + uint32_t getLastUpdateSimple(); + void setLastUpdateSimple(uint32_t lastUpdate); uint16_t getFwBuildVersion(); time_t getFwBuildDateTime(); @@ -29,7 +29,7 @@ private: time_t timegm(struct tm* tm); uint32_t _lastUpdateAll = 0; - uint32_t _lastUpdateSample = 0; + uint32_t _lastUpdateSimple = 0; uint8_t _payloadDevInfoAll[DEV_INFO_SIZE] = {}; uint8_t _devInfoAllLength = 0;