mirror of
https://github.com/esphome/esphome.git
synced 2024-11-30 18:54:14 +01:00
remove the link to bytebuffer.
This commit is contained in:
parent
8a24f1953d
commit
06d494ec49
1 changed files with 4 additions and 8 deletions
|
@ -5,7 +5,6 @@
|
||||||
#include "esphome/core/automation.h"
|
#include "esphome/core/automation.h"
|
||||||
#include "esphome/core/component.h"
|
#include "esphome/core/component.h"
|
||||||
#include "esphome/core/helpers.h"
|
#include "esphome/core/helpers.h"
|
||||||
#include "esphome/core/bytebuffer.h"
|
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
#include <esp_now.h>
|
#include <esp_now.h>
|
||||||
|
|
||||||
|
@ -254,7 +253,7 @@ template<typename... Ts> class SendAction : public Action<Ts...>, public Parente
|
||||||
template<typename V> void set_mac(V mac) { this->mac_ = mac; }
|
template<typename V> void set_mac(V mac) { this->mac_ = mac; }
|
||||||
template<typename V> void set_command(V command) { this->command_ = command; }
|
template<typename V> void set_command(V command) { this->command_ = command; }
|
||||||
|
|
||||||
void set_data_template(std::function<ByteBuffer(Ts...)> func) {
|
void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func) {
|
||||||
this->data_func_ = func;
|
this->data_func_ = func;
|
||||||
this->static_ = false;
|
this->static_ = false;
|
||||||
}
|
}
|
||||||
|
@ -270,13 +269,10 @@ template<typename... Ts> class SendAction : public Action<Ts...>, public Parente
|
||||||
command = this->mac_.value(x...);
|
command = this->mac_.value(x...);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this->static_) {
|
if (!this->static_) {
|
||||||
this->parent_->get_default_protocol()->send(mac, this->data_static_.data(), this->data_static_.size(), command);
|
this->data_static_ = this->data_func_(x...);
|
||||||
} else {
|
|
||||||
ByteBuffer data = this->data_func_(x...);
|
|
||||||
this->parent_->get_default_protocol()->send(mac, data.get_data().data(), (uint8_t) data.get_used_space(),
|
|
||||||
command);
|
|
||||||
}
|
}
|
||||||
|
this->parent_->get_default_protocol()->send(mac, this->data_static_.data(), this->data_static_.size(), command);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
Loading…
Reference in a new issue