jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-25 15:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add global value updates every 10 seconds

Browse Source 
Add global value updates every 10 seconds (#15834)
This commit is contained in:
Theo Arends 2022-06-23 18:13:13 +02:00
parent 14a0370507
commit 11689409fc
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tasmota/tasmota_support/support_tasmota.ino
View File

@ -847,7 +847,15 @@ String GetSwitchText(uint32_t i) {
const char kGlobalValues[] PROGMEM = D_JSON_TEMPERATURE "|" D_JSON_HUMIDITY "|" D_JSON_PRESSURE; const char kGlobalValues[] PROGMEM = D_JSON_TEMPERATURE "|" D_JSON_HUMIDITY "|" D_JSON_PRESSURE;
void GetGlobalValues(void) { void GetSensorValues(void) {
char *start = ResponseData();
int data_start = ResponseLength();
XsnsCall(FUNC_JSON_APPEND);
XdrvCall(FUNC_JSON_APPEND);
if (data_start == ResponseLength()) { return; }
for (uint32_t type = 0; type < 3; type++) { for (uint32_t type = 0; type < 3; type++) {
if (!Settings->global_sensor_index[type] || TasmotaGlobal.user_globals[type]) { continue; } if (!Settings->global_sensor_index[type] || TasmotaGlobal.user_globals[type]) { continue; }
@ -856,7 +864,8 @@ void GetGlobalValues(void) {
float value = -9999; float value = -9999;
uint32_t idx = 0; uint32_t idx = 0;
char *data = ResponseData(); // char *data = ResponseData();
char *data = start;
while (data) { while (data) {
data = strstr(data, key); data = strstr(data, key);
if (data) { if (data) {
@ -903,8 +912,7 @@ void MqttAppendSensorUnits(void)
} }
} }
bool MqttShowSensor(bool call_show_sensor) bool MqttShowSensor(bool call_show_sensor) {
{
ResponseAppendTime(); ResponseAppendTime();
int json_data_start = ResponseLength(); int json_data_start = ResponseLength();
@ -917,10 +925,8 @@ bool MqttShowSensor(bool call_show_sensor)
ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetSwitchText(i).c_str(), GetStateText(SwitchState(i))); ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetSwitchText(i).c_str(), GetStateText(SwitchState(i)));
} }
} }
XsnsCall(FUNC_JSON_APPEND);
XdrvCall(FUNC_JSON_APPEND);
GetGlobalValues(); GetSensorValues();
if (TasmotaGlobal.global_update && Settings->flag.mqtt_add_global_info) { // SetOption2 (MQTT) Add global temperature/humidity/pressure info to JSON sensor message if (TasmotaGlobal.global_update && Settings->flag.mqtt_add_global_info) { // SetOption2 (MQTT) Add global temperature/humidity/pressure info to JSON sensor message
if ((TasmotaGlobal.humidity > 0) || !isnan(TasmotaGlobal.temperature_celsius) || (TasmotaGlobal.pressure_hpa != 0)) { if ((TasmotaGlobal.humidity > 0) || !isnan(TasmotaGlobal.temperature_celsius) || (TasmotaGlobal.pressure_hpa != 0)) {
@ -1056,6 +1062,7 @@ void PerformEverySecond(void)
digitalWrite(Pin(GPIO_HEARTBEAT), TasmotaGlobal.heartbeat_inverted); digitalWrite(Pin(GPIO_HEARTBEAT), TasmotaGlobal.heartbeat_inverted);
} }
// Teleperiod
if (Settings->tele_period || (3601 == TasmotaGlobal.tele_period)) { if (Settings->tele_period || (3601 == TasmotaGlobal.tele_period)) {
if (TasmotaGlobal.tele_period >= 9999) { if (TasmotaGlobal.tele_period >= 9999) {
if (!TasmotaGlobal.global_state.network_down) { if (!TasmotaGlobal.global_state.network_down) {
@ -1075,6 +1082,15 @@ void PerformEverySecond(void)
} }
} }
// Global values (Temperature, Humidity and Pressure) update every 10 seconds
if (!(TasmotaGlobal.uptime % 10)) {
for (uint32_t type = 0; type < 3; type++) {
if (!Settings->global_sensor_index[type] || TasmotaGlobal.user_globals[type]) { continue; }
GetSensorValues();
break;
}
}
#ifdef ESP8266 #ifdef ESP8266
// Wifi keep alive to send Gratuitous ARP // Wifi keep alive to send Gratuitous ARP
wifiKeepAlive(); wifiKeepAlive();