* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <map>
-#include "obd2-signals.hpp"
+#include "diagnostic-message.hpp"
#include "../configuration.hpp"
#include "../utils/signals.hpp"
"NM"
};
-obd2_signal_t::obd2_signal_t(uint8_t pid, const char* generic_name, const int min, const int max, enum UNIT unit, int frequency, bool supported)
- : pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, supported_{supported}
-{
-}
+diagnostic_message_t::diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min,
+ const int max, enum UNIT unit, float frequency, DiagnosticResponseDecoder decoder,
+ DiagnosticResponseCallback callback, bool supported)
+ : pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit},
+ frequency_{frequency}, decoder_{decoder}, callback_{callback}, supported_{supported}
+{}
-uint32_t obd2_signal_t::get_pid()
+uint32_t diagnostic_message_t::get_pid()
{
return (uint32_t)pid_;
}
-const std::string& obd2_signal_t::get_generic_name() const
+const std::string& diagnostic_message_t::get_generic_name() const
{
return generic_name_;
}
-const std::string obd2_signal_t::get_name() const
+const std::string diagnostic_message_t::get_name() const
{
return active_diagnostic_request_t::get_prefix() + "." + generic_name_;
}
-int obd2_signal_t::get_frequency() const
+float diagnostic_message_t::get_frequency() const
{
return frequency_;
}
-/**
- * @brief Build a DiagnosticRequest struct to be passed
- * to diagnostic manager instance.
- */
-const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
+DiagnosticResponseDecoder diagnostic_message_t::get_decoder() const
+{
+ return decoder_;
+}
+DiagnosticResponseCallback diagnostic_message_t::get_callback() const
+{
+ return callback_;
+}
+
+bool diagnostic_message_t::get_supported() const
+{
+ return supported_;
+}
+
+void diagnostic_message_t::set_supported(bool value)
+{
+ supported_ = value;
+}
+
+///
+/// @brief Build a DiagnosticRequest struct to be passed
+/// to diagnostic manager instance.
+///
+const DiagnosticRequest diagnostic_message_t::build_diagnostic_request()
{
return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID,
/*mode: */0x1,
/*DiagnosticRequestType: */DiagnosticRequestType::DIAGNOSTIC_REQUEST_TYPE_PID };
}
-/**
-* @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 obd2_signal_t::is_obd2_request(const 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 diagnostic_message_t::is_obd2_request(const DiagnosticRequest* request)
{
return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
}