github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-06 10:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[pn7150/pn7160] Migrate triggers to callback automation

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-26 19:30:05 -10:00
parent 6aafb521c1
commit 0c4ebfb6bb
4 changed files with 16 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/pn7150/__init__.py
+8 -26
View File
@@ -50,14 +50,6 @@ SetWriteMessageAction = pn7150_ns.class_("SetWriteMessageAction", automation.Act
SetWriteModeAction = pn7150_ns.class_("SetWriteModeAction", automation.Action) SetWriteModeAction = pn7150_ns.class_("SetWriteModeAction", automation.Action)
PN7150OnEmulatedTagScanTrigger = pn7150_ns.class_(
"PN7150OnEmulatedTagScanTrigger", automation.Trigger.template()
)
PN7150OnFinishedWriteTrigger = pn7150_ns.class_(
"PN7150OnFinishedWriteTrigger", automation.Trigger.template()
)
PN7150IsWritingCondition = pn7150_ns.class_( PN7150IsWritingCondition = pn7150_ns.class_(
"PN7150IsWritingCondition", automation.Condition "PN7150IsWritingCondition", automation.Condition
) )
@@ -83,20 +75,8 @@ SET_MESSAGE_ACTION_SCHEMA = cv.Schema(
PN7150_SCHEMA = cv.Schema( PN7150_SCHEMA = cv.Schema(
{ {
cv.GenerateID(): cv.declare_id(PN7150), cv.GenerateID(): cv.declare_id(PN7150),
cv.Optional(CONF_ON_EMULATED_TAG_SCAN): automation.validate_automation( cv.Optional(CONF_ON_EMULATED_TAG_SCAN): automation.validate_automation({}),
{ cv.Optional(CONF_ON_FINISHED_WRITE): automation.validate_automation({}),
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
PN7150OnEmulatedTagScanTrigger
),
}
),
cv.Optional(CONF_ON_FINISHED_WRITE): automation.validate_automation(
{
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
PN7150OnFinishedWriteTrigger
),
}
),
cv.Optional(CONF_ON_TAG): automation.validate_automation( cv.Optional(CONF_ON_TAG): automation.validate_automation(
{ {
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(nfc.NfcOnTagTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(nfc.NfcOnTagTrigger),
@@ -215,12 +195,14 @@ async def setup_pn7150(var, config):
) )
for conf in config.get(CONF_ON_EMULATED_TAG_SCAN, []): for conf in config.get(CONF_ON_EMULATED_TAG_SCAN, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var) await automation.build_callback_automation(
await automation.build_automation(trigger, [], conf) var, "add_on_emulated_tag_scan_callback", [], conf
)
for conf in config.get(CONF_ON_FINISHED_WRITE, []): for conf in config.get(CONF_ON_FINISHED_WRITE, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var) await automation.build_callback_automation(
await automation.build_automation(trigger, [], conf) var, "add_on_finished_write_callback", [], conf
)
@automation.register_condition( @automation.register_condition(
esphome/components/pn7150/automation.h
-14
View File
@@ -7,20 +7,6 @@
namespace esphome { namespace esphome {
namespace pn7150 { namespace pn7150 {
class PN7150OnEmulatedTagScanTrigger : public Trigger<> {
public:
explicit PN7150OnEmulatedTagScanTrigger(PN7150 *parent) {
parent->add_on_emulated_tag_scan_callback([this]() { this->trigger(); });
}
};
class PN7150OnFinishedWriteTrigger : public Trigger<> {
public:
explicit PN7150OnFinishedWriteTrigger(PN7150 *parent) {
parent->add_on_finished_write_callback([this]() { this->trigger(); });
}
};
template<typename... Ts> class PN7150IsWritingCondition : public Condition<Ts...>, public Parented<PN7150> { template<typename... Ts> class PN7150IsWritingCondition : public Condition<Ts...>, public Parented<PN7150> {
public: public:
bool check(const Ts &...x) override { return this->parent_->is_writing(); } bool check(const Ts &...x) override { return this->parent_->is_writing(); }
esphome/components/pn7160/__init__.py
+8 -26
View File
@@ -52,14 +52,6 @@ SetWriteMessageAction = pn7160_ns.class_("SetWriteMessageAction", automation.Act
SetWriteModeAction = pn7160_ns.class_("SetWriteModeAction", automation.Action) SetWriteModeAction = pn7160_ns.class_("SetWriteModeAction", automation.Action)
PN7160OnEmulatedTagScanTrigger = pn7160_ns.class_(
"PN7160OnEmulatedTagScanTrigger", automation.Trigger.template()
)
PN7160OnFinishedWriteTrigger = pn7160_ns.class_(
"PN7160OnFinishedWriteTrigger", automation.Trigger.template()
)
PN7160IsWritingCondition = pn7160_ns.class_( PN7160IsWritingCondition = pn7160_ns.class_(
"PN7160IsWritingCondition", automation.Condition "PN7160IsWritingCondition", automation.Condition
) )
@@ -85,20 +77,8 @@ SET_MESSAGE_ACTION_SCHEMA = cv.Schema(
PN7160_SCHEMA = cv.Schema( PN7160_SCHEMA = cv.Schema(
{ {
cv.GenerateID(): cv.declare_id(PN7160), cv.GenerateID(): cv.declare_id(PN7160),
cv.Optional(CONF_ON_EMULATED_TAG_SCAN): automation.validate_automation( cv.Optional(CONF_ON_EMULATED_TAG_SCAN): automation.validate_automation({}),
{ cv.Optional(CONF_ON_FINISHED_WRITE): automation.validate_automation({}),
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
PN7160OnEmulatedTagScanTrigger
),
}
),
cv.Optional(CONF_ON_FINISHED_WRITE): automation.validate_automation(
{
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
PN7160OnFinishedWriteTrigger
),
}
),
cv.Optional(CONF_ON_TAG): automation.validate_automation( cv.Optional(CONF_ON_TAG): automation.validate_automation(
{ {
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(nfc.NfcOnTagTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(nfc.NfcOnTagTrigger),
@@ -227,12 +207,14 @@ async def setup_pn7160(var, config):
) )
for conf in config.get(CONF_ON_EMULATED_TAG_SCAN, []): for conf in config.get(CONF_ON_EMULATED_TAG_SCAN, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var) await automation.build_callback_automation(
await automation.build_automation(trigger, [], conf) var, "add_on_emulated_tag_scan_callback", [], conf
)
for conf in config.get(CONF_ON_FINISHED_WRITE, []): for conf in config.get(CONF_ON_FINISHED_WRITE, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var) await automation.build_callback_automation(
await automation.build_automation(trigger, [], conf) var, "add_on_finished_write_callback", [], conf
)
@automation.register_condition( @automation.register_condition(
esphome/components/pn7160/automation.h
-14
View File
@@ -7,20 +7,6 @@
namespace esphome { namespace esphome {
namespace pn7160 { namespace pn7160 {
class PN7160OnEmulatedTagScanTrigger : public Trigger<> {
public:
explicit PN7160OnEmulatedTagScanTrigger(PN7160 *parent) {
parent->add_on_emulated_tag_scan_callback([this]() { this->trigger(); });
}
};
class PN7160OnFinishedWriteTrigger : public Trigger<> {
public:
explicit PN7160OnFinishedWriteTrigger(PN7160 *parent) {
parent->add_on_finished_write_callback([this]() { this->trigger(); });
}
};
template<typename... Ts> class PN7160IsWritingCondition : public Condition<Ts...>, public Parented<PN7160> { template<typename... Ts> class PN7160IsWritingCondition : public Condition<Ts...>, public Parented<PN7160> {
public: public:
bool check(const Ts &...x) override { return this->parent_->is_writing(); } bool check(const Ts &...x) override { return this->parent_->is_writing(); }