jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt 2 to fix Dali core 3 compilation (#22214)

Browse Source
This commit is contained in:
Theo Arends 2024-09-30 09:50:15 +02:00
parent 59c8d39724
commit 2d80f87fc9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino
View File

@ -386,17 +386,20 @@ void DaliPreInit() {
AddLog(LOG_LEVEL_INFO, PSTR("DLI: Memory allocation error")); AddLog(LOG_LEVEL_INFO, PSTR("DLI: Memory allocation error"));
return; return;
} }
// Arduino Core < 3
// Dali->timer = timerBegin(DALI_TIMER, 13, true); // Dali->timer = timerBegin(DALI_TIMER, 13, true);
Dali->timer = timerBegin(12307692); // 160MHz????? / 13 // timerAttachInterrupt(Dali->timer, &DALI_Tick_Handler, true);
// timerAlarmWrite(Dali->timer, 641, true);
// Arduino Core > 3
Dali->timer = timerBegin(6153846); // 80MHz / 13
if (nullptr == Dali->timer) { if (nullptr == Dali->timer) {
AddLog(LOG_LEVEL_INFO, PSTR("DLI: Bad timer init")); AddLog(LOG_LEVEL_INFO, PSTR("DLI: No timer available"));
free(Dali); free(Dali);
Dali = nullptr; Dali = nullptr;
return; return;
} }
// timerAttachInterrupt(Dali->timer, &DALI_Tick_Handler, true);
timerAttachInterrupt(Dali->timer, &DALI_Tick_Handler); timerAttachInterrupt(Dali->timer, &DALI_Tick_Handler);
// timerAlarmWrite(Dali->timer, 641, true);
timerAlarm(Dali->timer, 641, true, 0); timerAlarm(Dali->timer, 641, true, 0);
attachInterrupt(Pin(GPIO_DALI_RX), receiveDaliData, FALLING); attachInterrupt(Pin(GPIO_DALI_RX), receiveDaliData, FALLING);