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

Fix DALI init sequence (#22371)

This commit is contained in:
Theo Arends 2024-10-28 10:13:43 +01:00
parent faf6e66e32
commit 37f42b474f
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tasmota/tasmota_xdrv_driver/xdrv_75_dali.ino
View File

@ -860,29 +860,33 @@ bool DaliSetChannels(void) {
/*-------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------*/
bool DaliInit(void) { bool DaliInit(void) {
int pin_tx = -1;
bool invert_tx = false;
if (PinUsed(GPIO_DALI_TX)) {
pin_tx = Pin(GPIO_DALI_TX);
}
else if (PinUsed(GPIO_DALI_TX_INV)) {
pin_tx = Pin(GPIO_DALI_TX_INV);
invert_tx = true;
}
int pin_rx = -1;
bool invert_rx = false;
if (PinUsed(GPIO_DALI_RX)) {
pin_rx = Pin(GPIO_DALI_RX);
}
else if (PinUsed(GPIO_DALI_RX_INV)) {
pin_rx = Pin(GPIO_DALI_RX_INV);
invert_rx = true;
}
if ((-1 == pin_tx) || (-1 == pin_rx)) { return false; }
Dali = (DALI*)calloc(sizeof(DALI), 1); Dali = (DALI*)calloc(sizeof(DALI), 1);
if (!Dali) { return false; } if (!Dali) { return false; }
Dali->pin_tx = 255; Dali->pin_tx = pin_tx;
if (PinUsed(GPIO_DALI_TX)) { Dali->invert_tx = invert_tx;
Dali->pin_tx = Pin(GPIO_DALI_TX); Dali->pin_rx = pin_rx;
} Dali->invert_rx = invert_rx;
else if (PinUsed(GPIO_DALI_TX_INV)) {
Dali->pin_tx = Pin(GPIO_DALI_TX_INV);
Dali->invert_tx = true;
}
Dali->pin_rx = 255;
if (PinUsed(GPIO_DALI_RX)) {
Dali->pin_rx = Pin(GPIO_DALI_RX);
}
else if (PinUsed(GPIO_DALI_RX_INV)) {
Dali->pin_rx = Pin(GPIO_DALI_RX_INV);
Dali->invert_rx = true;
}
if ((255 == Dali->pin_tx) || (255 == Dali->pin_rx)) {
free(Dali);
return false;
}
AddLog(LOG_LEVEL_INFO, PSTR("DLI: GPIO%d(RX%s) and GPIO%d(TX%s)"), AddLog(LOG_LEVEL_INFO, PSTR("DLI: GPIO%d(RX%s) and GPIO%d(TX%s)"),
Dali->pin_rx, (Dali->invert_rx)?"i":"", Dali->pin_tx, (Dali->invert_tx)?"i":""); Dali->pin_rx, (Dali->invert_rx)?"i":"", Dali->pin_tx, (Dali->invert_tx)?"i":"");