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

slang-tiny suggestion

Browse source
This commit is contained in:
NP v/d Spek 2024-09-30 00:17:44 +02:00
parent 64df4b3ea0
commit 562181147d
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,17 +45,11 @@ void ESPNowComponent::dump_config() {
ESP_LOGCONFIG(TAG, " MAC Address: 0x%12llx.", this->own_peer_address_); ESP_LOGCONFIG(TAG, " MAC Address: 0x%12llx.", this->own_peer_address_);
} }
void ESPNowComponent::show_packet(std::string title, const ESPNowPacket &packet) { void ESPNowComponent::show_packet(const std::string &title, const ESPNowPacket &packet) {
/* ESP_LOGVV(TAG, "%s Peer: packet: 0x%12llx M:%s H:%cx%cx%c P:%c%c%c 0x%02x S:%02x C:ox%02x~0x%02x S:%02d V:%s",
char buf[20]; "test", packet.peer, packet.content_at(0), packet.content_at(1), packet.content_at(2), packet.content_at(3),
sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); packet.content_at(4), packet.content_at(5), packet.content_at(6), packet.content_at(7), packet.crc(),
packet.calc_crc(), packet.content_size() packet.is_valid() ? "Yes" : "No");
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", "test",
buf, 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(6), packet.content_at(7), packet.crc(), packet.calc_crc(), packet.content_size()
packet.is_valid() ? "Yes" : "No");
*/
} }
bool ESPNowComponent::validate_channel_(uint8_t channel) { bool ESPNowComponent::validate_channel_(uint8_t channel) {
@ -186,21 +180,21 @@ ESPNowProtocol *ESPNowComponent::get_protocol_component_(uint32_t protocol) {
return this->protocols_[protocol]; return this->protocols_[protocol];
} }
void ESPNowComponent::call_on_receive_(const ESPNowPacket packet) { void ESPNowComponent::call_on_receive_(ESPNowPacket packet) {
ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol()); ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol());
if (protocol != nullptr) { if (protocol != nullptr) {
this->defer([protocol, packet]() { protocol->on_receive(packet); }); this->defer([protocol, packet]() { protocol->on_receive(packet); });
} }
} }
void ESPNowComponent::call_on_sent_(const ESPNowPacket packet, bool status) { void ESPNowComponent::call_on_sent_(ESPNowPacket packet, bool status) {
ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol()); ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol());
if (protocol != nullptr) { if (protocol != nullptr) {
this->defer([protocol, packet, status]() { protocol->on_sent(packet, status); }); this->defer([protocol, packet, status]() { protocol->on_sent(packet, status); });
} }
} }
void ESPNowComponent::call_on_new_peer_(const ESPNowPacket packet) { void ESPNowComponent::call_on_new_peer_(ESPNowPacket packet) {
ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol()); ESPNowProtocol *protocol = this->get_protocol_component_(packet.protocol());
if (protocol != nullptr) { if (protocol != nullptr) {
this->defer([protocol, packet]() { protocol->on_new_peer(packet); }); this->defer([protocol, packet]() { protocol->on_new_peer(packet); });

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

@ -229,7 +229,7 @@ class ESPNowComponent : public Component {
ESPNowDefaultProtocol *get_default_protocol(); ESPNowDefaultProtocol *get_default_protocol();
void show_packet(std::string title, const ESPNowPacket &packet); void show_packet(const std::string &title, const ESPNowPacket &packet);
protected: protected:
bool validate_channel_(uint8_t channel); bool validate_channel_(uint8_t channel);
@ -241,9 +241,9 @@ class ESPNowComponent : public Component {
bool use_sent_check_{true}; bool use_sent_check_{true};
bool lock_{false}; bool lock_{false};
void call_on_receive_(const ESPNowPacket packet); void call_on_receive_(ESPNowPacket packet);
void call_on_sent_(const ESPNowPacket packet, bool status); void call_on_sent_(ESPNowPacket packet, bool status);
void call_on_new_peer_(const ESPNowPacket packet); void call_on_new_peer_(ESPNowPacket packet);
QueueHandle_t receive_queue_{}; QueueHandle_t receive_queue_{};
QueueHandle_t send_queue_{}; QueueHandle_t send_queue_{};