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

Allow fragments without payload

Browse Source 
This is required for several DevControl commands
This commit is contained in:
Thomas Basler 2022-08-03 19:13:31 +02:00
parent 857e4a3671
commit 081b19f9fb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Hoymiles/src/inverters/InverterAbstract.cpp
View File

@ -58,7 +58,7 @@ void InverterAbstract::clearRxFragmentBuffer()
void InverterAbstract::addRxFragment(uint8_t fragment[], uint8_t len) void InverterAbstract::addRxFragment(uint8_t fragment[], uint8_t len)
{ {
if (len < 11 + 1) { if (len < 11) {
Serial.printf("FATAL: (%s, %d) fragment too short\n", __FILE__, __LINE__); Serial.printf("FATAL: (%s, %d) fragment too short\n", __FILE__, __LINE__);
return; return;
} }
@ -78,6 +78,7 @@ void InverterAbstract::addRxFragment(uint8_t fragment[], uint8_t len)
// Packets with 0x81 will be seen as 1 // Packets with 0x81 will be seen as 1
memcpy(_rxFragmentBuffer[(fragmentCount & 0b01111111) - 1].fragment, &fragment[10], len - 11); memcpy(_rxFragmentBuffer[(fragmentCount & 0b01111111) - 1].fragment, &fragment[10], len - 11);
_rxFragmentBuffer[(fragmentCount & 0b01111111) - 1].len = len - 11; _rxFragmentBuffer[(fragmentCount & 0b01111111) - 1].len = len - 11;
_rxFragmentBuffer[(fragmentCount & 0b01111111) - 1].wasReceived = true;
if ((fragmentCount & 0b01111111) > _rxFragmentLastPacketId) { if ((fragmentCount & 0b01111111) > _rxFragmentLastPacketId) {
_rxFragmentLastPacketId = fragmentCount & 0b01111111; _rxFragmentLastPacketId = fragmentCount & 0b01111111;
@ -111,7 +112,7 @@ uint8_t InverterAbstract::verifyAllFragments(CommandAbstract* cmd)
// Middle fragment is missing // Middle fragment is missing
for (uint8_t i = 0; i < _rxFragmentMaxPacketId - 1; i++) { for (uint8_t i = 0; i < _rxFragmentMaxPacketId - 1; i++) {
if (_rxFragmentBuffer[i].len == 0) { if (!_rxFragmentBuffer[i].wasReceived) {
Serial.println(F("Middle missing")); Serial.println(F("Middle missing"));
if (_rxFragmentRetransmitCnt++ < MAX_RETRANSMIT_COUNT) { if (_rxFragmentRetransmitCnt++ < MAX_RETRANSMIT_COUNT) {
return i + 1; return i + 1;

1
lib/Hoymiles/src/types.h
View File

@ -13,4 +13,5 @@ union serial_u {
typedef struct { typedef struct {
uint8_t fragment[MAX_RF_PAYLOAD_SIZE]; uint8_t fragment[MAX_RF_PAYLOAD_SIZE];
uint8_t len; uint8_t len;
bool wasReceived;
} fragment_t; } fragment_t;