MrRabbit/zephyr_json_cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rm debug output

Browse Source
This commit is contained in:
Mickael Bosch
2026-07-01 10:13:07 +02:00
parent b532556be8
commit b11692a77c
2 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/json.hpp
View File

@@ -10,7 +10,7 @@ namespace JsonParser
{ {
void init(); void init();
void add_text(const uint8_t* buf, size_t size); 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 class HandlerBase
{ {
@@ -33,26 +33,32 @@ class Handler: public HandlerBase
const int64_t _all_fields; const int64_t _all_fields;
public: 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}, _s {default_s},
_da {da}, _da {da},
_fct {fct}, _fct {fct},
_allow_partial{allow_partial}, _allow_partial {allow_partial},
_all_fields {(1 << DESC_SIZE) - 1} _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 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); int64_t ret = json_obj_parse((char*)buf, size, _da, DESC_SIZE, &s);
if (ret <= 0) if (ret <= 0)
{ {
return false; return false;
} }
if(ret != _all_fields && !_allow_partial) if (ret != _all_fields && !_allow_partial)
{ {
return false; return false;
} }
@@ -61,7 +67,7 @@ public:
return false; return false;
} }
// LOG_INF"received a valid json\n"); // LOG_DBG"received a valid json\n");
// print(s); // print(s);
// LOG_INF"\n"); // LOG_INF"\n");
return true; return true;

81
src/json.cpp
View File

@@ -16,46 +16,47 @@ JsonParser::HandlerBase::HandlerBase()
_handlers = this; _handlers = this;
} }
int JsonParser::json_printer(const char* bytes, size_t len, void* data) //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("[[%d]]", len);
// { // // for (size_t i = 0; i < len; i++)
// LOG_INF("%c", bytes[i]); // // {
// } // // LOG_INF("%c", bytes[i]);
// return 0; // // }
// // return 0;
for (size_t i = 0; i < len; i++) //
{ // for (size_t i = 0; i < len; i++)
bool nl = true; // {
if (bytes[i] == '}' || bytes[i] == ']') // bool nl = true;
{ // if (bytes[i] == '}' || bytes[i] == ']')
nl = false; // {
_indent--; // nl = false;
LOG_INF(""); // _indent--;
for (size_t i = 0; i < _indent; i++) // LOG_INF("");
{ // for (size_t i = 0; i < _indent; i++)
LOG_ERR(" "); // {
} // LOG_ERR(" ");
} // }
LOG_INF("%c", bytes[i]); // }
if (bytes[i] == '{' || bytes[i] == '[') // LOG_INF("%c", bytes[i]);
{ // if (bytes[i] == '{' || bytes[i] == '[')
_indent++; // {
} // _indent++;
if (nl // }
&& (bytes[i] == ',' || bytes[i] == '{' || bytes[i] == '}' // if (nl
|| bytes[i] == '[' || bytes[i] == ']')) // && (bytes[i] == ',' || bytes[i] == '{' || bytes[i] == '}'
{ // || bytes[i] == '[' || bytes[i] == ']'))
LOG_INF(""); // {
for (size_t i = 0; i < _indent; i++) // LOG_INF("");
{ // for (size_t i = 0; i < _indent; i++)
LOG_INF(" "); // {
} // LOG_INF(" ");
} // }
} // }
return 0; // }
} // return 0;
// }
void commit() void commit()
{ {