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

make sure only esp32 is allowed.

Browse source 
fixing CI errors
This commit is contained in:
NP v/d Spek 2024-07-26 19:04:38 +02:00
parent 328b7255cb
commit b3ea9cf6fe
3 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
esphome/components/espnow/__init__.py
View file

@ -1,18 +1,12 @@
from esphome import automation
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.const import (
CONF_DATA,
CONF_ID,
CONF_MAC_ADDRESS,
CONF_TRIGGER_ID,
CONF_WIFI,
)
from esphome.const import CONF_DATA, CONF_ID, CONF_MAC_ADDRESS, CONF_TRIGGER_ID
from esphome.core import CORE
CODEOWNERS = ["@LumenSoftNL", "@jesserockz"]
espnow_ns = cg.esphome_ns.namespace("esp_now")
espnow_ns = cg.esphome_ns.namespace("espnow")
ESPNowComponent = espnow_ns.class_("ESPNowComponent", cg.Component)
ESPNowListener = espnow_ns.class_("ESPNowListener")
@ -54,17 +48,6 @@ def validate_raw_data(value):
)
def disallowed_component(comp):
"""Validate that this option can only be specified when the component `comp` is not loaded."""
def validator(value):
if comp in CORE.loaded_integrations:
raise cv.Invalid(f"This component requires component {comp}")
return value
return validator
CONFIG_SCHEMA = cv.Schema(
{
cv.GenerateID(): cv.declare_id(ESPNowComponent),
@ -87,7 +70,7 @@ CONFIG_SCHEMA = cv.Schema(
),
cv.Optional(CONF_PEERS): cv.ensure_list(cv.mac_address),
},
disallowed_component(CONF_WIFI),
cv.only_on_esp32,
).extend(cv.COMPONENT_SCHEMA)

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

@ -18,9 +18,9 @@
#include "esphome/core/log.h"
namespace esphome {
namespace esp_now {
namespace espnow {
static const char *const TAG = "esp_now";
static const char *const TAG = "espnow";
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 1)
typedef struct {
@ -275,7 +275,7 @@ void ESPNowComponent::loop() {
/**< callback function of receiving ESPNOW data */
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 1)
void ESPNowComponent::on_data_received((const esp_now_recv_info_t *recv_info, const uint8_t *data, int size)
void ESPNowComponent::on_data_received(const esp_now_recv_info_t *recv_info, const uint8_t *data, int size)
#else
void ESPNowComponent::on_data_received(const uint8_t *addr, const uint8_t *data, int size)
#endif
@ -300,7 +300,6 @@ void ESPNowComponent::on_data_received(const uint8_t *addr, const uint8_t *data,
package->rssi(rx_ctrl->rssi);
package->timestamp(rx_ctrl->timestamp);
global_esp_now->push_receive_package_(package);
}
void ESPNowComponent::on_data_send(const uint8_t *mac_addr, esp_now_send_status_t status) {
@ -321,8 +320,7 @@ void ESPNowComponent::on_data_send(const uint8_t *mac_addr, esp_now_send_status_
global_esp_now->can_send_ = true;
}
ESPNowComponent *global_esp_now = nullptr;
} // namespace esp_now
} // namespace espnow
} // namespace esphome

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

@ -14,7 +14,7 @@
#include <vector>
namespace esphome {
namespace esp_now {
namespace espnow {
typedef uint8_t espnow_addr_t[6];
@ -121,7 +121,7 @@ class ESPNowComponent : public Component {
ESPNowComponent();
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 1)
static void on_data_received((const esp_now_recv_info_t *recv_info, const uint8_t *data, int size);
static void on_data_received(const esp_now_recv_info_t *recv_info, const uint8_t *data, int size);
#else
static void on_data_received(const uint8_t *addr, const uint8_t *data, int size);
#endif
@ -129,14 +129,12 @@ class ESPNowComponent : public Component {
static void on_data_send(const uint8_t *mac_addr, esp_now_send_status_t status);
void dump_config() override;
float get_setup_priority() const override {
return -100; }
float get_setup_priority() const override { return -100; }
void setup() override;
void loop() override;
void set_wifi_channel(uint8_t channel) {
this->wifi_channel_ = channel; }
void set_wifi_channel(uint8_t channel) { this->wifi_channel_ = channel; }
ESPNowPackage *send_package(const uint64_t mac_address, const uint8_t *data, int len) {
auto package = new ESPNowPackage(mac_address, data, len);
@ -170,8 +168,7 @@ class ESPNowComponent : public Component {
esp_err_t add_peer(uint64_t addr);
esp_err_t del_peer(uint64_t addr);
void set_auto_add_peer(bool value) {
this->auto_add_peer_ = value; }
void set_auto_add_peer(bool value) { this->auto_add_peer_ = value; }
void on_package_received(ESPNowPackage *package);
void on_package_send(ESPNowPackage *package);
@ -181,8 +178,7 @@ class ESPNowComponent : public Component {
protected:
void unHold_send_(uint64_t mac);
void push_receive_package_(ESPNowPackage *package) {
this->receive_queue_.push(std::move(package)); }
void push_receive_package_(ESPNowPackage *package) { this->receive_queue_.push(std::move(package)); }
bool validate_channel_(uint8_t channel);
uint8_t wifi_channel_{0};
bool auto_add_peer_{false};
@ -279,7 +275,7 @@ class ESPNowNewPeerTrigger : public Trigger<ESPNowPackage *> {
extern ESPNowComponent *global_esp_now;
} // namespace esp_now
} // namespace espnow
} // namespace esphome
// #endif