|
@@ -168,7 +168,7 @@ namespace Global
|
|
|
g_tConfig.bootread = cJSON_GetObjectItem(pJson, _T("BootRead")) ? cJSON_GetObjectItem(pJson, _T("BootRead"))->valueint : 0;
|
|
|
g_tConfig.serverurl = cJSON_GetObjectItem(pJson, _T("server-url")) ? cJSON_GetObjectItem(pJson, _T("server-url"))->valuestring : "";
|
|
|
g_tConfig.chassis = cJSON_GetObjectItem(pJson, _T("Chassis")) ? cJSON_GetObjectItem(pJson, _T("Chassis"))->valuestring : "";
|
|
|
-
|
|
|
+ g_tConfig.waitend = cJSON_GetObjectItem(pJson, _T("WaitEnd")) ? cJSON_GetObjectItem(pJson, _T("WaitEnd"))->valueint : 1000;
|
|
|
// ƵµÀ;
|
|
|
cJSON* pItem = NULL;
|
|
|
cJSON* pChannel = cJSON_GetObjectItem(pJson, "Channel");
|
|
@@ -342,6 +342,7 @@ namespace Global
|
|
|
cJSON_AddNumberToObject(pJson, "Mode", g_tConfig.mode);
|
|
|
cJSON_AddNumberToObject(pJson, "WarnCount", g_tConfig.warncount);
|
|
|
cJSON_AddNumberToObject(pJson, "WaitBoot", g_tConfig.waitboot);
|
|
|
+ cJSON_AddNumberToObject(pJson, "WaitEnd", g_tConfig.waitboot);
|
|
|
cJSON_AddBoolToObject(pJson, "BootRead", g_tConfig.bootread);
|
|
|
cJSON_AddStringToObject(pJson, "Baudrate", g_tConfig.baudrate.c_str());
|
|
|
|