mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 18:56:38 +00:00
dali
This commit is contained in:
parent
7cd934fd16
commit
1bf69fd310
@ -198,6 +198,9 @@ enum UserSelectablePins {
|
||||
GPIO_ADE7953_RST, // ADE7953 Reset
|
||||
GPIO_NRG_MBS_TX, GPIO_NRG_MBS_RX, // Generic Energy Modbus device
|
||||
GPIO_ADE7953_CS, // ADE7953 SPI Chip Select
|
||||
#ifdef ESP32
|
||||
GPIO_DALI_RX, GPIO_DALI_TX, // Dali
|
||||
#endif
|
||||
GPIO_SENSOR_END };
|
||||
|
||||
// Error as warning to rethink GPIO usage with max 2045
|
||||
@ -443,6 +446,9 @@ const char kSensorNames[] PROGMEM =
|
||||
D_SENSOR_ADE7953_RST "|"
|
||||
D_SENSOR_NRG_MBS_TX "|" D_SENSOR_NRG_MBS_RX "|"
|
||||
D_SENSOR_ADE7953_CS "|"
|
||||
#ifdef ESP32
|
||||
D_SENSOR_DALI_RX "|" D_SENSOR_DALI_TX "|"
|
||||
#endif
|
||||
;
|
||||
|
||||
const char kSensorNamesFixed[] PROGMEM =
|
||||
@ -527,6 +533,11 @@ const uint16_t kGpioNiceList[] PROGMEM = {
|
||||
* Protocol specifics
|
||||
\*-------------------------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(USE_DALI) && defined(ESP32)
|
||||
AGPIO(GPIO_DALI_RX), // DALI RX
|
||||
AGPIO(GPIO_DALI_TX), // DALI TX
|
||||
#endif // USE_DALI
|
||||
|
||||
#ifdef USE_I2C
|
||||
AGPIO(GPIO_I2C_SCL) + MAX_I2C, // I2C SCL
|
||||
AGPIO(GPIO_I2C_SDA) + MAX_I2C, // I2C SDA
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM gevind by adres"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Ewekansige Zigbee parameters, kyk asseblief met 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energie Vandag"
|
||||
#define D_ENERGY_YESTERDAY "Energie Gister"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Консумация за днес"
|
||||
#define D_ENERGY_YESTERDAY "Консумация за вчера"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energy Today"
|
||||
#define D_ENERGY_YESTERDAY "Energy Yesterday"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Spotřeba Dnes"
|
||||
#define D_ENERGY_YESTERDAY "Spotřeba Včera"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM gefunden an Adresse"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Zufällige Zigbee Parameter erstellt, Überprüfung mit 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energie heute"
|
||||
#define D_ENERGY_YESTERDAY "Energie gestern"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Ενέργεια σήμερα"
|
||||
#define D_ENERGY_YESTERDAY "Ενέργεια χθες"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energy Today"
|
||||
#define D_ENERGY_YESTERDAY "Energy Yesterday"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "Encontrada EEPROM de ZBBridge en"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Configurando parámetros Zigbee de forma aleatoria. Usar 'ZbConfig' para revisarlos."
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energía Hoy"
|
||||
#define D_ENERGY_YESTERDAY "Energía Ayer"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "EEPROM ZBBridge trouvée à l'adresse"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomisation des paramètres ZigBee, veuillez vérifier avec 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xsns_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Énergie aujourd'hui"
|
||||
#define D_ENERGY_YESTERDAY "Énergie hier"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM fûn op adres"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, kontrolearje asjebleaft mei 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Konsumpsje hjoed"
|
||||
#define D_ENERGY_YESTERDAY "Konsumpsje juster"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "צריכה יומית"
|
||||
#define D_ENERGY_YESTERDAY "צריכה בעבר"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM található a címen"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Zigbee paramétereknek véletlennek kell lenniük, ellenőrizd a 'ZbConfig'-gal"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Mai energia"
|
||||
#define D_ENERGY_YESTERDAY "Tegnapi energia"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "Trovata EEPROM ZBBridge all'indirizzo"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizzazione parametri Zigbee, controlla con \"ZbConfig\""
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energia - oggi"
|
||||
#define D_ENERGY_YESTERDAY "Energia - ieri"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "금일 전력 사용량"
|
||||
#define D_ENERGY_YESTERDAY "어제 전력 사용량"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM aanwezig op adres"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Willekeurige Zigbee parameters gemaakt, controleer met 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Verbruik vandaag"
|
||||
#define D_ENERGY_YESTERDAY "Verbruik gisteren"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "Znaleziono ZBBridge EEPROM na adresie"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Losowanie parametrów Zigbee, proszę sprawdzić 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energia dzisiaj"
|
||||
#define D_ENERGY_YESTERDAY "Energia wczoraj"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "EEPROM ZBBridge encontrada no endereço" // "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizando parametros Zigbee, por favor congira em 'ZbConfig'" // "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Consumo energético de hoje"
|
||||
#define D_ENERGY_YESTERDAY "Consumo energético de ontem"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM encontrada no edereço"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomização de parâmetros Zigbee, por-favor verifique a 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Consumo energético de hoje"
|
||||
#define D_ENERGY_YESTERDAY "Consumo energético de ontem"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energia de Azi"
|
||||
#define D_ENERGY_YESTERDAY "Energia de Ieri"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Конфигурация DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Энергия Сегодня"
|
||||
#define D_ENERGY_YESTERDAY "Энергия Вчера"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Spotreba dnes"
|
||||
#define D_ENERGY_YESTERDAY "Spotreba včera"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energi idag"
|
||||
#define D_ENERGY_YESTERDAY "Energi igår"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Energy Today"
|
||||
#define D_ENERGY_YESTERDAY "Energy Yesterday"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Енергія Сьогодні"
|
||||
#define D_ENERGY_YESTERDAY "Енергія Вчора"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "Năng lượng tiêu thụ hôm nay"
|
||||
#define D_ENERGY_YESTERDAY "Năng lượng tiêu thụ hôm qua"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "找到 ZBBridge EEPROM, 地址:"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "正在随机化 Zigbee 参数, 请通过 'ZbConfig' 检查"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "今日用电量"
|
||||
#define D_ENERGY_YESTERDAY "昨日用电量"
|
||||
|
@ -511,6 +511,13 @@
|
||||
#define D_ZIGBEE_EEPROM_FOUND_AT_ADDRESS "ZBBridge EEPROM found at address"
|
||||
#define D_ZIGBEE_RANDOMIZING_ZBCONFIG "Randomizing Zigbee parameters, please check with 'ZbConfig'"
|
||||
|
||||
// xdrv_89_dali.ino
|
||||
#define D_SENSOR_DALI_RX "Dali RX"
|
||||
#define D_SENSOR_DALI_TX "Dali TX"
|
||||
#define D_CONFIGURE_DALI "Config DALI"
|
||||
#define D_CMND_DALI_POWER "power"
|
||||
#define D_CMND_DALI_DIMMER "dim"
|
||||
|
||||
// xdrv_03_energy.ino
|
||||
#define D_ENERGY_TODAY "今日用電量"
|
||||
#define D_ENERGY_YESTERDAY "昨日用電量"
|
||||
|
643
tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino
Normal file
643
tasmota/tasmota_xdrv_driver/xdrv_89_esp32_dali.ino
Normal file
@ -0,0 +1,643 @@
|
||||
/*
|
||||
xdrv_89_esp32_dali.ino - DALI support for Tasmota
|
||||
|
||||
Copyright (C) 2022 Andrei Kazmirtsuk aka eeak
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
--------------------------------------------------------------------------------------------
|
||||
Version yyyymmdd Action Description
|
||||
--------------------------------------------------------------------------------------------
|
||||
0.0.0.1 20221027 publish - initial version
|
||||
*/
|
||||
|
||||
#ifdef ESP32
|
||||
#ifdef USE_DALI
|
||||
|
||||
/*********************************************************************************************\
|
||||
* DALI support for Tasmota
|
||||
\*********************************************************************************************/
|
||||
|
||||
#define XDRV_89 89
|
||||
|
||||
#define BROADCAST_DP 0b11111110 // 0xFE
|
||||
|
||||
enum
|
||||
{
|
||||
DALI_NO_ACTION,
|
||||
DALI_SENDING_DATA,
|
||||
DALI_RECEIVING_DATA,
|
||||
DALI_ERROR
|
||||
};
|
||||
|
||||
struct DALI {
|
||||
bool present = false;
|
||||
} Dali;
|
||||
|
||||
// http and json defines
|
||||
#define D_NAME_DALI "DALI"
|
||||
|
||||
const char S_JSON_DALI_COMMAND_NVALUE[] PROGMEM = "{\"" D_NAME_DALI "\":{\"%s\":%d}}";
|
||||
const char kDALI_Commands[] PROGMEM = D_CMND_DALI_POWER "|" D_CMND_DALI_DIMMER;
|
||||
|
||||
enum DALI_Commands { // commands for Console
|
||||
CMND_DALI_PWR,
|
||||
CMND_DALI_DIM,
|
||||
};
|
||||
|
||||
/* Private variables ---------------------------------------------------------*/
|
||||
// Communication ports and pins
|
||||
bool DALIOUT_invert = false;
|
||||
bool DALIIN_invert = false;
|
||||
// Data variables
|
||||
uint16_t send_dali_data; // data to send to DALI bus
|
||||
uint16_t received_dali_data; // data received from DALI bus
|
||||
// Processing variables
|
||||
uint8_t flag; // DALI status flag
|
||||
uint8_t bit_count; // nr of rec/send bits
|
||||
uint16_t tick_count; // nr of ticks of the timer
|
||||
|
||||
bool bit_value; // value of actual bit
|
||||
bool actual_val; // bit value in this tick of timer
|
||||
bool former_val; // bit value in previous tick of timer
|
||||
|
||||
hw_timer_t *DALI_timer = NULL;
|
||||
|
||||
/*********************************************************************************************\
|
||||
* DALI low level
|
||||
\*********************************************************************************************/
|
||||
|
||||
/**
|
||||
* @brief This function handles hardware timer Handler.
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
void IRAM_ATTR DALI_Tick_Handler(void)
|
||||
{
|
||||
if (get_flag() == DALI_RECEIVING_DATA)
|
||||
{
|
||||
receive_tick();
|
||||
}
|
||||
else if (get_flag() == DALI_SENDING_DATA)
|
||||
{
|
||||
send_tick();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function enable data transfer start interrupt.
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
void enableDaliRxInterrupt() {
|
||||
flag = DALI_NO_ACTION;
|
||||
timerAlarmDisable(DALI_timer);
|
||||
attachInterrupt(Pin(GPIO_DALI_RX), receiveDaliData, FALLING);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function disable data transfer start interrupt.
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
void disableRxInterrupt() {
|
||||
timerAlarmEnable(DALI_timer);
|
||||
detachInterrupt(Pin(GPIO_DALI_RX));
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief receiving flag status
|
||||
* @param None
|
||||
* @retval uint8_t flag
|
||||
*/
|
||||
uint8_t get_flag(void)
|
||||
{
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief DALI data received callback
|
||||
* @param None
|
||||
* @retval uint8_t flag
|
||||
*/
|
||||
void DataReceivedCallback() {
|
||||
AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: Received: %d %d"), received_dali_data>>9, received_dali_data&0xff);
|
||||
}
|
||||
|
||||
/*************** R E C E I V E * P R O C E D U R E S *******/
|
||||
|
||||
/**
|
||||
* @brief receive data from DALI bus
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
void receiveDaliData()
|
||||
{
|
||||
// null variables
|
||||
received_dali_data = 0;
|
||||
bit_count = 0;
|
||||
tick_count = 0;
|
||||
former_val = true;
|
||||
|
||||
flag = DALI_RECEIVING_DATA;
|
||||
|
||||
disableRxInterrupt();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get state of DALIIN pin
|
||||
* @param None
|
||||
* @retval bool status
|
||||
*/
|
||||
bool get_DALIIN(void)
|
||||
{
|
||||
bool dali_read = digitalRead(Pin(GPIO_DALI_RX));
|
||||
return (false == DALIIN_invert) ? dali_read : !dali_read;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief receiving data from DALI bus
|
||||
* @param None
|
||||
* @retval None
|
||||
*
|
||||
* |--------|----|---------------------------|----|
|
||||
* 0 24 32 160 176
|
||||
* wait start data stop
|
||||
*/
|
||||
void receive_tick(void)
|
||||
{
|
||||
// four ticks per bit
|
||||
actual_val = get_DALIIN();
|
||||
tick_count++;
|
||||
|
||||
// edge detected
|
||||
if(actual_val != former_val)
|
||||
{
|
||||
switch(bit_count)
|
||||
{
|
||||
case 0:
|
||||
if (tick_count > 2)
|
||||
{
|
||||
tick_count = 0;
|
||||
bit_count = 1; // start bit
|
||||
}
|
||||
break;
|
||||
case 17: // 1st stop bit
|
||||
if(tick_count > 6) { // stop bit error, no edge should exist
|
||||
flag = DALI_ERROR;
|
||||
}
|
||||
break;
|
||||
default: // other bits
|
||||
if(tick_count > 6)
|
||||
{
|
||||
received_dali_data |= (actual_val << (16-bit_count));
|
||||
bit_count++;
|
||||
tick_count = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}else // voltage level stable
|
||||
{
|
||||
switch(bit_count)
|
||||
{
|
||||
case 0:
|
||||
if(tick_count==8) { // too long start bit
|
||||
flag = DALI_ERROR;
|
||||
Serial.println("Too long start bit.");
|
||||
}
|
||||
break;
|
||||
case 17:
|
||||
// First stop bit
|
||||
if (tick_count==8)
|
||||
{
|
||||
if (actual_val==0) // wrong level of stop bit
|
||||
{
|
||||
flag = DALI_ERROR;
|
||||
}
|
||||
else
|
||||
{
|
||||
bit_count++;
|
||||
tick_count = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 18:
|
||||
// Second stop bit
|
||||
if (tick_count==8)
|
||||
{
|
||||
enableDaliRxInterrupt();
|
||||
DataReceivedCallback();
|
||||
|
||||
}
|
||||
break;
|
||||
default: // normal bits
|
||||
if(tick_count==10)
|
||||
{ // too long delay before edge
|
||||
flag = DALI_ERROR;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
former_val = actual_val;
|
||||
if(flag==DALI_ERROR)
|
||||
{
|
||||
enableDaliRxInterrupt();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************** S E N D * P R O C E D U R E S *************/
|
||||
|
||||
/**
|
||||
* @brief Set value to the DALIOUT pin
|
||||
* @param bool
|
||||
* @retval None
|
||||
*/
|
||||
void set_DALIOUT(bool pin_value)
|
||||
{
|
||||
digitalWrite(Pin(GPIO_DALI_TX), pin_value == DALIOUT_invert ? LOW : HIGH);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief gets state of the DALIOUT pin
|
||||
* @param None
|
||||
* @retval bool state of the DALIOUT pin
|
||||
*/
|
||||
bool get_DALIOUT(void)
|
||||
{
|
||||
bool dali_read = digitalRead(Pin(GPIO_DALI_TX));
|
||||
return (false == DALIOUT_invert) ? dali_read : !dali_read;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Send data to DALI bus
|
||||
* @param byteToSend
|
||||
* @retval None
|
||||
*/
|
||||
void sendDaliData(uint8_t firstByte, uint8_t secondByte)
|
||||
{
|
||||
send_dali_data = firstByte << 8;
|
||||
send_dali_data += secondByte & 0xff;
|
||||
bit_count = 0;
|
||||
tick_count = 0;
|
||||
|
||||
flag = DALI_SENDING_DATA;
|
||||
|
||||
disableRxInterrupt();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief DALI protocol physical layer for slave device
|
||||
* @param None
|
||||
* @retval None
|
||||
*
|
||||
* |--------|----|---------------------------|----|
|
||||
* 0 24 32 160 176
|
||||
* wait start data stop
|
||||
*/
|
||||
void send_tick(void)
|
||||
{
|
||||
// access to the routine just every 4 ticks = every half bit
|
||||
if ((tick_count & 0x03) == 0)
|
||||
{
|
||||
if (tick_count < 160)
|
||||
{
|
||||
// settling time between forward and backward frame
|
||||
if (tick_count < 24)
|
||||
{
|
||||
tick_count++;
|
||||
return;
|
||||
}
|
||||
|
||||
// start of the start bit
|
||||
if (tick_count == 24)
|
||||
{
|
||||
// GPIOB->ODR ^= GPIO_ODR_7;
|
||||
set_DALIOUT(false);
|
||||
tick_count++;
|
||||
return;
|
||||
}
|
||||
|
||||
// edge of the start bit
|
||||
// 28 ticks = 28/9600 = 2,92ms = delay between forward and backward message frame
|
||||
if (tick_count == 28)
|
||||
{
|
||||
set_DALIOUT(true);
|
||||
tick_count++;
|
||||
return;
|
||||
}
|
||||
|
||||
// bit value (edge) selection
|
||||
bit_value = (bool)((send_dali_data >> (15 - bit_count)) & 0x01);
|
||||
|
||||
// Every half bit -> Manchester coding
|
||||
if (!((tick_count - 24) & 0x0007))
|
||||
{ // div by 8
|
||||
if (get_DALIOUT() == bit_value) // former value of bit = new value of bit
|
||||
set_DALIOUT((bool)(1 - bit_value));
|
||||
}
|
||||
|
||||
// Generate edge for actual bit
|
||||
if (!((tick_count - 28) & 0x0007))
|
||||
{
|
||||
set_DALIOUT(bit_value);
|
||||
bit_count++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // end of data byte, start of stop bits
|
||||
if (tick_count == 160)
|
||||
{
|
||||
set_DALIOUT(true); // start of stop bit
|
||||
}
|
||||
|
||||
// end of stop bits, no settling time
|
||||
if (tick_count == 176)
|
||||
{
|
||||
enableDaliRxInterrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
tick_count++;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/***********************************************************/
|
||||
|
||||
void DaliPreInit() {
|
||||
if (!PinUsed(GPIO_DALI_TX) || !PinUsed(GPIO_DALI_RX)) { return; }
|
||||
AddLog(LOG_LEVEL_INFO, PSTR("DLI: Init - RX-pin: %d, TX-pin: %d"), Pin(GPIO_DALI_RX), Pin(GPIO_DALI_TX));
|
||||
// pinMode(LED, OUTPUT);
|
||||
pinMode(Pin(GPIO_DALI_TX), OUTPUT);
|
||||
digitalWrite(Pin(GPIO_DALI_TX), HIGH);
|
||||
pinMode(Pin(GPIO_DALI_RX), INPUT);
|
||||
|
||||
DALI_timer = timerBegin(0, 13, true);
|
||||
timerAttachInterrupt(DALI_timer, &DALI_Tick_Handler, true);
|
||||
timerAlarmWrite(DALI_timer, 641, true);
|
||||
|
||||
attachInterrupt(Pin(GPIO_DALI_RX), receiveDaliData, FALLING);
|
||||
enableDaliRxInterrupt();
|
||||
Dali.present = true;
|
||||
}
|
||||
|
||||
void DaliPwr(uint8_t val){
|
||||
// AddLog(LOG_LEVEL_INFO, PSTR("DLI: Send to address %d value %d"), 0, val);
|
||||
sendDaliData(BROADCAST_DP, val);
|
||||
}
|
||||
|
||||
bool DaliCmd(void)
|
||||
{
|
||||
char command[CMDSZ];
|
||||
uint8_t name_len = strlen(D_NAME_DALI);
|
||||
if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_NAME_DALI), name_len))
|
||||
{
|
||||
uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + name_len, kDALI_Commands);
|
||||
switch (command_code)
|
||||
{
|
||||
case CMND_DALI_PWR:
|
||||
if (XdrvMailbox.data_len)
|
||||
{
|
||||
// AddLog(LOG_LEVEL_INFO, PSTR("DLI: XdrvMailbox.data_len %d"), XdrvMailbox.data_len);
|
||||
// AddLog(LOG_LEVEL_INFO, PSTR("DLI: XdrvMailbox.payload %d"), XdrvMailbox.payload);
|
||||
if (254 >= XdrvMailbox.payload)
|
||||
{
|
||||
DaliPwr(XdrvMailbox.payload);
|
||||
}
|
||||
}
|
||||
// Response_P(S_JSON_DALI_COMMAND_NVALUE, command, DaliGetPwr());
|
||||
Response_P(S_JSON_DALI_COMMAND_NVALUE, command, XdrvMailbox.payload);
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/*********************************************************************************************\
|
||||
* Presentation
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_WEBSERVER
|
||||
|
||||
#define WEB_HANDLE_DALI "dali"
|
||||
|
||||
const char HTTP_BTN_MENU_DALI[] PROGMEM =
|
||||
"<p><form action='" WEB_HANDLE_DALI "' method='get'><button>" D_CONFIGURE_DALI "</button></form></p>";
|
||||
|
||||
#endif // USE_WEBSERVER
|
||||
|
||||
|
||||
|
||||
#define DALI_TOPIC "DALI"
|
||||
static char tmp[120];
|
||||
|
||||
bool DaliMqtt()
|
||||
{
|
||||
char stopic[TOPSZ];
|
||||
strncpy(stopic, XdrvMailbox.topic, TOPSZ);
|
||||
XdrvMailbox.topic[TOPSZ - 1] = 0;
|
||||
|
||||
// AddLog(LOG_LEVEL_DEBUG, PSTR("DALI mqtt: %s:%s"), stopic, XdrvMailbox.data);
|
||||
|
||||
// Разберем топик на слова по "/"
|
||||
char *items[10];
|
||||
char *p = stopic;
|
||||
int cnt = 0;
|
||||
do
|
||||
{
|
||||
items[cnt] = strtok(p, "/");
|
||||
cnt++;
|
||||
p = nullptr;
|
||||
} while (items[cnt - 1]);
|
||||
cnt--; // repreents the number of items
|
||||
|
||||
if (cnt < 3)
|
||||
{ // not for us?
|
||||
AddLog(LOG_LEVEL_INFO,PSTR("cnt: %d < 3"), cnt);
|
||||
return false;
|
||||
}
|
||||
|
||||
// cnt-4 cnt -3 cnt-2 cnt-1
|
||||
// cmnd/tasmota_078480/DALI/power :70
|
||||
// cnt-5 cnt -4 cnt-3 cnt-2 cnt-1
|
||||
// cmnd/tasmota_078480/DALI/power/0 :70
|
||||
int DALIindex = 0;
|
||||
int ADRindex = 0;
|
||||
int CMDindex = 0;
|
||||
uint8_t DALIaddr = BROADCAST_DP;
|
||||
if (strcasecmp_P(items[cnt - 3], PSTR(DALI_TOPIC)) != 0)
|
||||
{
|
||||
// AddLog(LOG_LEVEL_INFO,PSTR("cnt-3 not %s"), PSTR(DALI_TOPIC));
|
||||
if (strcasecmp_P(items[cnt - 2], PSTR(DALI_TOPIC)) != 0)
|
||||
{
|
||||
// AddLog(LOG_LEVEL_INFO,PSTR("cnt-2 not %s"), PSTR(DALI_TOPIC));
|
||||
if (strcasecmp_P(items[cnt - 1], PSTR(DALI_TOPIC)) != 0)
|
||||
{
|
||||
return false; // not for us
|
||||
}
|
||||
else
|
||||
{
|
||||
// AddLog(LOG_LEVEL_INFO,PSTR("DLI: handle json"));
|
||||
if (true == DaliJsonParse()) { return true; }
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DALIindex = cnt - 2;
|
||||
CMDindex = cnt - 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DALIindex = cnt - 3;
|
||||
CMDindex = cnt - 2;
|
||||
ADRindex = cnt - 1;
|
||||
DALIaddr = ((int)CharToFloat(items[ADRindex])) << 1; // !!! ВАЖНО !!! Номер лампы должен быть сдвинут << 1
|
||||
|
||||
}
|
||||
|
||||
// AddLog(LOG_LEVEL_INFO,PSTR("DLI: handle topic + data"));
|
||||
uint8_t level;
|
||||
uint8_t value = (uint8_t)CharToFloat(XdrvMailbox.data);
|
||||
if (strcasecmp_P(items[CMDindex], PSTR("percent")) == 0) {
|
||||
float percent = (float)(254 * value * 0.01);
|
||||
level = (uint8_t)percent;
|
||||
}
|
||||
else if (strcasecmp_P(items[CMDindex], PSTR("level")) == 0) {
|
||||
level = value;
|
||||
}
|
||||
else {
|
||||
AddLog(LOG_LEVEL_INFO,PSTR("command not recognized: %s"), items[CMDindex]);
|
||||
return false; // not for us
|
||||
}
|
||||
|
||||
AddLog(LOG_LEVEL_INFO,PSTR("Dali value %d on address %d"), value, DALIaddr);
|
||||
sendDaliData(DALIaddr, level);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DaliJsonParse()
|
||||
{
|
||||
bool served = false;
|
||||
|
||||
// if (strlen(XdrvMailbox.data) > 8) { // Workaround exception if empty JSON like {} - Needs checks
|
||||
JsonParser parser((char *)XdrvMailbox.data);
|
||||
JsonParserObject root = parser.getRootObject();
|
||||
if (root)
|
||||
{
|
||||
int DALIindex = 0;
|
||||
int ADRindex = 0;
|
||||
int8_t DALIdim = -1;
|
||||
uint8_t DALIaddr = BROADCAST_DP;
|
||||
|
||||
JsonParserToken val = root[PSTR("cmd")]; // Команда
|
||||
if (val)
|
||||
{
|
||||
uint8_t cmd = val.getUInt();
|
||||
val = root[PSTR("addr")];
|
||||
if (val)
|
||||
{
|
||||
uint8_t addr = val.getUInt();
|
||||
AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: cmd = %d, addr = %d"), cmd, addr);
|
||||
sendDaliData(addr, cmd);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
val = root[PSTR("addr")];
|
||||
if (val)
|
||||
{
|
||||
uint8_t addr = val.getUInt();
|
||||
if ((addr >= 0) && (addr < 64))
|
||||
DALIaddr = addr << 1; // !!! ВАЖНО !!! Номер лампы должен быть сдвинут << 1
|
||||
// AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: mqtt->json addr = %d"), val.getUInt());
|
||||
}
|
||||
val = root[PSTR("dim")];
|
||||
if (val)
|
||||
{
|
||||
uint8_t dim = val.getUInt();
|
||||
if ((dim >= 0) && (dim < 255))
|
||||
DALIdim = dim;
|
||||
// AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: mqtt->json dimmer = %d"), val.getUInt());
|
||||
}
|
||||
// val = root[PSTR("power")];
|
||||
// if (val)
|
||||
// {
|
||||
// // FMqtt.file_type = val.getUInt();
|
||||
// // AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: mqtt->json power = %d"), val.getUInt());
|
||||
// }
|
||||
sendDaliData(DALIaddr, DALIdim);
|
||||
served = true;
|
||||
}
|
||||
// else {
|
||||
// AddLog(LOG_LEVEL_DEBUG, PSTR("DLI: mqtt->json ERROR - not json"));
|
||||
// }
|
||||
// }
|
||||
|
||||
return served;
|
||||
}
|
||||
|
||||
/*********************************************************************************************\
|
||||
* Interface
|
||||
\*********************************************************************************************/
|
||||
|
||||
bool Xdrv89(uint8_t function)
|
||||
{
|
||||
bool result = false;
|
||||
|
||||
if (FUNC_INIT == function)
|
||||
{
|
||||
DaliPreInit();
|
||||
}
|
||||
else if (Dali.present)
|
||||
{
|
||||
switch (function)
|
||||
{
|
||||
case FUNC_MQTT_DATA:
|
||||
result = DaliMqtt();
|
||||
break;
|
||||
case FUNC_COMMAND:
|
||||
result = DaliCmd();
|
||||
break;
|
||||
#ifdef USE_WEBSERVER
|
||||
// case FUNC_WEB_ADD_BUTTON:
|
||||
// WSContentSend_P(HTTP_BTN_MENU_DALI);
|
||||
// break;
|
||||
// case FUNC_WEB_ADD_HANDLER:
|
||||
// WebServer_on(PSTR("/" WEB_HANDLE_DALI), HandleDali);
|
||||
// break;
|
||||
#ifdef USE_DALI_DISPLAYINPUT
|
||||
// case FUNC_WEB_SENSOR:
|
||||
// DaliShow(0);
|
||||
// break;
|
||||
#endif // #ifdef USE_DALI_DISPLAYINPUT
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif // USE_DALI
|
||||
#endif // ESP32
|
Loading…
x
Reference in New Issue
Block a user