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

Use Parser class in Statistics and Alarm parser

Browse Source
This commit is contained in:
Thomas Basler 2022-08-08 20:42:14 +02:00
parent 8715320282
commit ee339fa9bd
4 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Hoymiles/src/parser/AlarmLogParser.cpp
View File

@ -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

8
lib/Hoymiles/src/parser/AlarmLogParser.h
View File

@ -1,4 +1,5 @@
#pragma once
#include "Parser.h"
#include <cstdint>
#include <Arduino.h>
@ -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;
};

10
lib/Hoymiles/src/parser/StatisticsParser.cpp
View File

@ -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;

8
lib/Hoymiles/src/parser/StatisticsParser.h
View File

@ -1,4 +1,5 @@
#pragma once
#include "Parser.h"
#include <Arduino.h>
#include <cstdint>
@ -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;
};