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

Remove duplicated variable

Browse Source 
The content of _activeSerial is also available in currentTransaction.target
This commit is contained in:
Thomas Basler 2022-06-27 21:56:55 +02:00
parent 65fb13fa41
commit e9e5c715f5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ void HoymilesRadio::loop()
if (_busyFlag && _rxTimeout.occured()) { if (_busyFlag && _rxTimeout.occured()) {
Serial.println(F("RX Period End")); Serial.println(F("RX Period End"));
std::shared_ptr<InverterAbstract> inv = Hoymiles.getInverterBySerial(_activeSerial.u64); std::shared_ptr<InverterAbstract> inv = Hoymiles.getInverterBySerial(currentTransaction.target.u64);
if (nullptr != inv) { if (nullptr != inv) {
uint8_t verifyResult = inv->verifyAllFragments(); uint8_t verifyResult = inv->verifyAllFragments();
@ -244,7 +244,6 @@ void HoymilesRadio::sendEsbPacket(serial_u target, uint8_t mainCmd, uint8_t subC
_radio->stopListening(); _radio->stopListening();
_radio->setChannel(getTxNxtChannel()); _radio->setChannel(getTxNxtChannel());
openWritingPipe(currentTransaction.target); openWritingPipe(currentTransaction.target);
_activeSerial = currentTransaction.target;
_radio->setRetries(3, 15); _radio->setRetries(3, 15);
dumpBuf("TX ", txBuffer, 10 + currentTransaction.len + 1); dumpBuf("TX ", txBuffer, 10 + currentTransaction.len + 1);
@ -275,12 +274,15 @@ bool HoymilesRadio::enqueTransaction(inverter_transaction_t* transaction)
void HoymilesRadio::sendRetransmitPacket(uint8_t fragment_id) void HoymilesRadio::sendRetransmitPacket(uint8_t fragment_id)
{ {
sendEsbPacket(_activeSerial, currentTransaction.mainCmd, (uint8_t)(0x80 + fragment_id), 0, 0, 60); sendEsbPacket(
currentTransaction.target,
currentTransaction.mainCmd,
(uint8_t)(0x80 + fragment_id), 0, 0, 60);
} }
void HoymilesRadio::sendLastPacketAgain() void HoymilesRadio::sendLastPacketAgain()
{ {
sendEsbPacket(_activeSerial, 0, 0, 0, 0, 60, true); sendEsbPacket(currentTransaction.target, 0, 0, 0, 0, 60, true);
} }
void HoymilesRadio::u32CpyLittleEndian(uint8_t dest[], uint32_t src) void HoymilesRadio::u32CpyLittleEndian(uint8_t dest[], uint32_t src)

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

@ -56,7 +56,6 @@ private:
TimeoutHelper _rxTimeout; TimeoutHelper _rxTimeout;
serial_u _dtuSerial; serial_u _dtuSerial;
serial_u _activeSerial;
bool _busyFlag = false; bool _busyFlag = false;