sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-09 04:10:35 +01:00
Code Issues Releases Wiki Activity

- fix common test script

Browse Source 
- fix CI reported issues
This commit is contained in:
NP v/d Spek 2024-11-25 01:36:09 +01:00
parent 2593366a1b
commit f91739dc38
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
esphome/components/espnow/__init__.py
View File

@ -60,11 +60,11 @@ CONF_PROTOCOL_MODE = "protocol_mode"
validate_command = cv.Range(min=1, max=250)
ESPNowProtocol_mode = espnow_ns.enum("ESPNowProtocol_mode")
ESPNowProtocolMode = espnow_ns.enum("ESPNowProtocolMode")
ENUM_MODE = {
"universal": ESPNowProtocol_mode.pm_universal,
"keeper": ESPNowProtocol_mode.pm_keeper,
"drudge": ESPNowProtocol_mode.pm_drudge,
"universal": ESPNowProtocolMode.PM_UNIVERSAL,
"keeper": ESPNowProtocolMode.PM_KEEPER,
"drudge": ESPNowProtocolMode.PM_DRUDGE,
}

12
esphome/components/espnow/espnow.cpp
View File

@ -35,7 +35,7 @@ void show_packet(const std::string &title, const ESPNowPacket &packet) {
packet.attempts, packet.content_size(), packet.is_valid() ? "Yes" : "No");
}
std::string peer_str(const uint64_t peer) {
std::string peer_str(uint64_t peer) {
char mac[24];
if (peer == 0)
return "[Not Set]";
@ -43,9 +43,9 @@ std::string peer_str(const uint64_t peer) {
return "[Broadcast]";
if (peer == ESPNOW_MASS_SEND_ADDR)
return "[Mass Send]";
uint8_t *peer_ = (uint8_t *) &peer;
snprintf(mac, sizeof(mac), "%02X:%02X:%02X:%02X:%02X:%02X", peer_[0], peer_[1], peer_[2], peer_[3], peer_[4],
peer_[5]);
uint8_t *ppeer = (uint8_t *) &peer;
snprintf(mac, sizeof(mac), "%02X:%02X:%02X:%02X:%02X:%02X", ppeer[0], ppeer[1], ppeer[2], ppeer[3], ppeer[4],
ppeer[5]);
return mac;
}
@ -241,7 +241,7 @@ void ESPNowComponent::espnow_task(void *param) {
packet.timestamp = millis();
esp_err_t err;
if (packet.get_peer() == 0) {
if (packet.peer == ESPNOW_MASS_SEND_ADDR) {
err = esp_now_send(nullptr, packet.get_content(), packet.content_size());
} else {
err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());
@ -471,7 +471,7 @@ bool ESPNowComponent::send(ESPNowPacket packet) {
return true;
} else {
esp_err_t err;
if (packet.get_peer() == 0) {
if (packet.peer == ESPNOW_MASS_SEND_ADDR) {
err = esp_now_send(nullptr, packet.get_content(), packet.content_size());
} else {
err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());

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

@ -42,7 +42,7 @@ template<typename T> std::string espnow_i2h(T i) { return sprintf("%04x", i); }
std::string espnow_rdm(std::string::size_type length);
std::string peer_str(const uint64_t peer);
std::string peer_str(uint64_t peer);
void show_packet(const std::string &title, const ESPNowPacket &packet);
@ -116,15 +116,15 @@ struct ESPNowPacket {
class ESPNowComponent;
enum ESPNowProtocol_mode { pm_universal, pm_keeper, pm_drudge };
enum ESPNowProtocolMode { PM_UNIVERSAL, PM_KEEPER, PM_DRUDGE };
class ESPNowProtocol : public Parented<ESPNowComponent> {
public:
void set_protocol_mode(ESPNowProtocol_mode mode) { this->protocol_mode_ = mode; }
ESPNowProtocol_mode get_protocol_mode() { return this->protocol_mode_; }
void set_protocol_mode(ESPNowProtocolMode mode) { this->protocol_mode_ = mode; }
ESPNowProtocolMode get_protocol_mode() { return this->protocol_mode_; }
protected:
ESPNowProtocol_mode protocol_mode_{pm_universal};
ESPNowProtocolMode protocol_mode_{PM_UNIVERSAL};
public:
virtual uint32_t get_protocol_id() = 0;
@ -165,11 +165,11 @@ class ESPNowProtocol : public Parented<ESPNowComponent> {
std::map<uint64_t, uint8_t> next_sequents_{};
std::string get_mode_name_() {
switch (this->protocol_mode_) {
case pm_universal:
case PM_UNIVERSAL:
return "Universal";
case pm_keeper:
case PM_KEEPER:
return "Keeper";
case pm_drudge:
case PM_DRUDGE:
return "Drudge";
}
}

2
tests/components/espnow/common.yaml
View File

@ -5,7 +5,7 @@ external_components:
espnow:
auto_add_peer: true
peers:
predefined_peers:
- FF:FF:FF:FF:FF:FF
- peer_id: keeper
mac_address: 11:22:33:44:55:66