Skip to content

Commit

Permalink
Enhance the KNX capabilities of Tasmota to offer more flexibility and…
Browse files Browse the repository at this point in the history 
… features (#22071)
  • Loading branch information
@pbrinette
pbrinette authored Sep 9, 2024
1 parent 9ac2a69 commit 28bbf11
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 10 deletions.
14 changes: 9 additions & 5 deletions tasmota/include/tasmota.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,15 @@ const uint32_t LOOP_SLEEP_DELAY = 50; // Lowest number of milliseconds to
#define KNX_SLOT3 28
#define KNX_SLOT4 29
#define KNX_SLOT5 30
#define KNX_SCENE 31
#define KNX_DIMMER 32 // aka DPT_Scaling 5.001
#define KNX_COLOUR 33 // aka DPT_Colour_RGB 232.600 or DPT_Colour_RGBW 251.600
#define KNX_MAX_device_param 33
#define MAX_KNXTX_CMNDS 5
#define KNX_SLOT6 31
#define KNX_SLOT7 32
#define KNX_SLOT8 33
#define KNX_SLOT9 34
#define KNX_SCENE 35
#define KNX_DIMMER 36 // aka DPT_Scaling 5.001
#define KNX_COLOUR 37 // aka DPT_Colour_RGB 232.600 or DPT_Colour_RGBW 251.600
#define KNX_MAX_device_param 37
#define MAX_KNXTX_CMNDS 9

// XPT2046 resistive touch driver min/max raw values
#define XPT2046_MINX 192
Expand Down
105 changes: 100 additions & 5 deletions tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ device_parameters_t device_param[] = {
{ KNX_SLOT3 , false, false, KNX_Empty },
{ KNX_SLOT4 , false, false, KNX_Empty },
{ KNX_SLOT5 , false, false, KNX_Empty },
{ KNX_SLOT6 , false, false, KNX_Empty },
{ KNX_SLOT7 , false, false, KNX_Empty },
{ KNX_SLOT8 , false, false, KNX_Empty },
{ KNX_SLOT9 , false, false, KNX_Empty },
{ KNX_SCENE , false, false, KNX_Empty },
{ KNX_DIMMER , false, false, KNX_Empty },
{ KNX_COLOUR , false, false, KNX_Empty },
Expand Down Expand Up @@ -154,6 +158,10 @@ const char * device_param_ga[] = {
D_KNX_TX_SLOT " 3",
D_KNX_TX_SLOT " 4",
D_KNX_TX_SLOT " 5",
D_KNX_TX_SLOT " 6",
D_KNX_TX_SLOT " 7",
D_KNX_TX_SLOT " 8",
D_KNX_TX_SLOT " 9",
D_KNX_TX_SCENE ,
D_BRIGHTLIGHT ,
D_COLOR ,
Expand Down Expand Up @@ -192,6 +200,10 @@ const char *device_param_cb[] = {
D_KNX_RX_SLOT " 3",
D_KNX_RX_SLOT " 4",
D_KNX_RX_SLOT " 5",
D_KNX_RX_SLOT " 6",
D_KNX_RX_SLOT " 7",
D_KNX_RX_SLOT " 8",
D_KNX_RX_SLOT " 9",
D_KNX_RX_SCENE ,
D_BRIGHTLIGHT ,
D_COLOR ,
Expand All @@ -208,14 +220,18 @@ nullptr
#define D_CMND_KNX_GA "_GA"
#define D_CMND_KNX_CB "_CB"
#define D_CMND_KNXTXSCENE "Tx_Scene"
#define D_CMND_KNXTXFLOAT "Tx_Float" // 2 bytes float (DPT9)
#define D_CMND_KNXTXDOUBLE "Tx_Double" // 4 bytes float (DPT14)
#define D_CMND_KNXTXBYTE "Tx_Byte" // 1 byte unsigned (DPT5)


const char kKnxCommands[] PROGMEM = D_PRFX_KNX "|" // Prefix
D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB "|" D_CMND_KNXTXSCENE ;
D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB "|" D_CMND_KNXTXSCENE "|"
D_CMND_KNXTXFLOAT "|" D_CMND_KNXTXDOUBLE "|" D_CMND_KNXTXBYTE;

void (* const KnxCommand[])(void) PROGMEM = {
&CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb, &CmndKnxTxScene };

&CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb, &CmndKnxTxScene,
&CmndKnxTxFloat, &CmndKnxTxVal, &CmndKnxTxByte};

#ifndef KNX_ENHANCEMENT_REPEAT
#define KNX_ENHANCEMENT_REPEAT 3
Expand All @@ -240,6 +256,15 @@ void KNX_Send_1byte_uint(address_t const &receiver, uint8_t value, knx_command_t
#define KNX_WRITE_1BYTE_UINT(r,v) KNX_Send_1byte_uint((r),(v),KNX_CT_WRITE)
#define KNX_ANSWER_1BYTE_UINT(r,v) KNX_Send_1byte_uint((r),(v),KNX_CT_ANSWER)

void KNX_Send_2byte_float(address_t const &receiver, float value, knx_command_type_t ct)
{
uint8_t repeat = Settings->flag.knx_enable_enhancement ? KNX_ENHANCEMENT_REPEAT : 1;
while ( repeat-- )
knx.send_2byte_float(receiver, ct, value);
}
#define KNX_WRITE_2BYTE_FLOAT(r,v) KNX_Send_2byte_float((r),(v),KNX_CT_WRITE)
#define KNX_ANSWER_2BYTE_FLOAT(r,v) KNX_Send_2byte_float((r),(v),KNX_CT_ANSWER)

void KNX_Send_4byte_float(address_t const &receiver, float value, knx_command_type_t ct)
{
uint8_t repeat = Settings->flag.knx_enable_enhancement ? KNX_ENHANCEMENT_REPEAT : 1;
Expand Down Expand Up @@ -601,6 +626,10 @@ void KNX_INIT(void)
device_param[KNX_SLOT3-1].show = true;
device_param[KNX_SLOT4-1].show = true;
device_param[KNX_SLOT5-1].show = true;
device_param[KNX_SLOT6-1].show = true;
device_param[KNX_SLOT7-1].show = true;
device_param[KNX_SLOT8-1].show = true;
device_param[KNX_SLOT9-1].show = true;
device_param[KNX_SCENE-1].show = true;
#endif // USE_RULES

Expand Down Expand Up @@ -690,7 +719,7 @@ void KNX_CB_Action(message_t const &msg, void *arg)
}
}
#ifdef USE_RULES
else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5)) // KNX RX SLOTs (write command)
else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT9)) // KNX RX SLOTs (write command)
{
if (!toggle_inhibit) {
char command[35]; //4294967295.00 13chars + 17
Expand Down Expand Up @@ -753,11 +782,19 @@ void KNX_CB_Action(message_t const &msg, void *arg)
KNX_Send_1bit(msg.received_on, chan->last_state, KNX_CT_ANSWER);
else if (chan->type == KNX_TEMPERATURE) // Reply Temperature
{
#ifdef KNX_USE_DPT9
KNX_ANSWER_2BYTE_FLOAT(msg.received_on, last_temp);
#else
KNX_ANSWER_4BYTE_FLOAT(msg.received_on, last_temp);
#endif // KNX_USE_DPT9
}
else if (chan->type == KNX_HUMIDITY) // Reply Humidity
{
#ifdef KNX_USE_DPT9
KNX_ANSWER_2BYTE_FLOAT(msg.received_on, last_hum);
#else
KNX_ANSWER_4BYTE_FLOAT(msg.received_on, last_hum);
#endif // KNX_USE_DPT9
}
#if defined(USE_ENERGY_SENSOR)
else if (chan->type == KNX_ENERGY_VOLTAGE) // Reply KNX_ENERGY_VOLTAGE
Expand Down Expand Up @@ -790,7 +827,7 @@ void KNX_CB_Action(message_t const &msg, void *arg)
}
#endif // USE_ENERGY_SENSOR
#ifdef USE_RULES
else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5)) // KNX RX SLOTs (read command)
else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT9)) // KNX RX SLOTs (read command)
{
if (!toggle_inhibit) {
char command[25];
Expand Down Expand Up @@ -932,6 +969,13 @@ void KnxSensor(uint8_t sensor_type, float value)
case KNX_ENERGY_TOTAL:
KNX_WRITE_4BYTE_INT(KNX_addr, round(1000.0 * value));
break;
case KNX_TEMPERATURE:
case KNX_HUMIDITY:
#ifdef KNX_USE_DPT9
KNX_WRITE_2BYTE_FLOAT(KNX_addr, value);
#else
KNX_WRITE_4BYTE_FLOAT(KNX_addr, value);
#endif
default:
KNX_WRITE_4BYTE_FLOAT(KNX_addr, value);
}
Expand Down Expand Up @@ -1251,6 +1295,57 @@ void CmndKnxTxVal(void)
}
}


void CmndKnxTxFloat(void)
{
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings->flag.knx_enabled) {
// XdrvMailbox.index <- KNX SLOT to use
// XdrvMailbox.payload <- data to send
// Search all the registered GA that has that output (variable: KNX SLOTx) as parameter
uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
while ( i != KNX_Empty ) {
KNX_addr.value = Settings->knx_GA_addr[i];

float tempvar = CharToFloat(XdrvMailbox.data);
dtostrfd(tempvar,2,XdrvMailbox.data);

KNX_WRITE_2BYTE_FLOAT(KNX_addr, tempvar);

AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d/%d/%d (2 bytes float)"),
device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);

i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
}
ResponseCmndIdxChar (XdrvMailbox.data );
}
}

void CmndKnxTxByte(void)
{
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings->flag.knx_enabled) {
// XdrvMailbox.index <- KNX SLOT to use
// XdrvMailbox.payload <- data to send
// Search all the registered GA that has that output (variable: KNX SLOTx) as parameter
uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
while ( i != KNX_Empty ) {
KNX_addr.value = Settings->knx_GA_addr[i];

uint8_t tempvar = TextToInt(XdrvMailbox.data);
dtostrfd(tempvar,0,XdrvMailbox.data);

KNX_WRITE_1BYTE_UINT(KNX_addr, tempvar);

AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d/%d/%d (1 byte unsigned)"),
device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);

i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
}
ResponseCmndIdxChar (XdrvMailbox.data );
}
}

void CmndKnxTxScene(void)
{
if ( (XdrvMailbox.data_len > 0) && Settings->flag.knx_enabled ) {
Expand Down

0 comments on commit 28bbf11

Please sign in to comment.