Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use a packed union struct to get/set raw

This commit is contained in:
Jesse Hills 2023-12-21 14:50:29 +09:00
parent ab6fa13eb1
commit 19f5e9ff2d
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/remote_base/tr_502msv_protocol.cpp
View File

@ -49,7 +49,7 @@ void TR502MSVProtocol::encode(RemoteTransmitData *dst, const TR502MSVData &data)
dst->mark(BIT_ONE_MARK_US);
uint32_t d = data.get_raw();
uint32_t d = data.raw;
for (uint32_t mask = 1; mask; mask = (mask << 1) & 0x0fffff) {
if (d & mask) {
dst->space(BIT_ONE_SPACE_US);
@ -74,7 +74,7 @@ optional<TR502MSVData> TR502MSVProtocol::decode(RemoteReceiveData src) {
}
src.advance(2);
}
out.set_raw(d);
out.raw = d;
if (out.calc_cs() != out.checksum) {
return {};
}

27
esphome/components/remote_base/tr_502msv_protocol.h
View File

@ -22,23 +22,18 @@ enum Commands : uint8_t {
};
struct TR502MSVData {
uint16_t group;
uint8_t device;
uint8_t command;
uint8_t checksum;
union {
struct {
uint16_t group : 12;
uint8_t device : 3;
uint8_t command : 2;
uint8_t _reserved : 1;
uint8_t checksum : 2;
} __attribute__((packed));
uint32_t raw;
};
bool operator==(const TR502MSVData &rhs) const { return this->get_raw() == rhs.get_raw(); }
uint32_t get_raw() const {
return (group & 0xfff) | ((device & 0x7) << 12) | ((command & 0x3) << 15) | ((checksum & 0x3) << 18);
}
void set_raw(uint32_t data) {
group = (data & 0xfff);
device = ((data >> 12) & 0x7);
command = ((data >> 15) & 0x3);
checksum = ((data >> 18) & 0x3);
}
bool operator==(const TR502MSVData &rhs) const { return this->raw == rhs.raw; }
std::string device_string() const;
std::string command_string() const;