diff --git a/lib/Hoymiles/src/parser/AlarmLogParser.cpp b/lib/Hoymiles/src/parser/AlarmLogParser.cpp index 1a64924a..66953fd7 100644 --- a/lib/Hoymiles/src/parser/AlarmLogParser.cpp +++ b/lib/Hoymiles/src/parser/AlarmLogParser.cpp @@ -258,16 +258,6 @@ void AlarmLogParser::getLogEntry(uint8_t entryId, AlarmLogEntry_t* entry) } } -uint32_t AlarmLogParser::getLastUpdate() -{ - return _lastUpdate; -} - -void AlarmLogParser::setLastUpdate(uint32_t lastUpdate) -{ - _lastUpdate = lastUpdate; -} - int AlarmLogParser::getTimezoneOffset() { // see: https://stackoverflow.com/questions/13804095/get-the-time-zone-gmt-offset-in-c/44063597#44063597 diff --git a/lib/Hoymiles/src/parser/AlarmLogParser.h b/lib/Hoymiles/src/parser/AlarmLogParser.h index 3ecb5bbd..c984e347 100644 --- a/lib/Hoymiles/src/parser/AlarmLogParser.h +++ b/lib/Hoymiles/src/parser/AlarmLogParser.h @@ -1,4 +1,5 @@ #pragma once +#include "Parser.h" #include #include @@ -12,7 +13,7 @@ struct AlarmLogEntry_t { time_t EndTime; }; -class AlarmLogParser { +class AlarmLogParser : public Parser { public: void clearBuffer(); void appendFragment(uint8_t offset, uint8_t* payload, uint8_t len); @@ -20,14 +21,9 @@ public: uint8_t getEntryCount(); void getLogEntry(uint8_t entryId, AlarmLogEntry_t* entry); - uint32_t getLastUpdate(); - void setLastUpdate(uint32_t lastUpdate); - private: static int getTimezoneOffset(); uint8_t _payloadAlarmLog[ALARM_LOG_ENTRY_SIZE * ALARM_LOG_ENTRY_COUNT]; uint8_t _alarmLogLength; - - uint32_t _lastUpdate = 0; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/parser/StatisticsParser.cpp b/lib/Hoymiles/src/parser/StatisticsParser.cpp index 13ef18d5..2310a42b 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.cpp +++ b/lib/Hoymiles/src/parser/StatisticsParser.cpp @@ -112,16 +112,6 @@ void StatisticsParser::setChannelMaxPower(uint8_t channel, uint16_t power) } } -uint32_t StatisticsParser::getLastUpdate() -{ - return _lastUpdate; -} - -void StatisticsParser::setLastUpdate(uint32_t lastUpdate) -{ - _lastUpdate = lastUpdate; -} - static float calcYieldTotalCh0(StatisticsParser* iv, uint8_t arg0) { float yield = 0; diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h index 3a317a19..d253866a 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.h +++ b/lib/Hoymiles/src/parser/StatisticsParser.h @@ -1,4 +1,5 @@ #pragma once +#include "Parser.h" #include #include @@ -92,7 +93,7 @@ const calcFunc_t calcFunctions[] = { { CALC_IRR_CH, &calcIrradiation } }; -class StatisticsParser { +class StatisticsParser : public Parser { public: void clearBuffer(); void appendFragment(uint8_t offset, uint8_t* payload, uint8_t len); @@ -110,9 +111,6 @@ public: uint16_t getChannelMaxPower(uint8_t channel); void setChannelMaxPower(uint8_t channel, uint16_t power); - uint32_t getLastUpdate(); - void setLastUpdate(uint32_t lastUpdate); - private: uint8_t _payloadStatistic[STATISTIC_PACKET_SIZE]; uint8_t _statisticLength; @@ -120,6 +118,4 @@ private: const byteAssign_t* _byteAssignment; uint8_t _byteAssignmentCount; - - uint32_t _lastUpdate = 0; }; \ No newline at end of file