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

Move serveral methods from the HoymilesRadio_NRF class to the HoymilesRadio base class

Browse Source
This commit is contained in:
Thomas Basler 2023-03-06 23:42:05 +01:00
parent 8404dd57a7
commit 41e2ba7fcf
4 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
*/
#include "HoymilesRadio.h"
#include "Hoymiles.h"
#include "crc.h"
serial_u HoymilesRadio::DtuSerial()
{
@ -27,6 +28,29 @@ serial_u HoymilesRadio::convertSerialToRadioId(serial_u serial)
return radioId;
}
bool HoymilesRadio::checkFragmentCrc(fragment_t* fragment)
{
uint8_t crc = crc8(fragment->fragment, fragment->len - 1);
return (crc == fragment->fragment[fragment->len - 1]);
}
void HoymilesRadio::sendRetransmitPacket(uint8_t fragment_id)
{
CommandAbstract* cmd = _commandQueue.front().get();
CommandAbstract* requestCmd = cmd->getRequestFrameCommand(fragment_id);
if (requestCmd != nullptr) {
sendEsbPacket(requestCmd);
}
}
void HoymilesRadio::sendLastPacketAgain()
{
CommandAbstract* cmd = _commandQueue.front().get();
sendEsbPacket(cmd);
}
void HoymilesRadio::dumpBuf(const char* info, uint8_t buf[], uint8_t len)
{

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

@ -22,6 +22,11 @@ protected:
static serial_u convertSerialToRadioId(serial_u serial);
void dumpBuf(const char* info, uint8_t buf[], uint8_t len);
bool checkFragmentCrc(fragment_t* fragment);
virtual void sendEsbPacket(CommandAbstract* cmd) = 0;
void sendRetransmitPacket(uint8_t fragment_id);
void sendLastPacketAgain();
serial_u _dtuSerial;
std::queue<std::shared_ptr<CommandAbstract>> _commandQueue;
};

25
lib/Hoymiles/src/HoymilesRadio_NRF.cpp
View File

@ -5,7 +5,6 @@
#include "HoymilesRadio_NRF.h"
#include "Hoymiles.h"
#include "commands/RequestFrameCommand.h"
#include "crc.h"
#include <Every.h>
#include <FunctionalInterrupt.h>
@ -215,11 +214,7 @@ void HoymilesRadio_NRF::switchRxCh()
_radio->startListening();
}
bool HoymilesRadio_NRF::checkFragmentCrc(fragment_t* fragment)
{
uint8_t crc = crc8(fragment->fragment, fragment->len - 1);
return (crc == fragment->fragment[fragment->len - 1]);
}
void HoymilesRadio_NRF::sendEsbPacket(CommandAbstract* cmd)
{
@ -250,21 +245,3 @@ void HoymilesRadio_NRF::sendEsbPacket(CommandAbstract* cmd)
_busyFlag = true;
_rxTimeout.set(cmd->getTimeout());
}
void HoymilesRadio_NRF::sendRetransmitPacket(uint8_t fragment_id)
{
CommandAbstract* cmd = _commandQueue.front().get();
CommandAbstract* requestCmd = cmd->getRequestFrameCommand(fragment_id);
if (requestCmd != nullptr) {
sendEsbPacket(requestCmd);
}
}
void HoymilesRadio_NRF::sendLastPacketAgain()
{
CommandAbstract* cmd = _commandQueue.front().get();
sendEsbPacket(cmd);
}

3
lib/Hoymiles/src/HoymilesRadio_NRF.h
View File

@ -31,11 +31,8 @@ private:
void switchRxCh();
void openReadingPipe();
void openWritingPipe(serial_u serial);
bool checkFragmentCrc(fragment_t* fragment);
void sendEsbPacket(CommandAbstract* cmd);
void sendRetransmitPacket(uint8_t fragment_id);
void sendLastPacketAgain();
std::unique_ptr<SPIClass> _spiPtr;
std::unique_ptr<RF24> _radio;