jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-04 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update xdrv_05_irremote.ino

Browse Source 
Code shaving
This commit is contained in:
Theo Arends 2019-04-09 15:41:01 +02:00
parent 19ab3183f4
commit 51e66bcccf
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sonoff/xdrv_05_irremote.ino
View File

@ -549,48 +549,44 @@ bool IrSendCommand(void)
error = IE_INVALID_RAWDATA; error = IE_INVALID_RAWDATA;
} else { } else {
uint16_t freq = atoi(str); uint16_t freq = atoi(str);
if (!freq && (*str != '0')) { // first parameter is a string if (!freq && (*str != '0')) { // First parameter is a string
uint16_t count = 0; uint16_t count = 0;
char *q = p; char *q = p;
for (; *q; count += (*q++ == ',')); for (; *q; count += (*q++ == ','));
if (count != 6) { // parameters must be exactly 6 if (count != 6) { // Parameters must be exactly 6
error = IE_INVALID_RAWDATA; error = IE_INVALID_RAWDATA;
} else { } else {
str = strtok_r(NULL, ", ", &p); uint16_t parm[6];
freq = atoi(str); for (uint8_t i = 0; i < 6; i++) {
if (!freq) { freq = 38000; } // Default to 38kHz str = strtok_r(nullptr, ", ", &p);
str = strtok_r(NULL, ", ", &p); parm[i] = atoi(str);
uint16_t hdr_mrk = atoi(str); // header mark if (!parm[i]) {
str = strtok_r(NULL, ", ", &p); if (!i) {
uint16_t hdr_spc = atoi(str); // header space parm[0] = 38000; // Frequency default to 38kHz
str = strtok_r(NULL, ", ", &p);
uint16_t bit_mrk = atoi(str); // bit mark
str = strtok_r(NULL, ", ", &p);
uint16_t zer_spc = atoi(str); // zero space
str = strtok_r(NULL, ", ", &p);
uint16_t one_spc = atoi(str); // one space
if (!hdr_mrk || !hdr_spc || !bit_mrk || !zer_spc || !one_spc) {
error = IE_INVALID_RAWDATA;
} else { } else {
uint16_t raw_array[strlen(p)*2+3]; // header + bits + end error = IE_INVALID_RAWDATA;
break;
}
}
}
if (IE_NO_ERROR == error) {
uint16_t raw_array[strlen(p)*2+3]; // Header + bits + end
uint16_t i = 0; uint16_t i = 0;
raw_array[i++] = hdr_mrk; raw_array[i++] = parm[1]; // Header mark
raw_array[i++] = hdr_spc; raw_array[i++] = parm[2]; // Header space
for (; *p; *p++) { for (; *p; *p++) {
if (*p == '0') { if (*p == '0') {
raw_array[i++] = bit_mrk; raw_array[i++] = parm[3]; // Bit mark
raw_array[i++] = zer_spc; raw_array[i++] = parm[4]; // Zero space
} else if (*p == '1') { }
raw_array[i++] = bit_mrk; else if (*p == '1') {
raw_array[i++] = one_spc; raw_array[i++] = parm[3]; // Bit mark
raw_array[i++] = parm[5]; // One space
} }
} }
raw_array[i++] = bit_mrk; // trailing mark raw_array[i++] = parm[3]; // Trailing mark
irsend_active = true; irsend_active = true;
irsend->sendRaw(raw_array, i, freq); irsend->sendRaw(raw_array, i, parm[0]);
} }
} }
} else { } else {