From b11692a77c2bea521d95457d76e0737a358fb9a9 Mon Sep 17 00:00:00 2001 From: Mickael Bosch Date: Wed, 1 Jul 2026 10:13:07 +0200 Subject: [PATCH] rm debug output --- include/json.hpp | 24 ++++++++------ src/json.cpp | 81 ++++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/include/json.hpp b/include/json.hpp index 71bbf90..90646b1 100644 --- a/include/json.hpp +++ b/include/json.hpp @@ -10,7 +10,7 @@ namespace JsonParser { void init(); void add_text(const uint8_t* buf, size_t size); -int json_printer(const char* bytes, size_t len, void* data); +// int json_printer(const char* bytes, size_t len, void* data); class HandlerBase { @@ -33,26 +33,32 @@ class Handler: public HandlerBase const int64_t _all_fields; public: - Handler(Struct default_s, const json_obj_descr (&da)[DESC_SIZE], Fct fct, bool allow_partial=false): + Handler( + Struct default_s, + const json_obj_descr (&da)[DESC_SIZE], + Fct fct, + bool allow_partial = false): _s {default_s}, _da {da}, _fct {fct}, - _allow_partial{allow_partial}, + _allow_partial {allow_partial}, _all_fields {(1 << DESC_SIZE) - 1} - { - } + {} - void print( const Struct& s) { json_obj_encode(_da, DESC_SIZE, &s, json_printer, NULL); } + // void print(const Struct& s) + // { + // json_obj_encode(_da, DESC_SIZE, &s, json_printer, NULL); + // } bool handle(const char* buf, size_t size) override { - Struct s{_s}; + Struct s {_s}; int64_t ret = json_obj_parse((char*)buf, size, _da, DESC_SIZE, &s); if (ret <= 0) { return false; } - if(ret != _all_fields && !_allow_partial) + if (ret != _all_fields && !_allow_partial) { return false; } @@ -61,7 +67,7 @@ public: return false; } - // LOG_INF"received a valid json\n"); + // LOG_DBG"received a valid json\n"); // print(s); // LOG_INF"\n"); return true; diff --git a/src/json.cpp b/src/json.cpp index 787f0d9..a2ce713 100644 --- a/src/json.cpp +++ b/src/json.cpp @@ -16,46 +16,47 @@ JsonParser::HandlerBase::HandlerBase() _handlers = this; } -int JsonParser::json_printer(const char* bytes, size_t len, void* data) -{ - // LOG_INF("[[%d]]", len); - // for (size_t i = 0; i < len; i++) - // { - // LOG_INF("%c", bytes[i]); - // } - // return 0; - - for (size_t i = 0; i < len; i++) - { - bool nl = true; - if (bytes[i] == '}' || bytes[i] == ']') - { - nl = false; - _indent--; - LOG_INF(""); - for (size_t i = 0; i < _indent; i++) - { - LOG_ERR(" "); - } - } - LOG_INF("%c", bytes[i]); - if (bytes[i] == '{' || bytes[i] == '[') - { - _indent++; - } - if (nl - && (bytes[i] == ',' || bytes[i] == '{' || bytes[i] == '}' - || bytes[i] == '[' || bytes[i] == ']')) - { - LOG_INF(""); - for (size_t i = 0; i < _indent; i++) - { - LOG_INF(" "); - } - } - } - return 0; -} +//FIXME weird prtink to LOG_* update? +// int JsonParser::json_printer(const char* bytes, size_t len, void* data) +// { +// // LOG_INF("[[%d]]", len); +// // for (size_t i = 0; i < len; i++) +// // { +// // LOG_INF("%c", bytes[i]); +// // } +// // return 0; +// +// for (size_t i = 0; i < len; i++) +// { +// bool nl = true; +// if (bytes[i] == '}' || bytes[i] == ']') +// { +// nl = false; +// _indent--; +// LOG_INF(""); +// for (size_t i = 0; i < _indent; i++) +// { +// LOG_ERR(" "); +// } +// } +// LOG_INF("%c", bytes[i]); +// if (bytes[i] == '{' || bytes[i] == '[') +// { +// _indent++; +// } +// if (nl +// && (bytes[i] == ',' || bytes[i] == '{' || bytes[i] == '}' +// || bytes[i] == '[' || bytes[i] == ']')) +// { +// LOG_INF(""); +// for (size_t i = 0; i < _indent; i++) +// { +// LOG_INF(" "); +// } +// } +// } +// return 0; +// } void commit() {