mr2web/esphome-lsm6ds
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ir_transmitter: add support for repeated commands in NEC protocol (#4995)

Browse Source 
Co-authored-by: Nicolas Gilles <nicolas.gilles@aiven.io>
This commit is contained in:
Nicolas GillesandNicolas Gilles authored and GitHub committed 2023-12-13 08:55:20 +09:00
1 parent 69026f7599
commit d0bcba3b3f
4 files changed
+44 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

esphome/components/remote_base/nec_protocol.cpp
+35 -7
View File
@@ -13,10 +13,14 @@ static const uint32_t BIT_ONE_LOW_US = 1690;
static const uint32_t BIT_ZERO_LOW_US = 560;
void NECProtocol::encode(RemoteTransmitData *dst, const NECData &data) {
dst->reserve(68);
ESP_LOGD(TAG, "Sending NEC: address=0x%04X, command=0x%04X command_repeats=%d", data.address, data.command,
data.command_repeats);
dst->reserve(2 + 32 + 32 * data.command_repeats + 2);
dst->set_carrier_frequency(38000);
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint16_t mask = 1; mask; mask <<= 1) {
if (data.address & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
@@ -25,11 +29,13 @@ void NECProtocol::encode(RemoteTransmitData *dst, const NECData &data) {
}
}
for (uint16_t mask = 1; mask; mask <<= 1) {
if (data.command & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
for (uint16_t repeats = 0; repeats < data.command_repeats; repeats++) {
for (uint16_t mask = 1; mask; mask <<= 1) {
if (data.command & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
}
@@ -39,6 +45,7 @@ optional<NECData> NECProtocol::decode(RemoteReceiveData src) {
NECData data{
.address = 0,
.command = 0,
.command_repeats = 1,
};
if (!src.expect_item(HEADER_HIGH_US, HEADER_LOW_US))
return {};
@@ -63,11 +70,32 @@ optional<NECData> NECProtocol::decode(RemoteReceiveData src) {
}
}
while (src.peek_item(BIT_HIGH_US, BIT_ONE_LOW_US) || src.peek_item(BIT_HIGH_US, BIT_ZERO_LOW_US)) {
uint16_t command = 0;
for (uint16_t mask = 1; mask; mask <<= 1) {
if (src.expect_item(BIT_HIGH_US, BIT_ONE_LOW_US)) {
command |= mask;
} else if (src.expect_item(BIT_HIGH_US, BIT_ZERO_LOW_US)) {
command &= ~mask;
} else {
return {};
}
}
// Make sure the extra/repeated data matches original command
if (command != data.command) {
return {};
}
data.command_repeats += 1;
}
src.expect_mark(BIT_HIGH_US);
return data;
}
void NECProtocol::dump(const NECData &data) {
ESP_LOGI(TAG, "Received NEC: address=0x%04X, command=0x%04X", data.address, data.command);
ESP_LOGI(TAG, "Received NEC: address=0x%04X, command=0x%04X command_repeats=%d", data.address, data.command,
data.command_repeats);
}
} // namespace remote_base