Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-24 16:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

some CI linting fixes

Browse source
This commit is contained in:
NP v/d Spek 2024-09-23 01:00:42 +02:00
parent 275205d1d6
commit c7fd70b1b0
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/espnow/espnow.cpp
View file

@ -39,7 +39,7 @@ std::string format_mac_addr(const uint8_t *mac) {
sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return buf; return buf;
} }
void show_packet(std::string title, ESPNowPacket *packet) { void show_packet(char *title, ESPNowPacket *packet) {
ESP_LOGVV(TAG, "%s packet: M:%s H:%cx%cx%c P:%c%c%c 0x%02x S:%02x C:ox%02x~0x%02x S:%02d V:%s", title, ESP_LOGVV(TAG, "%s packet: M:%s H:%cx%cx%c P:%c%c%c 0x%02x S:%02x C:ox%02x~0x%02x S:%02d V:%s", title,
format_mac_addr(packet->peer_as_bytes()).c_str(), packet->content_at(0), packet->content_at(1), format_mac_addr(packet->peer_as_bytes()).c_str(), packet->content_at(0), packet->content_at(1),
packet->content_at(2), packet->content_at(3), packet->content_at(4), packet->content_at(5), packet->content_at(2), packet->content_at(3), packet->content_at(4), packet->content_at(5),

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

@ -20,8 +20,6 @@
namespace esphome { namespace esphome {
namespace espnow { namespace espnow {
typedef uint8_t espnow_addr_t[6];
static const uint64_t ESPNOW_BROADCAST_ADDR = 0xFFFFFFFFFFFF; static const uint64_t ESPNOW_BROADCAST_ADDR = 0xFFFFFFFFFFFF;
static uint64_t ESPNOW_ADDR_SELF = {0}; static uint64_t ESPNOW_ADDR_SELF = {0};
@ -38,8 +36,6 @@ static const uint8_t MAX_NUMBER_OF_RETRYS = 5;
static const uint32_t TRANSPORT_HEADER = 0xC19983; static const uint32_t TRANSPORT_HEADER = 0xC19983;
static const uint32_t ESPNOW_MAIN_PROTOCOL_ID = 0x11CFAF; static const uint32_t ESPNOW_MAIN_PROTOCOL_ID = 0x11CFAF;
static uint8_t last_ref_id = 0;
struct ESPNowPacket { struct ESPNowPacket {
uint64_t peer{0}; uint64_t peer{0};
uint8_t rssi{0}; uint8_t rssi{0};
@ -54,7 +50,8 @@ 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_ = new ByteBuffer(MAX_ESPNOW_DATA_SIZE); }; ESPNowPacket(){};
~ESPNowPacket(){};
// 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);
@ -91,7 +88,7 @@ struct ESPNowPacket {
} }
ByteBuffer *payload() { ByteBuffer *payload() {
this->payload_buffer_->set_position(this->payload_buffer_->get_used_space()); this->payload_buffer_.set_position(this->payload_buffer_.get_used_space());
return this->payload_buffer_; return this->payload_buffer_;
} }
@ -120,13 +117,13 @@ struct ESPNowPacket {
bool is_valid(); bool is_valid();
private: private:
ByteBuffer *payload_buffer_{nullptr}; ByteBuffer payload_buffer_(MAX_ESPNOW_DATA_SIZE);
void update_payload_() { void update_payload_() {
if (this->payload_buffer_->is_changed()) { if (this->payload_buffer_.is_changed()) {
this->payload_buffer_->flip(); this->payload_buffer_.flip();
this->payload_buffer_->get_bytes((uint8_t *) &(this->content.payload), this->payload_buffer_->get_used_space()); this->payload_buffer_.get_bytes((uint8_t *) &(this->content.payload), this->payload_buffer_.get_used_space());
this->size = this->payload_buffer_->get_used_space() + this->prefix_size(); this->size = this->payload_buffer_.get_used_space() + this->prefix_size();
} }
this->content.payload[this->size] = this->calc_crc(); this->content.payload[this->size] = this->calc_crc();
} }
@ -138,9 +135,9 @@ class ESPNowProtocol : public Parented<ESPNowComponent> {
public: public:
ESPNowProtocol(){}; ESPNowProtocol(){};
virtual void on_receive(ESPNowPacket *data_packet){}; virtual void on_receive(ESPNowPacket *packet){};
virtual void on_sent(ESPNowPacket *data_packet, bool status){}; virtual void on_sent(ESPNowPacket *packet, bool status){};
virtual void on_new_peer(ESPNowPacket *data_packet){}; virtual void on_new_peer(ESPNowPacket *packet){};
virtual uint32_t get_protocol_id() = 0; virtual uint32_t get_protocol_id() = 0;
uint8_t get_next_sequents() { uint8_t get_next_sequents() {
@ -174,17 +171,17 @@ class ESPNowDefaultProtocol : public ESPNowProtocol {
void add_on_receive_callback(std::function<void(ESPNowPacket *)> &&callback) { void add_on_receive_callback(std::function<void(ESPNowPacket *)> &&callback) {
this->on_receive_.add(std::move(callback)); this->on_receive_.add(std::move(callback));
} }
void on_receive(ESPNowPacket *data_packet) override { this->on_receive_.call(packet); }; void on_receive(ESPNowPacket *packet) override { this->on_receive_.call(packet); };
void add_on_sent_callback(std::function<void(ESPNowPacket *, bool status)> &&callback) { void add_on_sent_callback(std::function<void(ESPNowPacket *, bool status)> &&callback) {
this->on_sent_.add(std::move(callback)); this->on_sent_.add(std::move(callback));
} }
void on_sent(ESPNowPacket *data_packet, bool status) override { this->on_sent_.call(packet, status); }; void on_sent(ESPNowPacket *packet, bool status) override { this->on_sent_.call(packet, status); };
void add_on_peer_callback(std::function<void(ESPNowPacket *)> &&callback) { void add_on_peer_callback(std::function<void(ESPNowPacket *)> &&callback) {
this->on_new_peer_.add(std::move(callback)); this->on_new_peer_.add(std::move(callback));
} }
void on_new_peer(ESPNowPacket *data_packet) override { this->on_new_peer_.call(packet); }; void on_new_peer(ESPNowPacket *packet) override { this->on_new_peer_.call(packet); };
protected: protected:
CallbackManager<void(ESPNowPacket *, bool)> on_sent_; CallbackManager<void(ESPNowPacket *, bool)> on_sent_;
@ -216,7 +213,7 @@ class ESPNowComponent : public Component {
void runner(); void runner();
bool write(ESPNowPacket *data_packet); bool write(ESPNowPacket *packet);
void register_protocol(ESPNowProtocol *protocol) { void register_protocol(ESPNowProtocol *protocol) {
protocol->set_parent(this); protocol->set_parent(this);
@ -247,9 +244,9 @@ class ESPNowComponent : public Component {
bool use_sent_check_{true}; bool use_sent_check_{true};
bool lock_{false}; bool lock_{false};
void on_receive_(ESPNowPacket *data_packet); void on_receive_(ESPNowPacket *packet);
void on_sent_(ESPNowPacket *data_packet, bool status); void on_sent_(ESPNowPacket *packet, bool status);
void on_new_peer_(ESPNowPacket *data_packet); void on_new_peer_(ESPNowPacket *packet);
QueueHandle_t receive_queue_{}; QueueHandle_t receive_queue_{};
QueueHandle_t send_queue_{}; QueueHandle_t send_queue_{};