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

Merge branch 'development' into prerelease-14.0.0

Browse Source
This commit is contained in:
Theo Arends 2024-05-10 10:47:33 +02:00
commit 103860f394
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/tasmota_xdrv_driver/xdrv_11_knx.ino
View File

@ -533,6 +533,21 @@ void KNX_INIT(void)
} }
} }
if (PinUsed(GPIO_DHT11) || PinUsed(GPIO_DHT22) || PinUsed(GPIO_SI7021)) {
device_param[KNX_TEMPERATURE-1].show = true;
device_param[KNX_HUMIDITY-1].show = true;
}
for (uint32_t i = 0; i < MAX_ADCS; i++) {
if (PinUsed(GPIO_ADC_TEMP, i)) {
device_param[KNX_TEMPERATURE-1].show = true;
}
}
#ifdef USE_DS18x20
if (PinUsed(GPIO_DSB, GPIO_ANY)) {
device_param[KNX_TEMPERATURE-1].show = true;
}
#endif
#if defined(USE_ENERGY_SENSOR) #if defined(USE_ENERGY_SENSOR)
// Any device with a Power Monitoring // Any device with a Power Monitoring
if ( TasmotaGlobal.energy_driver != ENERGY_NONE ) { if ( TasmotaGlobal.energy_driver != ENERGY_NONE ) {
@ -772,12 +787,9 @@ void KnxSensor(uint8_t sensor_type, float value)
if (sensor_type == KNX_TEMPERATURE) if (sensor_type == KNX_TEMPERATURE)
{ {
last_temp = value; last_temp = value;
device_param[KNX_TEMPERATURE-1].show = true;
} else if (sensor_type == KNX_HUMIDITY) } else if (sensor_type == KNX_HUMIDITY)
{ {
last_hum = value; last_hum = value;
device_param[KNX_HUMIDITY-1].show = true;
} }
if (!(Settings->flag.knx_enabled)) { return; } if (!(Settings->flag.knx_enabled)) { return; }