#include "uds/uds.h"
#include "uds/uds_types.h"
-#include "can/can-bus.hpp"
-#include "can/can-message.hpp"
+#include "../can/can-bus-dev.hpp"
+#include "../can/can-message.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
class active_diagnostic_request_t;
-class can_bus_dev_t;
+class diagnostic_manager_t;
/* Public: The signature for an optional function that can apply the neccessary
* formula to translate the binary payload into meaningful data.
*/
class active_diagnostic_request_t {
private:
- can_bus_dev_t* bus_; /*!< bus_ - The CAN bus this request should be made on, or is currently in flight-on*/
+ std::string bus_; /*!< bus_ - The CAN bus this request should be made on, or is currently in flight-on*/
uint32_t id_; /*!< id_ - The arbitration ID (aka message ID) for the request.*/
DiagnosticRequestHandle* handle_; /*!< handle_ - A handle for the request to keep track of it between
* sending the frames of the request and receiving all frames of the response.*/
std::string name_; /*!< name_ - An optional human readable name this response, to be used when publishing received
* responses. If the name is NULL, the published output will use the raw OBD-II response format.*/
+ static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol.
+ * which make easier to sort message when the come in.*/
DiagnosticResponseDecoder decoder_; /*!< decoder_ - An optional DiagnosticResponseDecoder to parse the payload of responses
* to this request. If the decoder is NULL, the output will include the raw payload
* instead of a parsed value.*/
frequency_clock_t timeout_clock_; /*!< timeout_clock_ - A frequency_clock_t object to monitor how long it's been since
* this request was sent.*/
public:
- active_diagnostic_request_t();
+ bool operator==(const active_diagnostic_request_t& b);
+ active_diagnostic_request_t& operator=(const active_diagnostic_request_t& adr);
- void updateDiagnosticRequestEntry(DiagnosticsManager* manager, CanBus* bus, DiagnosticRequest* request,
- const char* name, bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
+ active_diagnostic_request_t();
+ active_diagnostic_request_t(active_diagnostic_request_t&&) = default;
+ active_diagnostic_request_t(const std::string& bus, DiagnosticRequest* request,
+ const std::string& name, bool wait_for_multiple_responses,
+ const DiagnosticResponseDecoder decoder,
const DiagnosticResponseCallback callback, float frequencyHz);
+
+ uint32_t get_id() const;
+ const std::shared_ptr<can_bus_dev_t> get_can_bus_dev() const;
+ DiagnosticRequestHandle* get_handle();
+ uint16_t get_pid() const;
+ const std::string get_name() const;
+ static std::string& get_prefix();
+ DiagnosticResponseDecoder& get_decoder();
+ DiagnosticResponseCallback& get_callback();
+ bool get_recurring() const;
+ bool get_in_flight() const;
+ frequency_clock_t& get_frequency_clock();
+ frequency_clock_t& get_timeout_clock();
+
+ void set_handle(DiagnosticShims& shims, DiagnosticRequest* request);
+ void set_in_flight(bool val);
+
+ static bool is_diagnostic_signal(const std::string& name);
+
+ bool should_send();
+
+ bool timed_out();
+ bool response_received() const;
+ bool request_completed();
};