diff options
| -rw-r--r-- | src/can-signals.hpp | 2 | ||||
| -rw-r--r-- | src/can_event_push.cpp | 48 | ||||
| -rw-r--r-- | src/obd2.hpp | 123 |
3 files changed, 76 insertions, 97 deletions
diff --git a/src/can-signals.hpp b/src/can-signals.hpp index f34c743e..91a6932b 100644 --- a/src/can-signals.hpp +++ b/src/can-signals.hpp @@ -17,7 +17,7 @@ #pragma once -#include "can-utils.h" +#include "can-utils.hpp" #include <string> /** Public: Return the currently active CAN configuration. */ diff --git a/src/can_event_push.cpp b/src/can_event_push.cpp index a59aba75..3964f97c 100644 --- a/src/can_event_push.cpp +++ b/src/can_event_push.cpp @@ -26,10 +26,10 @@ #include "openxc.pb.h" #include "json-c/json.h" -void can_event_push(can_bus_t *can_bus) +void can_event_push(can_bus_t& can_bus) { - openxc_VehicleMessage *v_message; - openxc_SimpleMessage *s_message; + openxc_VehicleMessage v_message; + openxc_SimpleMessage s_message; iterator it_event; while(true) @@ -37,20 +37,21 @@ void can_event_push(can_bus_t *can_bus) if(v_message = can_bus->next_vehicle_message()) { s_message = get_simple_message(v_msg); - it_event = event_map.find(s_msg->name); - afb_event_push(it_event->second, jsonify_simple(s_msg)); + const auto& it_event = subscribed_signals.find(s_msg.name); + if(! it_event->end() && afb_event_is_valid(it_event->second)) + afb_event_push(it_event->second, jsonify_simple(s_msg)); } } } -void jsonify_DynamicField(openxc_DynamicField *field, json_object *value) +void jsonify_DynamicField(const openxc_DynamicField& field, const 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)); + 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)); return value; } @@ -58,24 +59,21 @@ void jsonify_DynamicField(openxc_DynamicField *field, json_object *value) /* Extract the simple message value from an openxc_VehicleMessage * and return it, or null if there isn't. */ -openxc_SimpleMessage* get_simple_message(openxc_VehicleMessage *v_msg) +openxc_SimpleMessage get_simple_message(const openxc_VehicleMessage& v_msg) { - if(v_msg->has_simple_message) - return v_msg->simple_message; - - return nullptr; + return v_msg.has_simple_message ? v_msg.simple_message : {0}; } -json_object* jsonify_simple(openxc_SimpleMessage *s_msg) +json_object jsonify_simple(const openxc_SimpleMessage& s_msg) { json_object *json; - json = json_object_new_object(); - - if(!s_msg->has_name) - return nullptr; - - json_object_object_add(json, "name", json_object_new_string(s_msg->name)); - jsonify_DynamicField(&s_msg->value, json); + json = nullptr; + if(s_msg->has_name) + { + json = json_object_new_object(); + json_object_object_add(json, "name", json_object_new_string(s_msg->name)); + jsonify_DynamicField(&s_msg->value, json); + } return json; }
\ No newline at end of file diff --git a/src/obd2.hpp b/src/obd2.hpp index 166773c6..72b41eb9 100644 --- a/src/obd2.hpp +++ b/src/obd2.hpp @@ -15,6 +15,7 @@ * limitations under the License. */ +#include <vector> #include "uds/uds.h" enum UNIT { @@ -67,27 +68,6 @@ typedef struct _Obd2Pid { struct afb_event event; } Obd2Pid; -/* - { pid: 0x4, name: "engine.load", frequency: 5 }, - { pid: 0x5, name: "engine.coolant.temperature", frequency: 1 }, - { pid: 0xa, name: "fuel.pressure", frequency: 1 }, - { pid: 0xb, name: "intake.manifold.pressure", frequency: 1 }, - { pid: 0xc, name: "engine.speed", frequency: 5 }, - { pid: 0xd, name: "vehicle.speed", frequency: 5 }, - { pid: 0xf, name: "intake.air.temperature", frequency: 1 }, - { pid: 0x10, name: "mass.airflow", frequency: 5 }, - { pid: 0x11, name: "throttle.position", frequency: 5 }, - { pid: 0x1f, name: "running.time", frequency: 1 }, - { pid: 0x27, name: "fuel.level", frequency: 1 }, - { pid: 0x33, name: "barometric.pressure", frequency: 1 }, - { pid: 0x4c, name: "commanded.throttle.position", frequency: 1 }, - { pid: 0x52, name: "ethanol.fuel.percentage", frequency: 1 }, - { pid: 0x5a, name: "accelerator.pedal.position", frequency: 5 }, - { pid: 0x5c, name: "engine.oil.temperature", frequency: 1 }, - { pid: 0x63, name: "engine.torque", frequency: 1 }, -}; - */ - /* Public: Check if a request is an OBD-II PID request. * * Returns true if the request is a mode 1 request and it has a 1 byte PID. @@ -110,57 +90,58 @@ float handleObd2Pid(const DiagnosticResponse* response, float parsedPayload); class obd2_handler_c { private: - public: - /* - * Pre-defined OBD-II PIDs to query for if supported by the vehicle. - */ - const Obd2Pid OBD2_PIDS[] = { - { pid: 0x04, name: "obd2.engine.load", min:0, max: 100, unit: POURCENT, frequency: 5, supported: false }, - { pid: 0x05, name: "obd2.engine.coolant.temperature", min: -40, max: 215, unit: DEGREES_CELSIUS, frequency: 1, supported: false }, - { pid: 0x0a, name: "obd2.fuel.pressure", min: 0, max: 765, unit: KPA, frequency: 1, supported: false }, - { pid: 0x0b, name: "obd2.intake.manifold.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false }, - { pid: 0x0c, name: "obd2.engine.speed", min: 0, max: 16383, unit: RPM, frequency: 5, supported: false }, - { pid: 0x0d, name: "obd2.vehicle.speed", min: 0, max: 255, unit: KM_H, frequency: 5, supported: false }, - { pid: 0x0f, name: "obd2.intake.air.temperature", min: -40, max:215, unit: DEGREES_CELSIUS, frequency: 1, supported: false }, - { pid: 0x10, name: "obd2.mass.airflow", min: 0, max: 655, unit: GRAMS_SEC, frequency: 5, supported: false }, - { pid: 0x11, name: "obd2.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false }, - { pid: 0x1f, name: "obd2.running.time", min: 0, max: 65535, unit: SECONDS, frequency: 1, supported: false }, - { pid: 0x2d, name: "obd2.EGR.error", min: -100, max: 99, unit: POURCENT, frequency: 0, supported: false }, - { pid: 0x2f, name: "obd2.fuel.level", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false }, - { pid: 0x33, name: "obd2.barometric.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false }, - { pid: 0x4c, name: "obd2.commanded.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false }, - { pid: 0x52, name: "obd2.ethanol.fuel.percentage", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false }, - { pid: 0x5a, name: "obd2.accelerator.pedal.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false }, - { pid: 0x5b, name: "obd2.hybrid.battery-pack.remaining.life", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false }, - { pid: 0x5c, name: "obd2.engine.oil.temperature",min: -40, max: 210, unit: DEGREES_CELSIUS, frequency: 1, supported: false }, - { pid: 0x63, name: "obd2.engine.torque", min: 0, max: 65535, unit: NM, frequency: 1, supported: false }, - }; - - - /* Public: Check if a request is an OBD-II PID request. - * - * Returns true if the request is a mode 1 request and it has a 1 byte PID. - */ - void find_obd2_pid(const char *name, std::Vector<Obd2Pid> *pids); + public: + /* + * Pre-defined OBD-II PIDs to query for if supported by the vehicle. + */ + const Obd2Pid OBD2_PIDS[] = { + { pid: 0x04, name: "obd2.engine.load", min:0, max: 100, unit: POURCENT, frequency: 5, supported: false, event: nullptr }, + { pid: 0x05, name: "obd2.engine.coolant.temperature", min: -40, max: 215, unit: DEGREES_CELSIUS, frequency: 1, supported: false, event: nullptr}, + { pid: 0x0a, name: "obd2.fuel.pressure", min: 0, max: 765, unit: KPA, frequency: 1, supported: false, event: nullptr }, + { pid: 0x0b, name: "obd2.intake.manifold.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false, event: nullptr }, + { pid: 0x0c, name: "obd2.engine.speed", min: 0, max: 16383, unit: RPM, frequency: 5, supported: false, event: nullptr }, + { pid: 0x0d, name: "obd2.vehicle.speed", min: 0, max: 255, unit: KM_H, frequency: 5, supported: false, event: nullptr }, + { pid: 0x0f, name: "obd2.intake.air.temperature", min: -40, max:215, unit: DEGREES_CELSIUS, frequency: 1, supported: false, event: nullptr }, + { pid: 0x10, name: "obd2.mass.airflow", min: 0, max: 655, unit: GRAMS_SEC, frequency: 5, supported: false, event: nullptr }, + { pid: 0x11, name: "obd2.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false, event: nullptr }, + { pid: 0x1f, name: "obd2.running.time", min: 0, max: 65535, unit: SECONDS, frequency: 1, supported: false, event: nullptr }, + { pid: 0x2d, name: "obd2.EGR.error", min: -100, max: 99, unit: POURCENT, frequency: 0, supported: false, event: nullptr }, + { pid: 0x2f, name: "obd2.fuel.level", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false, event: nullptr }, + { pid: 0x33, name: "obd2.barometric.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false, event: nullptr }, + { pid: 0x4c, name: "obd2.commanded.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false, event: nullptr }, + { pid: 0x52, name: "obd2.ethanol.fuel.percentage", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false, event: nullptr }, + { pid: 0x5a, name: "obd2.accelerator.pedal.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false, event: nullptr }, + { pid: 0x5b, name: "obd2.hybrid.battery-pack.remaining.life", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false, event: nullptr }, + { pid: 0x5c, name: "obd2.engine.oil.temperature",min: -40, max: 210, unit: DEGREES_CELSIUS, frequency: 1, supported: false, event: nullptr }, + { pid: 0x63, name: "obd2.engine.torque", min: 0, max: 65535, unit: NM, frequency: 1, supported: false, event: nullptr } + }; + + /** + * @brief: + * + * Returns + */ + void find_obd2_pid(const char *name, std::vector<Obd2Pid> *pids); - /* Public: Check if a request is an OBD-II PID request. - * - * Returns true if the request is a mode 1 request and it has a 1 byte PID. - */ - bool is_obd2_request(DiagnosticRequest *request); + /** + * @brief Check if a request is an OBD-II PID request. + * + * @return true if the request is a mode 1 request and it has a 1 byte PID. + */ + bool is_obd2_request(DiagnosticRequest *request); - /* - * Public: Check if requested signal name is an obd2 pid - * - * Returns true if name began with ob2.* else false. - */ - bool is_obd2_signal(const char *name); + /** + * @brief Check if requested signal name is an obd2 pid + * + * @return true if name began with ob2.* else false. + */ + bool is_obd2_signal(const char *name); - /* - * Public: pass response to UDS-C library function - * diagnostic_decode_obd2_pid() - * - * Return: float number representing the requested value. - */ - bool decode_obd2_response(DiagnosticResponse* responce); + /* + * @brief pass response to UDS-C library function + * diagnostic_decode_obd2_pid() + * + * @return float number representing the requested value. + */ + bool decode_obd2_response(DiagnosticResponse* responce); }
\ No newline at end of file |