summaryrefslogtreecommitdiffstats
path: root/src/diagnostic/diagnostic-manager.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-09 16:56:56 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit8871f8ae696035877afcbb3b089fc06219c2ba3a (patch)
treec06b629ad775ae362a9e05430bb5fea64bb64049 /src/diagnostic/diagnostic-manager.hpp
parent9099177556d598676e4d6322ae49d22bb2f0c59e (diff)
Fix: include statement with wrong path.
And minor fixes. Change-Id: Ica55c0708edd86d0aa37e7117b3c3fad551a0167 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/diagnostic/diagnostic-manager.hpp')
-rw-r--r--src/diagnostic/diagnostic-manager.hpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp
index bb12f6b0..2b804a47 100644
--- a/src/diagnostic/diagnostic-manager.hpp
+++ b/src/diagnostic/diagnostic-manager.hpp
@@ -17,14 +17,15 @@
#pragma once
+#include <queue>
#include <vector>
#include "uds/uds.h"
-#include "can/can-bus-dev.hpp"
-#include "can/can-message.hpp"
-#include "obd2/active-diagnostic-request.hpp"
+#include "../can/can-bus-dev.hpp"
+#include "../can/can-message.hpp"
+#include "active-diagnostic-request.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
/* Private: Each CAN bus needs its own set of shim functions, so this should
* match the maximum CAN controller count.
@@ -57,7 +58,7 @@ private:
std::vector<active_diagnostic_request_t> free_request_entries_; /*!< freeRequestEntries - A list of all available slots for active diagnostic
* requests. This free list is backed by statically allocated entries in
* the requestListEntries attribute.*/
- std::vector<active_diagnostic_request_t> request_list_entries_ /*!< requestListEntries - Static allocation for all active diagnostic requests.*/
+ std::vector<active_diagnostic_request_t> request_list_entries_; /*!< requestListEntries - Static allocation for all active diagnostic requests.*/
bool initialized_; /*!< * initialized - True if the DiagnosticsManager has been initialized with shims. It will interface with the uds-c lib*/
@@ -72,11 +73,13 @@ public:
void checkSupportedPids(const active_diagnostic_request_t& request,
const DiagnosticResponse& response, float parsedPayload);
- bool addRecurringRequest(DiagnosticRequest* request, const char* name,
+ bool add_request(DiagnosticRequest* request, const std::string name,
+ bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
+ const DiagnosticResponseCallback callback);
+
+ bool add_recurring_request(DiagnosticRequest* request, const char* name,
bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
const DiagnosticResponseCallback callback, float frequencyHz);
void reset();
-
- void add_request(int pid);
};