Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-28 09:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

make payload_buffet_ a shared_ptr type

Browse source
This commit is contained in:
NP v/d Spek 2024-09-23 11:43:49 +02:00
parent 2581f858ed
commit e388fd7526
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
esphome/components/espnow/espnow.h
View file

@ -50,7 +50,7 @@ struct ESPNowPacket {
uint8_t payload[MAX_ESPNOW_DATA_SIZE + 2]{0}; uint8_t payload[MAX_ESPNOW_DATA_SIZE + 2]{0};
} __attribute__((packed)) content; } __attribute__((packed)) content;
ESPNowPacket() { this->payload_buffer_ = make_unique(new ByteBuffer(MAX_ESPNOW_DATA_SIZE)); }; ESPNowPacket() { this->payload_buffer_ = std::make_shared<ByteBuffer>(MAX_ESPNOW_DATA_SIZE); };
// Create packet to be send. // Create packet to be send.
ESPNowPacket(uint64_t peer, const uint8_t *data, uint8_t size, uint32_t protocol); ESPNowPacket(uint64_t peer, const uint8_t *data, uint8_t size, uint32_t protocol);
@ -58,7 +58,7 @@ struct ESPNowPacket {
// Load received packet's. // Load received packet's.
ESPNowPacket(uint64_t peer, const uint8_t *data, uint8_t size); ESPNowPacket(uint64_t peer, const uint8_t *data, uint8_t size);
~ESPNowPacket() { delete this->payload_buffer_; } ~ESPNowPacket() {} // this->payload_buffer_ = nullptr;
uint8_t *peer_as_bytes() { return (uint8_t *) &(this->peer); } uint8_t *peer_as_bytes() { return (uint8_t *) &(this->peer); }
void set_peer(uint64_t peer) { void set_peer(uint64_t peer) {
@ -88,11 +88,6 @@ struct ESPNowPacket {
this->update_payload_(); this->update_payload_();
} }
ByteBuffer *payload() {
this->payload_buffer_->set_position(this->payload_buffer_->get_used_space());
return this->payload_buffer_;
}
uint8_t content_at(uint8_t pos) { uint8_t content_at(uint8_t pos) {
this->update_payload_(); this->update_payload_();
assert(pos < this->size); assert(pos < this->size);
@ -117,8 +112,13 @@ struct ESPNowPacket {
void retry() { this->attempts++; } void retry() { this->attempts++; }
bool is_valid(); bool is_valid();
std::shared_ptr<ByteBuffer> payload() {
this->payload_buffer_->set_position(this->payload_buffer_->get_used_space());
return this->payload_buffer_;
}
private: private:
std::unique<ByteBuffer> payload_buffer_{nullptr}; std::shared_ptr<ByteBuffer> payload_buffer_;
void update_payload_() { void update_payload_() {
if (this->payload_buffer_->is_changed()) { if (this->payload_buffer_->is_changed()) {

1
esphome/core/bytebuffer.h
View file

@ -34,6 +34,7 @@ class ByteBuffer {
public: public:
// Default constructor (compatibility with TEMPLATABLE_VALUE) // Default constructor (compatibility with TEMPLATABLE_VALUE)
ByteBuffer() : ByteBuffer(std::vector<uint8_t>()) {} ByteBuffer() : ByteBuffer(std::vector<uint8_t>()) {}
~ByteBuffer() = default;
/** /**
* Create a new Bytebuffer with the given capacity * Create a new Bytebuffer with the given capacity
*/ */