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

Better handling of rerequest of complete packets

Browse Source
This commit is contained in:
Thomas Basler 2022-06-27 19:37:03 +02:00
parent ab6261da92
commit 10de26bcb8
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Hoymiles/src/HoymilesRadio.cpp
View File

@ -88,7 +88,7 @@ void HoymilesRadio::loop()
if (verifyResult == 255) { if (verifyResult == 255) {
if (currentTransaction.sendCount < MAX_RESEND_COUNT) { if (currentTransaction.sendCount < MAX_RESEND_COUNT) {
Serial.println(F("Nothing received, resend whole request")); Serial.println(F("Nothing received, resend whole request"));
sendEsbPacket(currentTransaction.target, currentTransaction.mainCmd, currentTransaction.subCmd, currentTransaction.payload, currentTransaction.len, currentTransaction.timeout, true); sendLastPacketAgain();
} else { } else {
Serial.println(F("Nothing received, resend count exeeded")); Serial.println(F("Nothing received, resend count exeeded"));
_busyFlag = false; _busyFlag = false;
@ -220,42 +220,42 @@ void HoymilesRadio::sendEsbPacket(serial_u target, uint8_t mainCmd, uint8_t subC
if (!resend) { if (!resend) {
currentTransaction.sendCount = 0; currentTransaction.sendCount = 0;
currentTransaction.target = target;
currentTransaction.mainCmd = mainCmd;
currentTransaction.target = target;
currentTransaction.subCmd = subCmd;
memcpy(currentTransaction.payload, payload, len);
currentTransaction.len = len;
currentTransaction.timeout = timeout;
} else { } else {
currentTransaction.sendCount++; currentTransaction.sendCount++;
} }
memset(txBuffer, 0, MAX_RF_PAYLOAD_SIZE); memset(txBuffer, 0, MAX_RF_PAYLOAD_SIZE);
txBuffer[0] = mainCmd; txBuffer[0] = currentTransaction.mainCmd;
convertSerialToPacketId(&txBuffer[1], target); // 4 byte long convertSerialToPacketId(&txBuffer[1], currentTransaction.target); // 4 byte long
convertSerialToPacketId(&txBuffer[5], DtuSerial()); // 4 byte long convertSerialToPacketId(&txBuffer[5], DtuSerial()); // 4 byte long
txBuffer[9] = subCmd; txBuffer[9] = currentTransaction.subCmd;
memcpy(&txBuffer[10], payload, len); memcpy(&txBuffer[10], currentTransaction.payload, currentTransaction.len);
txBuffer[10 + len] = crc8(txBuffer, 10 + len); txBuffer[10 + currentTransaction.len] = crc8(txBuffer, 10 + currentTransaction.len);
currentTransaction.mainCmd = mainCmd;
currentTransaction.target = target;
currentTransaction.subCmd = subCmd;
memcpy(currentTransaction.payload, payload, len);
currentTransaction.len = len;
currentTransaction.timeout = timeout;
_radio->stopListening(); _radio->stopListening();
_radio->setChannel(getTxNxtChannel()); _radio->setChannel(getTxNxtChannel());
openWritingPipe(target); openWritingPipe(currentTransaction.target);
_activeSerial = currentTransaction.target;
_radio->setRetries(3, 15); _radio->setRetries(3, 15);
dumpBuf("TX ", txBuffer, 10 + len + 1); dumpBuf("TX ", txBuffer, 10 + currentTransaction.len + 1);
_radio->write(txBuffer, 10 + len + 1); _radio->write(txBuffer, 10 + currentTransaction.len + 1);
_radio->setRetries(0, 0); _radio->setRetries(0, 0);
openReadingPipe(); openReadingPipe();
_radio->setChannel(getRxNxtChannel()); _radio->setChannel(getRxNxtChannel());
_radio->startListening(); _radio->startListening();
_activeSerial = target;
_busyFlag = true; _busyFlag = true;
_rxTimeout.set(timeout); _rxTimeout.set(currentTransaction.timeout);
} }
bool HoymilesRadio::enqueTransaction(inverter_transaction_t* transaction) bool HoymilesRadio::enqueTransaction(inverter_transaction_t* transaction)