X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fopenxc-utils.hpp;h=cf04d2207c6b62bf951cb4b0683533b4c6b8f9ee;hb=refs%2Fchanges%2F37%2F25137%2F1;hp=57663045f73d382f1fa31aa681855903bdb2ad63;hpb=e08e9bc89e78b3937f84a8dbf47968159521a7ea;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/utils/openxc-utils.hpp b/low-can-binding/utils/openxc-utils.hpp index 57663045..cf04d220 100644 --- a/low-can-binding/utils/openxc-utils.hpp +++ b/low-can-binding/utils/openxc-utils.hpp @@ -23,6 +23,7 @@ #include #include "openxc.pb.h" +#include "../can/signals.hpp" #include "../diagnostic/active-diagnostic-request.hpp" const openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value); @@ -32,10 +33,13 @@ openxc_VehicleMessage build_VehicleMessage(); bool is_valid(const openxc_VehicleMessage& v); const openxc_SimpleMessage build_SimpleMessage(const std::string& name, const openxc_DynamicField& value); +const openxc_DynamicField build_DynamicField(json_object* value); const openxc_DynamicField build_DynamicField(const char* value); const openxc_DynamicField build_DynamicField(const std::string& value); const openxc_DynamicField build_DynamicField(double value); const openxc_DynamicField build_DynamicField(bool value); +const openxc_DynamicField build_DynamicField(std::vector &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); @@ -46,4 +50,4 @@ void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value); bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json); -bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, json_object* json); +bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, std::shared_ptr sig, json_object* json);