diff --git a/src/bin.cpp b/src/bin.cpp index f8f1969..825807c 100644 --- a/src/bin.cpp +++ b/src/bin.cpp @@ -1,7 +1,7 @@ #include "bin.hpp" -void load_json_into_bin(json *json_input, Bin *bin_output) +-void load_json_into_bin(json *json_input, Bin *bin_output)---- { - bin_output->value1 = (*json_input)["value1"].get(); - bin_output->value2 = (*json_input)["value2"].get(); + bin_output->value = (*json_input)["value"].get(); + bin_output->str = (*json_input)["str"].get().c_str(); } diff --git a/src/bin.hpp b/src/bin.hpp index 3613331..2310af9 100644 --- a/src/bin.hpp +++ b/src/bin.hpp @@ -6,8 +6,8 @@ using nlohmann::json; struct Bin { - uint8_t value1; - uint8_t value2; + uint8_t value; + const char *str; }; void load_json_into_bin(json *json_input, Bin *bin_output); diff --git a/test.json b/test.json index 1ef17e0..74f4271 100644 --- a/test.json +++ b/test.json @@ -1,4 +1,4 @@ { - "value1": 10, - "value2": 42 + "value": 10, + "str": "ABC" } \ No newline at end of file