mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12525 from gemu2015/scripter_fix 

fix mqtt errors
This commit is contained in:
Theo Arends 2021-07-01 08:49:34 +02:00 committed by GitHub
parent 0052a49824 e0e49df57c
commit c786fd342d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/xdrv_10_scripter.ino
View File

@ -2402,9 +2402,9 @@ chknext:
rstring[0] = 0; rstring[0] = 0;
int8_t index = fvar; int8_t index = fvar;
#ifdef MQTT_DATA_STRING #ifdef MQTT_DATA_STRING
char *wd = TasmotaGlobal.mqtt_data; char *wd = (char*)TasmotaGlobal.mqtt_data.c_str();
#else #else
char *wd = TasmotaGlobal.mqtt_data.c_str(); char *wd = TasmotaGlobal.mqtt_data;
#endif #endif
strlcpy(rstring, wd, glob_script_mem.max_ssize); strlcpy(rstring, wd, glob_script_mem.max_ssize);
if (index) { if (index) {

4
tasmota/xdrv_13_display.ino
View File

@ -1302,7 +1302,7 @@ void DisplayDTVarsTeleperiod(void) {
char *json = (char*)malloc(jlen + 2); char *json = (char*)malloc(jlen + 2);
if (json) { if (json) {
#ifdef MQTT_DATA_STRING #ifdef MQTT_DATA_STRING
strlcpy(json, TasmotaGlobal.mqtt_data.c_str(), jlen + 1); strlcpy(json, (char*)TasmotaGlobal.mqtt_data.c_str(), jlen + 1);
#else #else
strlcpy(json, TasmotaGlobal.mqtt_data, jlen + 1); strlcpy(json, TasmotaGlobal.mqtt_data, jlen + 1);
#endif #endif
@ -1325,7 +1325,7 @@ void get_dt_mqtt(void) {
ResponseJsonEnd(); ResponseJsonEnd();
} }
#ifdef MQTT_DATA_STRING #ifdef MQTT_DATA_STRING
get_dt_vars(TasmotaGlobal.mqtt_data.c_str()); get_dt_vars((char*)TasmotaGlobal.mqtt_data.c_str());
#else #else
get_dt_vars(TasmotaGlobal.mqtt_data); get_dt_vars(TasmotaGlobal.mqtt_data);
#endif #endif