Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-19 08:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hoymiles Lib: Remove hard coded Serial output

Browse Source 
The serial port for output of debug information can now changed during runtime
This commit is contained in:
Thomas Basler
2022-12-19 20:52:12 +01:00
parent 3421c9a0b1
commit f689fedf4e
10 changed files with 72 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Hoymiles/src/parser/DevInfoParser.cpp
View File

@@ -3,6 +3,7 @@
* Copyright (C) 2022 Thomas Basler and others
*/
#include "DevInfoParser.h"
#include "../Hoymiles.h"
#include <cstring>
#define ALL 0xff
@@ -36,7 +37,7 @@ void DevInfoParser::clearBufferAll()
void DevInfoParser::appendFragmentAll(uint8_t offset, uint8_t* payload, uint8_t len)
{
if (offset + len > DEV_INFO_SIZE) {
Serial.printf("FATAL: (%s, %d) dev info all packet too large for buffer\n", __FILE__, __LINE__);
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info all packet too large for buffer\n", __FILE__, __LINE__);
return;
}
memcpy(&_payloadDevInfoAll[offset], payload, len);
@@ -52,7 +53,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 Simple packet too large for buffer\n", __FILE__, __LINE__);
Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) dev info Simple packet too large for buffer\n", __FILE__, __LINE__);
return;
}
memcpy(&_payloadDevInfoSimple[offset], payload, len);
@@ -88,7 +89,7 @@ uint16_t DevInfoParser::getFwBuildVersion()
time_t DevInfoParser::getFwBuildDateTime()
{
struct tm timeinfo = { };
struct tm timeinfo = {};
timeinfo.tm_year = ((((uint16_t)_payloadDevInfoAll[2]) << 8) | _payloadDevInfoAll[3]) - 1900;
timeinfo.tm_mon = ((((uint16_t)_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) / 100 - 1;
@@ -143,10 +144,10 @@ String DevInfoParser::getHwModelName()
uint8_t DevInfoParser::getDevIdx()
{
uint8_t pos;
// Check for all 4 bytes first
uint8_t pos;
// Check for all 4 bytes first
for (pos = 0; pos < sizeof(devInfo) / sizeof(devInfo_t); pos++) {
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
&& devInfo[pos].hwPart[1] == _payloadDevInfoSimple[3]
&& devInfo[pos].hwPart[2] == _payloadDevInfoSimple[4]
&& devInfo[pos].hwPart[3] == _payloadDevInfoSimple[5]) {
@@ -156,7 +157,7 @@ uint8_t DevInfoParser::getDevIdx()
// Then only for 3 bytes
for (pos = 0; pos < sizeof(devInfo) / sizeof(devInfo_t); pos++) {
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
&& devInfo[pos].hwPart[1] == _payloadDevInfoSimple[3]
&& devInfo[pos].hwPart[2] == _payloadDevInfoSimple[4]) {
return pos;