mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16049 from madmartin/dev-MD-002 

tasmota_xdrv_driver/xdrv_36_keeloq.ino: fix compile error
This commit is contained in:
Theo Arends 2022-07-24 14:34:04 +02:00 committed by GitHub
parent c17e73aa9b b89fd72638
commit 95d97c4bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tasmota/tasmota_xdrv_driver/xdrv_36_keeloq.ino
View File

@ -72,7 +72,7 @@ void CmdSet(void)
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
if (param[i] < 1) { param[i] = 1; } // msb, lsb, serial, counter if (param[i] < 1) { param[i] = 1; } // msb, lsb, serial, counter
} }
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("params: %08x %08x %08x %08x"), param[0], param[1], param[2], param[3]); DEBUG_DRIVER_LOG(PSTR("params: %08x %08x %08x %08x"), param[0], param[1], param[2], param[3]);
Settings->keeloq_master_msb = param[0]; Settings->keeloq_master_msb = param[0];
Settings->keeloq_master_lsb = param[1]; Settings->keeloq_master_lsb = param[1];
Settings->keeloq_serial = param[2]; Settings->keeloq_serial = param[2];
@ -84,10 +84,10 @@ void CmdSet(void)
GenerateDeviceCryptKey(); GenerateDeviceCryptKey();
ResponseCmndDone(); ResponseCmndDone();
} else { } else {
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("no payload")); DEBUG_DRIVER_LOG(PSTR("no payload"));
} }
} else { } else {
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("no param")); DEBUG_DRIVER_LOG(PSTR("no param"));
} }
} }
@ -110,10 +110,11 @@ void CmdSendButton(void)
if (XdrvMailbox.payload > 0) if (XdrvMailbox.payload > 0)
{ {
jaroliftDevice.button = strtoul(XdrvMailbox.data, nullptr, 0); jaroliftDevice.button = strtoul(XdrvMailbox.data, nullptr, 0);
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("msb: %08x"), jaroliftDevice.device_key_msb); DEBUG_DRIVER_LOG(PSTR("msb: %08x"), jaroliftDevice.device_key_msb);
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("lsb: %08x"), jaroliftDevice.device_key_lsb); DEBUG_DRIVER_LOG(PSTR("lsb: %08x"), jaroliftDevice.device_key_lsb);
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("serial: %08x"), jaroliftDevice.serial); DEBUG_DRIVER_LOG(PSTR("serial: %08x"), jaroliftDevice.serial);
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("disc: %08x"), jaroliftDevice.disc); DEBUG_DRIVER_LOG(PSTR("disc: %08x"), jaroliftDevice.disc);
DEBUG_DRIVER_LOG(PSTR("button: %08x"), jaroliftDevice.button);
AddLog(LOG_LEVEL_DEBUG, PSTR("KLQ: count: %08x"), jaroliftDevice.count); AddLog(LOG_LEVEL_DEBUG, PSTR("KLQ: count: %08x"), jaroliftDevice.count);
CreateKeeloqPacket(); CreateKeeloqPacket();
@ -132,7 +133,7 @@ void CmdSendButton(void)
SendBit(bitsToSend & 0x0000000000000001); SendBit(bitsToSend & 0x0000000000000001);
bitsToSend >>= 1; bitsToSend >>= 1;
} }
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros()); DEBUG_DRIVER_LOG(PSTR("finished sending bits at %d"), micros());
delay(16); // delay in loop context is save for wdt delay(16); // delay in loop context is save for wdt
} }
@ -165,7 +166,7 @@ void SendBit(byte bitToSend)
void CmndSendRaw(void) void CmndSendRaw(void)
{ {
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("cmd send called at %d"), micros()); DEBUG_DRIVER_LOG(PSTR("cmd send called at %d"), micros());
noInterrupts(); noInterrupts();
entertx(); entertx();
for(int repeat = 0; repeat <= 1; repeat++) for(int repeat = 0; repeat <= 1; repeat++)
@ -181,7 +182,7 @@ void CmndSendRaw(void)
{ {
SendBit(XdrvMailbox.data[i] == '1'); SendBit(XdrvMailbox.data[i] == '1');
} }
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros()); DEBUG_DRIVER_LOG(PSTR("finished sending bits at %d"), micros());
delay(16); // delay in loop context is save for wdt delay(16); // delay in loop context is save for wdt
} }
@ -245,7 +246,7 @@ void KeeloqInit()
jaroliftDevice.port_tx = Pin(GPIO_CC1101_GDO2); // Output port for transmission jaroliftDevice.port_tx = Pin(GPIO_CC1101_GDO2); // Output port for transmission
jaroliftDevice.port_rx = Pin(GPIO_CC1101_GDO0); // Input port for reception jaroliftDevice.port_rx = Pin(GPIO_CC1101_GDO0); // Input port for reception
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("cc1101.init()")); DEBUG_DRIVER_LOG(PSTR("cc1101.init()"));
delay(100); delay(100);
cc1101.init(); cc1101.init();
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("CC1101 done.")); AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("CC1101 done."));
@ -277,7 +278,7 @@ bool Xdrv36(uint8_t function)
break; break;
case FUNC_INIT: case FUNC_INIT:
KeeloqInit(); KeeloqInit();
DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("init done.")); DEBUG_DRIVER_LOG(PSTR("init done."));
break; break;
} }