* limitations under the License.
*/
-#include "obd2/obd2-signals.hpp"
+#include "obd2-signals.hpp"
-#include "utils/signals.hpp"
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
const char *UNIT_NAMES[10] = {
"POURCENT",
return (uint32_t)pid_;
}
-/**
- * @fn std::vector<std::string> find_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 obd2_signal_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals)
+const std::string& obd2_signal_t::get_generic_name() const
{
- switch(key.type)
- {
- case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
- lookup_signals_by_name(key.string_value, get_obd2_signals(), found_signals);
- break;
- case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
- lookup_signals_by_id(key.numeric_value, get_obd2_signals(), found_signals);
- break;
- default:
- ERROR(binder_interface, "find_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());
+ return generic_name_;
+}
+
+const std::string obd2_signal_t::get_name() const
+{
+ return prefix_ + "." + generic_name_;
+}
+
+const std::string& obd2_signal_t::get_prefix() const
+{
+ return prefix_;
+}
+
+void obd2_signal_t::set_prefix(std::string val)
+{
+ prefix_ = val;
}
bool obd2_signal_t::is_obd2_response(can_message_t can_message)
}
return false;
*/
-}
+ return false;
+}
-void obd2_signal_t::add_request(int pid)
+/**
+ * @brief Build a DiagnosticRequest struct to be passed
+ * to diagnostic manager instance.
+ */
+const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
{
- DiagnosticRequest request = {
- arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
- mode: 0x1, has_pid: true, pid_ };
+ return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID,
+ /*mode: */0x1,
+ /*has_pid: */true,
+ /*pid: */pid_,
+ /*pid_length: */0,
+ /*payload[]: */{0},
+ /*payload_length: */0,
+ /*no_frame_padding: */false,
+ /*DiagnosticRequestType: */DiagnosticRequestType::DIAGNOSTIC_REQUEST_TYPE_PID };
}
/**