GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-04 07:20:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix empty string in ESP400 for time server generate invalid JSON

Browse Source
This commit is contained in:
Luc 2020-05-28 17:04:25 +02:00
parent 7fcb0bdbee
commit 6f5a24160f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esp3d/src/core/espcmd/ESP400.cpp
View File

@ -303,7 +303,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (",{\"F\":\"service/time\",\"P\":\"");
output->print (ESP_TIME_SERVER1); output->print (ESP_TIME_SERVER1);
output->print("\",\"T\":\"S\",\"V\":\""); output->print("\",\"T\":\"S\",\"V\":\"");
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER1)); output->print (strlen(Settings_ESP3D::read_string(ESP_TIME_SERVER1))==0?" ":Settings_ESP3D::read_string(ESP_TIME_SERVER1));
output->print ("\",\"S\":\""); output->print ("\",\"S\":\"");
output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER1)); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER1));
output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print ("\",\"H\":\"t-server\",\"M\":\"");
@ -314,7 +314,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (",{\"F\":\"service/time\",\"P\":\"");
output->print (ESP_TIME_SERVER2); output->print (ESP_TIME_SERVER2);
output->print("\",\"T\":\"S\",\"V\":\""); output->print("\",\"T\":\"S\",\"V\":\"");
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER2)); output->print (strlen(Settings_ESP3D::read_string(ESP_TIME_SERVER2))==0?" ":Settings_ESP3D::read_string(ESP_TIME_SERVER2));
output->print ("\",\"S\":\""); output->print ("\",\"S\":\"");
output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER2)); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER2));
output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print ("\",\"H\":\"t-server\",\"M\":\"");
@ -325,7 +325,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (",{\"F\":\"service/time\",\"P\":\"");
output->print (ESP_TIME_SERVER3); output->print (ESP_TIME_SERVER3);
output->print("\",\"T\":\"S\",\"V\":\""); output->print("\",\"T\":\"S\",\"V\":\"");
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER3)); output->print (strlen(Settings_ESP3D::read_string(ESP_TIME_SERVER3))==0?" ":Settings_ESP3D::read_string(ESP_TIME_SERVER3));
output->print ("\",\"S\":\""); output->print ("\",\"S\":\"");
output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER3)); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER3));
output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print ("\",\"H\":\"t-server\",\"M\":\"");

2
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H #define _VERSION_ESP3D_H
//version and sources location //version and sources location
#define FW_VERSION "3.0.0.a41" #define FW_VERSION "3.0.0.a42"
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H