Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-30 13:04:13 +01:00
Code Issues Projects Releases Wiki Activity

add action to set the keeper peer address

Browse Source
This commit is contained in:
NP v/d Spek 2024-11-21 01:17:41 +01:00
parent 55c361ec67
commit 36ca1e7213
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,8 @@ ESPNowBroadcaseTrigger = espnow_ns.class_(
SendAction = espnow_ns.class_("SendAction", automation.Action) SendAction = espnow_ns.class_("SendAction", automation.Action)
NewPeerAction = espnow_ns.class_("NewPeerAction", automation.Action) NewPeerAction = espnow_ns.class_("NewPeerAction", automation.Action)
DelPeerAction = espnow_ns.class_("DelPeerAction", automation.Action) DelPeerAction = espnow_ns.class_("DelPeerAction", automation.Action)
SetKeeperAction = espnow_ns.class_("SetKeeperAction", automation.Action)
CONF_AUTO_ADD_PEER = "auto_add_peer" CONF_AUTO_ADD_PEER = "auto_add_peer"
CONF_CONFORMATION_TIMEOUT = "conformation_timeout" CONF_CONFORMATION_TIMEOUT = "conformation_timeout"
@ -238,7 +240,7 @@ async def register_protocol(var, config):
{ {
cv.GenerateID(): cv.use_id(ESPNowComponent), cv.GenerateID(): cv.use_id(ESPNowComponent),
cv.Required(CONF_PAYLOAD): cv.templatable(validate_raw_data), cv.Required(CONF_PAYLOAD): cv.templatable(validate_raw_data),
cv.Optional(CONF_COMMAND): cv.templatable(validate_command), cv.Optional(CONF_COMMAND, default=0): cv.templatable(validate_command),
}, },
key=CONF_PAYLOAD, key=CONF_PAYLOAD,
), ),
@ -251,13 +253,14 @@ async def register_protocol(var, config):
cv.GenerateID(): cv.use_id(ESPNowComponent), cv.GenerateID(): cv.use_id(ESPNowComponent),
cv.Required(CONF_PEER): cv.templatable(validate_peer), cv.Required(CONF_PEER): cv.templatable(validate_peer),
cv.Required(CONF_PAYLOAD): cv.templatable(validate_raw_data), cv.Required(CONF_PAYLOAD): cv.templatable(validate_raw_data),
cv.Optional(CONF_COMMAND): cv.templatable(validate_command), cv.Optional(CONF_COMMAND, default=0): cv.templatable(validate_command),
} }
), ),
) )
async def send_action(config, action_id, template_arg, args): async def send_action(config, action_id, template_arg, args):
var = cg.new_Pvariable(action_id, template_arg) var = cg.new_Pvariable(action_id, template_arg)
await cg.register_parented(var, config[CONF_ID]) await cg.register_parented(var, config[CONF_ID])
peer = config.get(CONF_PEER, 0xFFFFFFFFFFFF) peer = config.get(CONF_PEER, 0xFFFFFFFFFFFF)
template_ = await cg.templatable(peer, args, cg.uint64) template_ = await cg.templatable(peer, args, cg.uint64)
cg.add(var.set_peer(template_)) cg.add(var.set_peer(template_))
@ -299,7 +302,18 @@ async def send_action(config, action_id, template_arg, args):
key=CONF_PEER, key=CONF_PEER,
), ),
) )
async def add_del_peer_action(config, action_id, template_arg, args): @automation.register_action(
"espnow.keeper.set",
SetKeeperAction,
cv.maybe_simple_value(
{
cv.GenerateID(): cv.use_id(ESPNowComponent),
cv.Required(CONF_PEER): cv.templatable(validate_peer),
},
key=CONF_PEER,
),
)
async def peer_action(config, action_id, template_arg, args):
var = cg.new_Pvariable(action_id, template_arg) var = cg.new_Pvariable(action_id, template_arg)
await cg.register_parented(var, config[CONF_ID]) await cg.register_parented(var, config[CONF_ID])
template_ = await cg.templatable(config[CONF_PEER], args, cg.uint64) template_ = await cg.templatable(config[CONF_PEER], args, cg.uint64)

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

@ -360,6 +360,15 @@ template<typename... Ts> class DelPeerAction : public Action<Ts...>, public Pare
} }
}; };
template<typename... Ts> class SetKeeperAction : public Action<Ts...>, public Parented<ESPNowComponent> {
public:
TEMPLATABLE_VALUE(uint64_t, peer);
void play(Ts... x) override {
auto peer = this->peer_.value(x...);
parent_->set_keeper(peer);
}
};
class ESPNowSentTrigger : public Trigger<const ESPNowPacket, bool> { class ESPNowSentTrigger : public Trigger<const ESPNowPacket, bool> {
public: public:
explicit ESPNowSentTrigger(ESPNowComponent *parent) { explicit ESPNowSentTrigger(ESPNowComponent *parent) {