diff --git a/g2core/config_app.cpp b/g2core/config_app.cpp index eeaad3a3..771490c7 100644 --- a/g2core/config_app.cpp +++ b/g2core/config_app.cpp @@ -643,7 +643,7 @@ const cfgItem_t cfgArray[] = { { "sys","jv", _fipn, 0, js_print_jv, get_ui8, json_set_jv,(float *)&js.json_verbosity, JSON_VERBOSITY }, { "sys","qv", _fipn, 0, qr_print_qv, get_ui8, set_0123, (float *)&qr.queue_report_verbosity, QUEUE_REPORT_VERBOSITY }, { "sys","sv", _fipn, 0, sr_print_sv, get_ui8, set_012, (float *)&sr.status_report_verbosity,STATUS_REPORT_VERBOSITY }, - { "sys","si", _fipn, 0, sr_print_si, get_int32, sr_set_si, (float *)&sr.status_report_interval, STATUS_REPORT_INTERVAL_MS }, + { "sys","si", _fipn, 0, sr_print_si, get_int32,sr_set_si, (float *)&sr.status_report_interval, STATUS_REPORT_INTERVAL_MS }, // Gcode defaults // NOTE: The ordering within the gcode defaults is important for token resolution. gc must follow gco @@ -1078,6 +1078,7 @@ stat_t get_int(nvObj_t *nv, const uint8_t value) { stat_t set_int(nvObj_t *nv, uint8_t &value, uint8_t low, uint8_t high) { if ((nv->value < low) || (nv->value > high)) { + nv->valuetype = TYPE_NULL; return (STAT_INPUT_VALUE_RANGE_ERROR); } value = nv->value; diff --git a/g2core/json_parser.cpp b/g2core/json_parser.cpp index c2605b89..3dbb2c87 100644 --- a/g2core/json_parser.cpp +++ b/g2core/json_parser.cpp @@ -614,8 +614,10 @@ void json_print_response(uint8_t status) stat_t json_set_jv(nvObj_t *nv) { - if ((uint8_t)nv->value >= JV_MAX_VALUE) { return (STAT_INPUT_EXCEEDS_MAX_VALUE);} - js.json_verbosity = (jsonVerbosity)nv->value; +// if ((uint8_t)nv->value >= JV_MAX_VALUE) { return (STAT_INPUT_EXCEEDS_MAX_VALUE);} +// js.json_verbosity = (jsonVerbosity)nv->value; + + ritorno (set_int(nv, (uint8_t &)js.json_verbosity, 0, JV_MAX_VALUE)); js.echo_json_footer = false; js.echo_json_messages = false; diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h index 3512f0b7..cea98cf3 100644 --- a/g2core/settings/settings_default.h +++ b/g2core/settings/settings_default.h @@ -153,7 +153,7 @@ #endif #ifndef STATUS_REPORT_MIN_MS -#define STATUS_REPORT_MIN_MS 200 // (no JSON) milliseconds - enforces a viable minimum +#define STATUS_REPORT_MIN_MS 100 // (no JSON) milliseconds - enforces a viable minimum #endif #ifndef STATUS_REPORT_INTERVAL_MS