*/
#include "openxc-utils.hpp"
-
+#include "converter.hpp"
#include "../binding/application.hpp"
+
///
/// @brief Build a specific VehicleMessage containing a DiagnosticResponse.
///
/// and put into the DiagnosticResponse of the VehicleMessage.
/// @param[in] parsed_value - raw parsed value of the payload from CAN message
///
-/// @return a vehicle message including simple message that will be convert into
+/// @return a vehicle message including simple message that will be convert into
/// a JSON object before being pushed to the subscribers
///
const openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value)
{
openxc_VehicleMessage message;
+ ::memset(&message, 0, sizeof(message));
application_t& app = application_t::instance();
message.has_type = true;
/// @param[in] message - simple message to include into openxc_VehicleMessage
/// @param[in] timestamp - timestamp from ioctl when reading the socket
///
-/// @return a vehicle message including simple message that will be convert into
+/// @return a vehicle message including simple message that will be convert into
/// a JSON object before being pushed to the subscribers
///
const openxc_VehicleMessage build_VehicleMessage(const openxc_SimpleMessage& message, uint64_t timestamp)
{
openxc_VehicleMessage v;
-
+ ::memset(&v, 0, sizeof(v));
+
v.has_type = true,
v.type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_SIMPLE;
v.has_simple_message = true;
///
/// @param[in] message - simple message to include into openxc_VehicleMessage
///
-/// @return a vehicle message including simple message that will be convert into
+/// @return a vehicle message including simple message that will be convert into
/// a JSON object before being pushed to the subscribers
///
const openxc_VehicleMessage build_VehicleMessage(const openxc_SimpleMessage& message)
{
openxc_VehicleMessage v;
-
+ ::memset(&v, 0, sizeof(v));
+
v.has_type = true,
v.type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_SIMPLE;
v.has_simple_message = true;
{
openxc_VehicleMessage v;
- ::memset(&v, 0, sizeof(openxc_VehicleMessage));
+ ::memset(&v, 0, sizeof(v));
return v;
}
/// @brief Build an openxc_SimpleMessage associating a name to an openxc_DynamicField
///
/// @param[in] name - const string reference name to assign to the created SimpleMessage
-/// this will set has_name member to true and assign name to the name member. Maximum size for name is
+/// this will set has_name member to true and assign name to the name member. Maximum size for name is
/// set to 100 char.
/// @param[in] value - const reference with DynamicField to assign to SimpleMessage
/// value.
return s;
}
+/// @brief Build an openxc_DynamicField with a json object
+///
+/// @param[in] value - const json_object pointer to assign to convert in an
+/// openxc_DynamicField.
+///
+/// @return openxc_DynamicField initialized with a json object.
+///
+const openxc_DynamicField build_DynamicField(json_object* value)
+{
+ switch(json_object_get_type(value))
+ {
+ case json_type_string:
+ return build_DynamicField(json_object_get_string(value));
+ case json_type_double:
+ return build_DynamicField(json_object_get_double(value));
+ case json_type_int:
+ return build_DynamicField(json_object_get_double(value));
+ case json_type_boolean:
+ return build_DynamicField((bool)json_object_get_boolean(value));
+ default:
+ openxc_DynamicField d;
+ ::memset(&d, 0, sizeof(openxc_DynamicField));
+ return d;
+ }
+}
+
+const openxc_DynamicField build_DynamicField(std::vector<uint8_t> &array)
+{
+ openxc_DynamicField d;
+ d.has_type = true;
+ d.type = openxc_DynamicField_Type_BYTES;
+
+ d.has_string_value = false;
+ d.has_numeric_value = false;
+ d.has_boolean_value = false;
+ d.has_bytes_value = true;
+
+
+ size_t size = array.size();
+
+ if(size > 2040)
+ {
+ AFB_ERROR("Error to generate array dynamic field, too large data");
+ return d;
+ }
+ else
+ {
+ d.length_array = (uint32_t) size;
+ }
+
+
+ for(int i=0;i<size;i++)
+ d.bytes_value[i] = array[i];
+
+ return d;
+}
+
+
///
/// @brief Build an openxc_DynamicField with a string value
///
d.has_string_value = true;
d.has_numeric_value = false;
d.has_boolean_value = false;
+ d.has_bytes_value = false;
::strncpy(d.string_value, value, 100);
return d;
openxc_DynamicField d;
d.has_type = true;
d.type = openxc_DynamicField_Type_STRING;
-
+
d.has_string_value = true;
d.has_numeric_value = false;
d.has_boolean_value = false;
+ d.has_bytes_value = false;
::strncpy(d.string_value, value.c_str(), 100);
-
+
return d;
}
openxc_DynamicField d;
d.has_type = true;
d.type = openxc_DynamicField_Type_NUM;
-
+
d.has_string_value = false;
d.has_numeric_value = true;
d.has_boolean_value = false;
+ d.has_bytes_value = false;
d.numeric_value = value;
-
+
return d;
}
openxc_DynamicField d;
d.has_type = true;
d.type = openxc_DynamicField_Type_BOOL;
-
+
d.has_string_value = false;
d.has_numeric_value = false;
d.has_boolean_value = true;
+ d.has_bytes_value = false;
d.boolean_value = value;
-
+
+
return d;
}
{
if (v_msg.has_simple_message)
return v_msg.simple_message;
-
+
openxc_SimpleMessage s_msg = { false, "", false, build_DynamicField(false), false, build_DynamicField(false)};
return s_msg;
}
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));
+ }
else if(field.has_boolean_value)
+ {
json_object_object_add(value, "value", json_object_new_boolean(field.boolean_value));
+ }
else if(field.has_string_value)
+ {
json_object_object_add(value, "value", json_object_new_string(field.string_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()));
+ }
}
///
/// @brief Make a JSON object from a SimpleMessage
///
-/// @param[in] s_msg - const reference to an openxc_SimpleMessage
+/// @param[in] s_msg - const reference to an openxc_SimpleMessage
/// struct to convert into a json object.
/// @param[out] json - pointer with the DynamicField converted into json object
-///
+///
/// @return True if SimpleMessage has been transformed into json object
/// and false if not. In such case, a json object is returned { "error": "error msg"}
///
}
json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'"));
return false;
-}
\ No newline at end of file
+}
+
+///
+/// @brief Make a JSON object from a VehicleMessage
+///
+/// @param[in] v_msg - const reference to an openxc_VehicleMessage
+/// struct to convert into a json object.
+/// @param[in] sig - signal reference to the subscription of openxc_VehicleMessage,
+/// to get more informations about it
+/// @param[out] json - pointer with the DynamicField converted into json object
+///
+/// @return True if VehicleMessage has been transformed into json object
+/// and false if not. In such case, a json object is returned { "error": "error msg"}
+///
+bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, std::shared_ptr<signal_t> sig, json_object* json)
+{
+ if(jsonify_simple(get_simple_message(v_msg), json))
+ {
+ if(sig != nullptr && sig->get_unit() != "")
+ json_object_object_add(json, "unit", json_object_new_string(sig->get_unit().c_str()));
+
+ if(v_msg.has_timestamp)
+ json_object_object_add(json, "timestamp", json_object_new_int64(v_msg.timestamp));
+
+ return true;
+ }
+ json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'"));
+ return false;
+}
Code Review / apps / agl-service-can-low-level.git / blobdiff