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

Modify drivers for GUI sensor separators (#20504)

Browse Source
This commit is contained in:
SteWers 2024-01-15 16:53:34 +01:00 committed by GitHub
parent 2c555cf15b
commit f2800dd770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/tasmota_xdrv_driver/xdrv_39_thermostat.ino
View File

@ -2054,7 +2054,6 @@ const char HTTP_THERMOSTAT_DUTY_CYCLE[] PROGMEM = "{s}" D_THERMOSTAT_DUTY_CY
const char HTTP_THERMOSTAT_CYCLE_TIME[] PROGMEM = "{s}" D_THERMOSTAT_CYCLE_TIME "{m}%d " D_UNIT_MINUTE "{e}"; const char HTTP_THERMOSTAT_CYCLE_TIME[] PROGMEM = "{s}" D_THERMOSTAT_CYCLE_TIME "{m}%d " D_UNIT_MINUTE "{e}";
const char HTTP_THERMOSTAT_CONTROL_METHOD[] PROGMEM = "{s}" D_THERMOSTAT_CONTROL_METHOD "{m}%s{e}"; const char HTTP_THERMOSTAT_CONTROL_METHOD[] PROGMEM = "{s}" D_THERMOSTAT_CONTROL_METHOD "{m}%s{e}";
const char HTTP_THERMOSTAT_PI_AUTOTUNE[] PROGMEM = "{s}" D_THERMOSTAT_PI_AUTOTUNE "{m}%s{e}"; const char HTTP_THERMOSTAT_PI_AUTOTUNE[] PROGMEM = "{s}" D_THERMOSTAT_PI_AUTOTUNE "{m}%s{e}";
const char HTTP_THERMOSTAT_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
@ -2078,7 +2077,7 @@ void ThermostatShow(uint8_t ctr_output, bool json)
} }
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
WSContentSend_P(HTTP_THERMOSTAT_HL); if (ctr_output) WSContentSend_P(HTTP_SNS_HR_THIN);
if (Thermostat[ctr_output].status.thermostat_mode == THERMOSTAT_OFF) { if (Thermostat[ctr_output].status.thermostat_mode == THERMOSTAT_OFF) {
WSContentSend_P(HTTP_THERMOSTAT_INFO, ctr_output + 1, D_DISABLED ); WSContentSend_P(HTTP_THERMOSTAT_INFO, ctr_output + 1, D_DISABLED );

5
tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino
View File

@ -989,7 +989,6 @@ int EQ3SendResult(char *requested, const char *result){
} }
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
const char HTTP_EQ3_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
const char HTTP_EQ3_ALIAS[] PROGMEM = "{s}EQ3 %d Alias{m}%s{e}"; const char HTTP_EQ3_ALIAS[] PROGMEM = "{s}EQ3 %d Alias{m}%s{e}";
const char HTTP_EQ3_MAC[] PROGMEM = "{s}EQ3 %d " D_MAC_ADDRESS "{m}%s{e}"; const char HTTP_EQ3_MAC[] PROGMEM = "{s}EQ3 %d " D_MAC_ADDRESS "{m}%s{e}";
const char HTTP_EQ3_RSSI[] PROGMEM = "{s}EQ3 %d " D_RSSI "{m}%d dBm{e}"; const char HTTP_EQ3_RSSI[] PROGMEM = "{s}EQ3 %d " D_RSSI "{m}%d dBm{e}";
@ -1000,10 +999,12 @@ const char HTTP_EQ3_BATTERY[] PROGMEM = "{s}EQ3 %d " D_BATTERY "{m}%s{e}";
void EQ3Show(void) void EQ3Show(void)
{ {
char c_unit = D_UNIT_CELSIUS[0]; // ToDo: Check if fahrenheit is possible -> temp_format==TEMP_CELSIUS ? D_UNIT_CELSIUS[0] : D_UNIT_FAHRENHEIT[0]; char c_unit = D_UNIT_CELSIUS[0]; // ToDo: Check if fahrenheit is possible -> temp_format==TEMP_CELSIUS ? D_UNIT_CELSIUS[0] : D_UNIT_FAHRENHEIT[0];
bool FirstSensorShown = false;
for (int i = 0; i < EQ3_NUM_DEVICESLOTS; i++) { for (int i = 0; i < EQ3_NUM_DEVICESLOTS; i++) {
if (EQ3Devices[i].timeoutTime) { if (EQ3Devices[i].timeoutTime) {
WSContentSend_P(HTTP_EQ3_HL); if (FirstSensorShown) WSContentSend_P(HTTP_SNS_HR_THIN);
FirstSensorShown = true;
const char *alias = BLE_ESP32::getAlias(EQ3Devices[i].addr); const char *alias = BLE_ESP32::getAlias(EQ3Devices[i].addr);
if (alias && *alias){ if (alias && *alias){
WSContentSend_PD(HTTP_EQ3_ALIAS, i + 1, alias); WSContentSend_PD(HTTP_EQ3_ALIAS, i + 1, alias);

29
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
View File

@ -2725,14 +2725,13 @@ void CmndMi32Keys(void){
const char HTTP_MI32[] PROGMEM = "{s}MI ESP32 " MI32_VERSION "{m}%u%s / %u{e}"; const char HTTP_MI32[] PROGMEM = "{s}MI ESP32 " MI32_VERSION "{m}%u%s / %u{e}";
const char HTTP_MI32_ALIAS[] PROGMEM = "{s}%s Alias{m}%s{e}"; const char HTTP_MI32_ALIAS[] PROGMEM = "{s}%s Alias{m}%s{e}";
const char HTTP_MI32_MAC[] PROGMEM = "{s}%s %s{m}%s{e}"; const char HTTP_MI32_MAC[] PROGMEM = "{s}%s " D_MAC_ADDRESS "{m}%s{e}";
const char HTTP_RSSI[] PROGMEM = "{s}%s " D_RSSI "{m}%d dBm{e}"; const char HTTP_MI32_RSSI[] PROGMEM = "{s}%s " D_RSSI "{m}%d dBm{e}";
const char HTTP_BATTERY[] PROGMEM = "{s}%s " D_BATTERY "{m}%u %%{e}"; const char HTTP_MI32_BATTERY[] PROGMEM = "{s}%s " D_BATTERY "{m}%u %%{e}";
const char HTTP_LASTBUTTON[] PROGMEM = "{s}%s Last Button{m}%u {e}"; const char HTTP_MI32_LASTBUTTON[] PROGMEM = "{s}%s Last Button{m}%u{e}";
const char HTTP_EVENTS[] PROGMEM = "{s}%s Events{m}%u {e}"; const char HTTP_MI32_EVENTS[] PROGMEM = "{s}%s Events{m}%u{e}";
const char HTTP_NMT[] PROGMEM = "{s}%s No motion{m}> %u seconds{e}"; const char HTTP_MI32_NMT[] PROGMEM = "{s}%s No motion{m}> %u " D_SECONDS "{e}";
const char HTTP_MI32_FLORA_DATA[] PROGMEM = "{s}%s Fertility{m}%u us/cm{e}"; const char HTTP_MI32_FLORA_DATA[] PROGMEM = "{s}%s Fertility{m}%u " D_UNIT_MICROSIEMENS_PER_CM "{e}";
const char HTTP_MI32_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
const char HTTP_MI32_LIGHT[] PROGMEM = "{s}%s " D_LIGHT "{m}%d{e}"; const char HTTP_MI32_LIGHT[] PROGMEM = "{s}%s " D_LIGHT "{m}%d{e}";
const char HTTP_MISCALE_WEIGHT[] PROGMEM = "{s}%s " D_WEIGHT "{m}%*_f %s{e}"; const char HTTP_MISCALE_WEIGHT[] PROGMEM = "{s}%s " D_WEIGHT "{m}%*_f %s{e}";
const char HTTP_MISCALE_WEIGHT_REMOVED[] PROGMEM = "{s}%s Weight removed{m}%s{e}"; const char HTTP_MISCALE_WEIGHT_REMOVED[] PROGMEM = "{s}%s Weight removed{m}%s{e}";
@ -3521,7 +3520,7 @@ void MI32Show(bool json)
WSContentSend_P(HTTP_MI32, i + 1, stemp, numsensors); WSContentSend_P(HTTP_MI32, i + 1, stemp, numsensors);
for (i; i<j; i++) { for (i; i<j; i++) {
WSContentSend_P(HTTP_MI32_HL); WSContentSend_P(HTTP_SNS_HR_THIN);
mi_sensor_t *p; mi_sensor_t *p;
p = &MIBLEsensors[i]; p = &MIBLEsensors[i];
@ -3532,8 +3531,8 @@ void MI32Show(bool json)
} }
char _MAC[18]; char _MAC[18];
ToHex_P(p->MAC,6,_MAC,18);//,':'); ToHex_P(p->MAC,6,_MAC,18);//,':');
WSContentSend_P(HTTP_MI32_MAC, typeName, D_MAC_ADDRESS, _MAC); WSContentSend_P(HTTP_MI32_MAC, typeName, _MAC);
WSContentSend_PD(HTTP_RSSI, typeName, p->RSSI); WSContentSend_PD(HTTP_MI32_RSSI, typeName, p->RSSI);
// for some reason, display flora differently // for some reason, display flora differently
switch(p->type){ switch(p->type){
@ -3597,11 +3596,11 @@ void MI32Show(bool json)
#endif //USE_MI_DECRYPTION #endif //USE_MI_DECRYPTION
if (p->feature.events){ if (p->feature.events){
WSContentSend_PD(HTTP_EVENTS, typeName, p->events); WSContentSend_PD(HTTP_MI32_EVENTS, typeName, p->events);
} }
if (p->feature.NMT){ if (p->feature.NMT){
// no motion time // no motion time
if(p->NMT>0) WSContentSend_PD(HTTP_NMT, typeName, p->NMT); if(p->NMT>0) WSContentSend_PD(HTTP_MI32_NMT, typeName, p->NMT);
} }
if (p->feature.lux){ if (p->feature.lux){
@ -3626,10 +3625,10 @@ void MI32Show(bool json)
} }
} }
if(p->bat!=0x00){ if(p->bat!=0x00){
WSContentSend_PD(HTTP_BATTERY, typeName, p->bat); WSContentSend_PD(HTTP_MI32_BATTERY, typeName, p->bat);
} }
if (p->feature.Btn){ if (p->feature.Btn){
WSContentSend_PD(HTTP_LASTBUTTON, typeName, p->Btn); WSContentSend_PD(HTTP_MI32_LASTBUTTON, typeName, p->Btn);
} }
if (p->feature.flooding) if (p->feature.flooding)
{ {