Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-24 05:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Testing comm variables settings. Added in32 functions; Some fixes to ej and jv

Browse Source
This commit is contained in:
Alden Hart
2016-12-12 15:56:52 -05:00
parent 6722e1fa99
commit d17d59c7bb
8 changed files with 103 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/json_parser.cpp
+27 -22
View File
@@ -97,7 +97,7 @@ void json_parser(char *str)
if (status == STAT_COMPLETE) { // skip the print if returning from something that already did it.
return;
}
nv_print_list(status, TEXT_NO_PRINT, JSON_RESPONSE_FORMAT);
nv_print_list(status, TEXT_MULTILINE_FORMATTED, JSON_RESPONSE_FORMAT);
sr_request_status_report(SR_REQUEST_TIMED); // generate incremental status report to show any changes
}
@@ -609,12 +609,36 @@ void json_print_response(uint8_t status)
***********************************************************************************/
/*
* js_set_jv()
* js_get_ej() - get JSON communications mode
* js_set_ej() - set JSON communications mode
*
* This one is a bit different:
* - cs.comm_mode is the setting for the *communications mode* (persistent)
* - js.json_mode is the actual current mode
*
* If comm_mode is set to TEXT_MORE (0) or JSON_MODE (1) then json_mode should also be changed
* If comm_mode is set to AUTO_MORE (0) then json_mode should not be changed
*/
stat_t js_get_ej(nvObj_t *nv) { return(get_int(nv, cs.comm_mode)); }
stat_t js_set_ej(nvObj_t *nv)
{
ritorno (set_int(nv, (uint8_t &)cs.comm_mode, TEXT_MODE, AUTO_MODE));
if (commMode(nv->value) < AUTO_MODE) { // set json_mode to 0 or 1, but don't change it if comm_mode == 2
js.json_mode = commMode(nv->value);
}
return (STAT_OK);
}
/*
* js_get_jv() - get JSON verbosity
* js_set_jv() - set JSON verbosity and related flags
*/
stat_t js_get_jv(nvObj_t *nv) { return(get_int(nv, js.json_verbosity)); }
stat_t js_set_jv(nvObj_t *nv)
{
ritorno (set_int(nv, (uint8_t &)js.json_verbosity, 0, JV_MAX_VALUE));
ritorno (set_int(nv, (uint8_t &)js.json_verbosity, JV_SILENT, JV_MAX_VALUE));
js.echo_json_footer = false;
js.echo_json_messages = false;
@@ -636,25 +660,6 @@ stat_t js_set_jv(nvObj_t *nv)
return(STAT_OK);
}
/*
* js_set_ej() - set JSON communications mode
*/
stat_t js_set_ej(nvObj_t *nv)
{
// ritorno (set_int(nv, cs.comm_mode, TEXT_MODE, AUTO_MODE));
if ((nv->value < TEXT_MODE) || (nv->value > AUTO_MODE)) {
nv->valuetype = TYPE_NULL;
return (STAT_INPUT_VALUE_RANGE_ERROR);
}
// set json_mode to 0 or 1, but don't change it if comm_mode == 2
if (commMode(nv->value) < AUTO_MODE) {
js.json_mode = commMode(nv->value);
}
return (set_ui8(nv));
}
/***********************************************************************************
* TEXT MODE SUPPORT
* Functions to print variables from the cfgArray table