aboutsummaryrefslogtreecommitdiffstats
path: root/src/configuration.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 12:53:27 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:39 +0100
commit99105e3efca6824e6499cad85df1244c7173ef5e (patch)
tree43ed0e8222105a1fab7aa9662d138e88d4b4113d /src/configuration.hpp
parent13ebd041eae4822d05580081cf7cca54dc4ce677 (diff)
Fix: wrong method signature.
Change-Id: Id836fac13d66443c313403a572ab840eecb8321d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/configuration.hpp')
-rw-r--r--src/configuration.hpp34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/configuration.hpp b/src/configuration.hpp
index f20ad505..13f42008 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -18,6 +18,7 @@
#pragma once
#include <vector>
+#include <fcntl.h>
#include "can/can-bus.hpp"
#include "can/can-signals.hpp"
@@ -52,14 +53,14 @@ class configuration_t
configuration_t& get_configuration()
{
- return this;
+ return *this;
}
can_bus_t& get_can_bus_manager()
{
return can_bus_manager_;
}
-
+
diagnostic_manager_t& get_diagnostic_manager()
{
return diagnostic_manager_;
@@ -70,48 +71,43 @@ class configuration_t
return active_message_set_;
}
- std::vector<can_message_set>& get_can_message_set()
+ const std::vector<can_message_set_t>& get_can_message_set()
{
return can_message_set_;
}
- std::vector<can_signal>& get_can_signals()
- {
- return can_signal_[active_message_set_];
- }
-
- std::vector<CanSignal>& get_can_signals()
+ const std::vector<can_signal_t>& get_can_signals()
{
- return SIGNALS[active_message_set_];
+ return can_signals_[active_message_set_];
}
- std::vector<can_message_definition>& get_can_message_definition()
+ const std::vector<can_message_definition_t>& get_can_message_definition()
{
return can_message_definition_[active_message_set_];
}
- std::vector<obd2_signal_t>& get_obd2_signals()
+ const std::vector<obd2_signal_t>& get_obd2_signals()
{
return obd2_signals_;
}
- std::vector<obd2_signal_t>& get_obd2_signals()
- {
- return OBD2_PIDS;
- }
-
uint32_t get_signal_id(obd2_signal_t& sig)
{
return sig.get_pid();
}
- uint32_t get_signal_id(const CanSignal& sig)
+ uint32_t get_signal_id(can_signal_t& sig)
{
- return sig.message->id;
+ return sig.get_message()->id;
}
void set_active_message_set(uint8_t id)
{
active_message_set_ = id;
}
+
+ void pre_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount);
+ void post_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount);
+ void logBusStatistics(can_bus_dev_t* buses, const int busCount);
+ bool isBusActive(can_bus_dev_t* bus);
}; \ No newline at end of file