Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-21 10:35:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Intermediate commit - changing canonical machine struct to work by pointer - not absolute. Compiles. Does not run.

Browse Source
This commit is contained in:
Alden Hart
2016-12-09 07:41:31 -05:00
parent 58a615358f
commit a4330f42cc
20 changed files with 704 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/json_parser.cpp
Executable → Regular
+2 -2
View File
@@ -529,7 +529,7 @@ void json_print_response(uint8_t status)
}
if (js.json_verbosity == JV_EXCEPTIONS) { // cutout for JV_EXCEPTIONS mode
if (status == STAT_OK) {
if (cm.machine_state != MACHINE_INITIALIZING) { // always do full echo during startup
if (cm->machine_state != MACHINE_INITIALIZING) { // always do full echo during startup
return;
}
}
@@ -541,7 +541,7 @@ void json_print_response(uint8_t status)
nv_reset_nv_list();
nv_add_string((const char *)"err", escape_string(cs.bufp, cs.saved_buf));
} else if ((cm.machine_state != MACHINE_INITIALIZING) || (status == STAT_INITIALIZING)) { // always do full echo during startup
} else if ((cm->machine_state != MACHINE_INITIALIZING) || (status == STAT_INITIALIZING)) { // always do full echo during startup
uint8_t nv_type;
do {
if ((nv_type = nv_get_type(nv)) == NV_TYPE_NULL) break;