thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-07 05:13:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

CAN bus: support bit mask for on_frame can_id (#3196)

Browse Source
This commit is contained in:
Felix Storm
2022-02-17 05:00:31 +01:00
committed by GitHub
parent c054fb8a2c
commit 38259c96c9
4 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/canbus/canbus.h
+5 -3
View File
@@ -116,17 +116,19 @@ template<typename... Ts> class CanbusSendAction : public Action<Ts...>, public P
std::vector<uint8_t> data_static_{};
};
class CanbusTrigger : public Trigger<std::vector<uint8_t>>, public Component {
class CanbusTrigger : public Trigger<std::vector<uint8_t>, uint32_t>, public Component {
friend class Canbus;
public:
explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const bool use_extended_id)
: parent_(parent), can_id_(can_id), use_extended_id_(use_extended_id){};
explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const std::uint32_t can_id_mask,
const bool use_extended_id)
: parent_(parent), can_id_(can_id), can_id_mask_(can_id_mask), use_extended_id_(use_extended_id){};
void setup() override { this->parent_->add_trigger(this); }
protected:
Canbus *parent_;
uint32_t can_id_;
uint32_t can_id_mask_;
bool use_extended_id_;
};