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

Fix: Ensure that only completly assembled packets are put into the command queue

Browse Source
This commit is contained in:
Thomas Basler 2023-08-02 22:41:53 +02:00
parent 686112e4ee
commit be09c4052f
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,15 @@ public:
bool isInitialized(); bool isInitialized();
template <typename T> template <typename T>
T* enqueCommand() void enqueCommand(std::shared_ptr<T> cmd)
{ {
_commandQueue.push(std::make_shared<T>()); _commandQueue.push(cmd);
return static_cast<T*>(_commandQueue.back().get()); }
template <typename T>
std::shared_ptr<T> prepareCommand()
{
return std::make_shared<T>();
} }
protected: protected:

3
lib/Hoymiles/src/inverters/HMS_Abstract.cpp
View File

@ -18,9 +18,10 @@ bool HMS_Abstract::sendChangeChannelRequest()
return false; return false;
} }
ChannelChangeCommand* cmdChannel = _radio->enqueCommand<ChannelChangeCommand>(); auto cmdChannel = _radio->prepareCommand<ChannelChangeCommand>();
cmdChannel->setChannel(HoymilesRadio_CMT::getChannelFromFrequency(Hoymiles.getRadioCmt()->getInverterTargetFrequency())); cmdChannel->setChannel(HoymilesRadio_CMT::getChannelFromFrequency(Hoymiles.getRadioCmt()->getInverterTargetFrequency()));
cmdChannel->setTargetAddress(serial()); cmdChannel->setTargetAddress(serial());
_radio->enqueCommand(cmdChannel);
return true; return true;
}; };

3
lib/Hoymiles/src/inverters/HMT_Abstract.cpp
View File

@ -20,9 +20,10 @@ bool HMT_Abstract::sendChangeChannelRequest()
return false; return false;
} }
ChannelChangeCommand* cmdChannel = _radio->enqueCommand<ChannelChangeCommand>(); auto cmdChannel = _radio->prepareCommand<ChannelChangeCommand>();
cmdChannel->setChannel(HoymilesRadio_CMT::getChannelFromFrequency(Hoymiles.getRadioCmt()->getInverterTargetFrequency())); cmdChannel->setChannel(HoymilesRadio_CMT::getChannelFromFrequency(Hoymiles.getRadioCmt()->getInverterTargetFrequency()));
cmdChannel->setTargetAddress(serial()); cmdChannel->setTargetAddress(serial());
_radio->enqueCommand(cmdChannel);
return true; return true;
}; };

24
lib/Hoymiles/src/inverters/HM_Abstract.cpp
View File

@ -29,9 +29,10 @@ bool HM_Abstract::sendStatsRequest()
time_t now; time_t now;
time(&now); time(&now);
RealTimeRunDataCommand* cmd = _radio->enqueCommand<RealTimeRunDataCommand>(); auto cmd = _radio->prepareCommand<RealTimeRunDataCommand>();
cmd->setTime(now); cmd->setTime(now);
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
return true; return true;
} }
@ -60,9 +61,10 @@ bool HM_Abstract::sendAlarmLogRequest(bool force)
time_t now; time_t now;
time(&now); time(&now);
AlarmDataCommand* cmd = _radio->enqueCommand<AlarmDataCommand>(); auto cmd = _radio->prepareCommand<AlarmDataCommand>();
cmd->setTime(now); cmd->setTime(now);
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
EventLog()->setLastAlarmRequestSuccess(CMD_PENDING); EventLog()->setLastAlarmRequestSuccess(CMD_PENDING);
return true; return true;
@ -82,13 +84,15 @@ bool HM_Abstract::sendDevInfoRequest()
time_t now; time_t now;
time(&now); time(&now);
DevInfoAllCommand* cmdAll = _radio->enqueCommand<DevInfoAllCommand>(); auto cmdAll = _radio->prepareCommand<DevInfoAllCommand>();
cmdAll->setTime(now); cmdAll->setTime(now);
cmdAll->setTargetAddress(serial()); cmdAll->setTargetAddress(serial());
_radio->enqueCommand(cmdAll);
DevInfoSimpleCommand* cmdSimple = _radio->enqueCommand<DevInfoSimpleCommand>(); auto cmdSimple = _radio->prepareCommand<DevInfoSimpleCommand>();
cmdSimple->setTime(now); cmdSimple->setTime(now);
cmdSimple->setTargetAddress(serial()); cmdSimple->setTargetAddress(serial());
_radio->enqueCommand(cmdSimple);
return true; return true;
} }
@ -107,9 +111,10 @@ bool HM_Abstract::sendSystemConfigParaRequest()
time_t now; time_t now;
time(&now); time(&now);
SystemConfigParaCommand* cmd = _radio->enqueCommand<SystemConfigParaCommand>(); auto cmd = _radio->prepareCommand<SystemConfigParaCommand>();
cmd->setTime(now); cmd->setTime(now);
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
SystemConfigPara()->setLastLimitRequestSuccess(CMD_PENDING); SystemConfigPara()->setLastLimitRequestSuccess(CMD_PENDING);
return true; return true;
@ -128,9 +133,10 @@ bool HM_Abstract::sendActivePowerControlRequest(float limit, PowerLimitControlTy
_activePowerControlLimit = limit; _activePowerControlLimit = limit;
_activePowerControlType = type; _activePowerControlType = type;
ActivePowerControlCommand* cmd = _radio->enqueCommand<ActivePowerControlCommand>(); auto cmd = _radio->prepareCommand<ActivePowerControlCommand>();
cmd->setActivePowerLimit(limit, type); cmd->setActivePowerLimit(limit, type);
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
SystemConfigPara()->setLastLimitCommandSuccess(CMD_PENDING); SystemConfigPara()->setLastLimitCommandSuccess(CMD_PENDING);
return true; return true;
@ -153,9 +159,10 @@ bool HM_Abstract::sendPowerControlRequest(bool turnOn)
_powerState = 0; _powerState = 0;
} }
PowerControlCommand* cmd = _radio->enqueCommand<PowerControlCommand>(); auto cmd = _radio->prepareCommand<PowerControlCommand>();
cmd->setPowerOn(turnOn); cmd->setPowerOn(turnOn);
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
PowerCommand()->setLastPowerCommandSuccess(CMD_PENDING); PowerCommand()->setLastPowerCommandSuccess(CMD_PENDING);
return true; return true;
@ -169,9 +176,10 @@ bool HM_Abstract::sendRestartControlRequest()
_powerState = 2; _powerState = 2;
PowerControlCommand* cmd = _radio->enqueCommand<PowerControlCommand>(); auto cmd = _radio->prepareCommand<PowerControlCommand>();
cmd->setRestart(); cmd->setRestart();
cmd->setTargetAddress(serial()); cmd->setTargetAddress(serial());
_radio->enqueCommand(cmd);
PowerCommand()->setLastPowerCommandSuccess(CMD_PENDING); PowerCommand()->setLastPowerCommandSuccess(CMD_PENDING);
return true; return true;