#include "../can/can-bus.hpp"
#include "active-diagnostic-request.hpp"
-/// Each CAN bus needs its own set of shim functions, so this should
+/// Each CAN bus requires its own set of shim functions, so this should
/// match the maximum CAN controller count.
///
-#define MAX_SHIM_COUNT can_bus_t.get_can_devices().size()
#define DIAGNOSTIC_RESPONSE_ARBITRATION_ID_OFFSET 0x8
-class active_diagnostic_request_t;
-
///
-/// @brief The core structure for running the diagnostics module by the binding.
+/// @brief The core structure for running the diagnostics module of the binding.
///
/// This stores details about the active requests and shims required to connect
/// the diagnostics library to the CAN device.
static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
static void shims_logger(const char* m, ...);
- static void shims_timer();
public:
diagnostic_manager_t();
+ ~diagnostic_manager_t();
bool initialize();
active_diagnostic_request_t* find_recurring_request(DiagnosticRequest& request);
// Subscription parts
- active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name,
+ /*active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name,
bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
- const DiagnosticResponseCallback callback);
+ const DiagnosticResponseCallback callback);*/
bool validate_optional_request_attributes(float frequencyHz);
active_diagnostic_request_t* add_recurring_request(DiagnosticRequest* request, const char* name,
bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
- const DiagnosticResponseCallback callback, float frequencyHz);
+ const DiagnosticResponseCallback callback, float frequencyHz, bool permanent);
// Decoding part
- openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response);
- openxc_VehicleMessage relay_diagnostic_handle(active_diagnostic_request_t* entry, const can_message_t& cm);
- openxc_VehicleMessage find_and_decode_adr(const can_message_t& cm);
- bool is_diagnostic_response(const can_message_t& cm);
+ openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response, const uint64_t timestamp);
+ openxc_VehicleMessage relay_diagnostic_handle(active_diagnostic_request_t* entry, std::shared_ptr<message_t> m);
+ openxc_VehicleMessage find_and_decode_adr(std::shared_ptr<message_t> m);
+ bool is_diagnostic_response(std::shared_ptr<message_t> m);
};