summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
8c1df02)
Change-Id: I93d31768804d4e30994897487e9fd312a56c547b
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
#include <pb.h>
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
#include <pb.h>
+#include <json-c/json.h>
#if PB_PROTO_HEADER_VERSION != 30
#error Regenerate this file with the current version of nanopb generator.
#if PB_PROTO_HEADER_VERSION != 30
#error Regenerate this file with the current version of nanopb generator.
openxc_DynamicField_Type_STRING = 1,
openxc_DynamicField_Type_NUM = 2,
openxc_DynamicField_Type_BOOL = 3,
openxc_DynamicField_Type_STRING = 1,
openxc_DynamicField_Type_NUM = 2,
openxc_DynamicField_Type_BOOL = 3,
- openxc_DynamicField_Type_BYTES = 4
+ openxc_DynamicField_Type_BYTES = 4,
+ openxc_DynamicField_Type_JSON = 5
} openxc_DynamicField_Type;
/* Struct definitions */
} openxc_DynamicField_Type;
/* Struct definitions */
uint8_t bytes_value[MAX_ISOTP_BYTES];
uint32_t length_array;
bool has_bytes_value;
uint8_t bytes_value[MAX_ISOTP_BYTES];
uint32_t length_array;
bool has_bytes_value;
+ json_object* json_value;
+ bool has_json_value;
} openxc_DynamicField;
typedef struct _openxc_NetworkOperatorSettings_NetworkDescriptor {
} openxc_DynamicField;
typedef struct _openxc_NetworkOperatorSettings_NetworkDescriptor {
d.length_array = (uint32_t) size;
}
d.length_array = (uint32_t) size;
}
for(int i=0;i<size;i++)
d.bytes_value[i] = array[i];
for(int i=0;i<size;i++)
d.bytes_value[i] = array[i];
d.has_numeric_value = false;
d.has_boolean_value = false;
d.has_bytes_value = false;
d.has_numeric_value = false;
d.has_boolean_value = false;
d.has_bytes_value = false;
+ d.has_json_value = false;
::strncpy(d.string_value, value, 100);
return d;
::strncpy(d.string_value, value, 100);
return d;
d.has_numeric_value = false;
d.has_boolean_value = false;
d.has_bytes_value = false;
d.has_numeric_value = false;
d.has_boolean_value = false;
d.has_bytes_value = false;
+ d.has_json_value = false;
::strncpy(d.string_value, value.c_str(), 100);
return d;
::strncpy(d.string_value, value.c_str(), 100);
return d;
d.has_numeric_value = true;
d.has_boolean_value = false;
d.has_bytes_value = false;
d.has_numeric_value = true;
d.has_boolean_value = false;
d.has_bytes_value = false;
+ d.has_json_value = false;
d.numeric_value = value;
return d;
d.numeric_value = value;
return d;
d.has_numeric_value = false;
d.has_boolean_value = true;
d.has_bytes_value = false;
d.has_numeric_value = false;
d.has_boolean_value = true;
d.has_bytes_value = false;
+ d.has_json_value = false;
+ return d;
+}
+
+///
+/// @brief Build an openxc_DynamicField with a json value
+///
+/// @param[in] value - json value to assign to builded openxc_DynamicField.
+///
+/// @return openxc_DynamicField initialized with a json value.
+///
+const openxc_DynamicField build_DynamicField_json(json_object *value)
+{
+ openxc_DynamicField d;
+ d.has_type = true;
+ d.type = openxc_DynamicField_Type_JSON;
+
+ d.has_string_value = false;
+ d.has_numeric_value = false;
+ d.has_boolean_value = false;
+ d.has_bytes_value = false;
+ d.has_json_value = true;
+ d.json_value = value;
void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value)
{
if(field.has_numeric_value)
void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value)
{
if(field.has_numeric_value)
json_object_object_add(value, "value", json_object_new_double(field.numeric_value));
json_object_object_add(value, "value", json_object_new_double(field.numeric_value));
else if(field.has_boolean_value)
else if(field.has_boolean_value)
json_object_object_add(value, "value", json_object_new_boolean(field.boolean_value));
json_object_object_add(value, "value", json_object_new_boolean(field.boolean_value));
else if(field.has_string_value)
else if(field.has_string_value)
json_object_object_add(value, "value", json_object_new_string(field.string_value));
json_object_object_add(value, "value", json_object_new_string(field.string_value));
else if(field.has_bytes_value)
else if(field.has_bytes_value)
- {
- std::string s = converter_t::to_hex(field.bytes_value, field.length_array);
- json_object_object_add(value, "value", json_object_new_string(s.c_str()));
- }
+ json_object_object_add(value, "value", json_object_new_string(converter_t::to_hex(field.bytes_value, field.length_array).c_str()));
+ else if(field.has_json_value)
+ json_object_object_add(value, "signals", json_object_new_string(json_object_get_string(field.json_value)));
const openxc_DynamicField build_DynamicField(double value);
const openxc_DynamicField build_DynamicField(bool value);
const openxc_DynamicField build_DynamicField(std::vector<uint8_t> &array);
const openxc_DynamicField build_DynamicField(double value);
const openxc_DynamicField build_DynamicField(bool value);
const openxc_DynamicField build_DynamicField(std::vector<uint8_t> &array);
+const openxc_DynamicField build_DynamicField_json(json_object *value);
int get_bool_from_DynamicField(const openxc_VehicleMessage& v_msg, bool& ret);
double get_numerical_from_DynamicField(const openxc_VehicleMessage& v_msg);
int get_bool_from_DynamicField(const openxc_VehicleMessage& v_msg, bool& ret);
double get_numerical_from_DynamicField(const openxc_VehicleMessage& v_msg);