Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-18 03:15:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

use vector in SendCommand

Browse source
This commit is contained in:
Guido Schreuder 2024-02-25 00:59:19 +01:00
parent 636e30bef6
commit ce44dd9b1b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/ebus/ebus_component.cpp
View file

@ -197,7 +197,7 @@ optional<SendCommand> EbusSensorBase::prepare_command() {
if (this->send_poll_) { if (this->send_poll_) {
command = SendCommand( // command = SendCommand( //
this->parent_->get_primary_address(), this->address_, this->command_, this->payload_.size(), &this->payload_[0]); this->parent_->get_primary_address(), this->address_, this->command_, this->payload_);
} }
return command; return command;
} }

8
esphome/components/ebus/telegram.cpp
View file

@ -104,15 +104,15 @@ bool Telegram::is_request_valid() {
SendCommand::SendCommand() { this->state_ = TelegramState::endCompleted; } SendCommand::SendCommand() { this->state_ = TelegramState::endCompleted; }
SendCommand::SendCommand(uint8_t qq, uint8_t zz, uint16_t command, uint8_t nn, uint8_t *data) { SendCommand::SendCommand(uint8_t qq, uint8_t zz, uint16_t command, std::vector<uint8_t> &data) {
this->state_ = TelegramState::waitForSend; this->state_ = TelegramState::waitForSend;
this->push_req_data(qq); this->push_req_data(qq);
this->push_req_data(zz); this->push_req_data(zz);
this->push_req_data(command >> 8); this->push_req_data(command >> 8);
this->push_req_data(command & 0xFF); this->push_req_data(command & 0xFF);
this->push_req_data(nn); this->push_req_data(data.size());
for (int i = 0; i < nn; i++) { for (int i = 0; i < data.size(); i++) {
this->push_req_data(data[i]); this->push_req_data(data.at(i));
} }
this->push_req_data(this->request_rolling_crc_); this->push_req_data(this->request_rolling_crc_);
} }

2
esphome/components/ebus/telegram.h
View file

@ -132,7 +132,7 @@ class Telegram : public TelegramBase {
class SendCommand : public TelegramBase { class SendCommand : public TelegramBase {
public: public:
SendCommand(); SendCommand();
SendCommand(uint8_t qq, uint8_t zz, uint16_t command, uint8_t nn, uint8_t *data); SendCommand(uint8_t qq, uint8_t zz, uint16_t command, std::vector<uint8_t> &data);
bool can_retry(int8_t max_tries); bool can_retry(int8_t max_tries);
uint8_t get_crc(); uint8_t get_crc();