* limitations under the License.
*/
-#include <configuration.hpp>
+#include "configuration.hpp"
-#define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
+#include "utils/signals.hpp"
// Pre-defined OBD-II PIDs to query for if supported by the vehicle.
std::vector<obd2_signal_t> OBD2_PIDS = {
- { 0x04, "obd2.engine.load", 0, 100, POURCENT, 5, false},
- { 0x05, "obd2.engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
- { 0x0a, "obd2.fuel.pressure", 0, 765, KPA, 1, false},
- { 0x0b, "obd2.intake.manifold.pressure", 0, 255, KPA, 1, false},
- { 0x0c, "obd2.engine.speed", 0, 16383, RPM, 5, false},
- { 0x0d, "obd2.vehicle.speed", 0, 255, KM_H, 5, false},
- { 0x0f, "obd2.intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
- { 0x10, "obd2.mass.airflow", 0, 655, GRAMS_SEC, 5, false},
- { 0x11, "obd2.throttle.position", 0, 100, POURCENT, 5, false},
- { 0x1f, "obd2.running.time", 0, 65535, SECONDS, 1, false},
- { 0x2d, "obd2.EGR.error", -100, 99, POURCENT, 0, false},
- { 0x2f, "obd2.fuel.level", 0, 100, POURCENT, 1, false},
- { 0x33, "obd2.barometric.pressure", 0, 255, KPA, 1, false},
- { 0x4c, "obd2.commanded.throttle.position", 0, 100, POURCENT, 1, false},
- { 0x52, "obd2.ethanol.fuel.percentage", 0, 100, POURCENT, 1, false},
- { 0x5a, "obd2.accelerator.pedal.position", 0, 100, POURCENT, 5, false},
- { 0x5b, "obd2.hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false},
- { 0x5c, "obd2.engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false},
- { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false}
+ obd2_signal_t(0x04, "engine.load", 0, 100, POURCENT, 5, false),
+ obd2_signal_t(0x05, "engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false),
+ obd2_signal_t(0x0a, "fuel.pressure", 0, 765, KPA, 1, false),
+ obd2_signal_t(0x0b, "intake.manifold.pressure", 0, 255, KPA, 1, false),
+ obd2_signal_t(0x0c, "engine.speed", 0, 16383, RPM, 5, false),
+ obd2_signal_t(0x0d, "vehicle.speed", 0, 255, KM_H, 5, false),
+ obd2_signal_t(0x0f, "intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false),
+ obd2_signal_t(0x10, "mass.airflow", 0, 655, GRAMS_SEC, 5, false),
+ obd2_signal_t(0x11, "throttle.position", 0, 100, POURCENT, 5, false),
+ obd2_signal_t(0x1f, "running.time", 0, 65535, SECONDS, 1, false),
+ obd2_signal_t(0x2d, "EGR.error", -100, 99, POURCENT, 0, false),
+ obd2_signal_t(0x2f, "fuel.level", 0, 100, POURCENT, 1, false),
+ obd2_signal_t(0x33, "barometric.pressure", 0, 255, KPA, 1, false),
+ obd2_signal_t(0x4c, "commanded.throttle.position", 0, 100, POURCENT, 1, false),
+ obd2_signal_t(0x52, "ethanol.fuel.percentage", 0, 100, POURCENT, 1, false),
+ obd2_signal_t(0x5a, "accelerator.pedal.position", 0, 100, POURCENT, 5, false),
+ obd2_signal_t(0x5b, "hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false),
+ obd2_signal_t(0x5c, "engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false),
+ obd2_signal_t(0x63, "engine.torque", 0, 65535, NM, 1, false)
};
// Dumb signals and message implementation. To get compile.
std::vector<std::vector<can_signal_t>> SIGNALS;
+configuration_t& configuration_t::instance()
+{
+ static configuration_t config;
+ return config;
+}
+
configuration_t::configuration_t()
- : obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION}
+ : can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, obd2_signals_{OBD2_PIDS}, can_message_definition_{CAN_MESSAGES_DEFINTION}
+{}
configuration_t& configuration_t::get_configuration()
-{
+{
return *this;
}
-can_bus_t& configuration_t::get_can_bus_manager() const
+can_bus_t& configuration_t::get_can_bus_manager()
{
return can_bus_manager_;
}
-diagnostic_manager_t& configuration_t::get_diagnostic_manager() const
+diagnostic_manager_t& configuration_t::get_diagnostic_manager()
{
return diagnostic_manager_;
}
return active_message_set_;
}
-const std::vector<can_message_set_t>& configuration_t::get_can_message_set() const
+const std::vector<can_message_set_t>& configuration_t::get_can_message_set()
{
return can_message_set_;
}
-const std::vector<can_signal_t>& configuration_t::get_can_signals() const
+std::vector<can_signal_t>& configuration_t::get_can_signals()
{
return can_signals_[active_message_set_];
}
-const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition() const
+std::vector<obd2_signal_t>& configuration_t::get_obd2_signals()
{
- return can_message_definition_[active_message_set_];
+ return obd2_signals_[active_message_set_];
}
-const std::vector<obd2_signal_t>& configuration_t::get_obd2_signals() const
+const std::vector<std::string>& configuration_t::get_signals_prefix() const
{
- return obd2_signals_;
+ return signals_prefix_;
+}
+
+const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
+{
+ return can_message_definition_[active_message_set_];
}
uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const
uint32_t configuration_t::get_signal_id(can_signal_t& sig) const
{
- return sig.get_message()->get_id();
+ return sig.get_message().get_id();
}
void configuration_t::set_active_message_set(uint8_t id)
{
active_message_set_ = id;
+}
+
+/**
+ * @fn std::vector<std::string> find_can_signals(const openxc_DynamicField &key)
+ * @brief return signals name found searching through CAN_signals and OBD2 pid
+ *
+ * @param[in] key - can contain numeric or string value in order to search against
+ * can signals or obd2 signals name.
+ *
+ * @return Vector of signals name found.
+ */
+void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals)
+{
+ switch(key.type)
+ {
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
+ lookup_signals_by_name(key.string_value, obd2_signals_[active_message_set_], found_signals);
+ break;
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
+ lookup_signals_by_id(key.numeric_value, obd2_signals_[active_message_set_], found_signals);
+ break;
+ default:
+ ERROR(binder_interface, "find_obd2_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+ break;
+ }
+ DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size());
+}
+
+/**
+ * @fn void find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
+ * @brief return signals name found searching through CAN_signals and OBD2 pid
+ *
+ * @param[in] key - can contain numeric or string value in order to search against
+ * can signals or obd2 signals name.
+ * @param[out] found_signals - provided vector to fill with ponter to signals matched.
+ *
+ */
+void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
+{
+ switch(key.type)
+ {
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
+ lookup_signals_by_name(std::string(key.string_value), can_signals_[active_message_set_], found_signals);
+ break;
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
+ lookup_signals_by_id(key.numeric_value, can_signals_[active_message_set_], found_signals);
+ break;
+ default:
+ ERROR(binder_interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+ break;
+ }
+ DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size());
}
\ No newline at end of file
Code Review / apps / agl-service-can-low-level.git / blobdiff