aboutsummaryrefslogtreecommitdiffstats
path: root/src/configuration.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 22:53:22 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:39 +0100
commit897338604c6fa1e63b18907d198a5a1b45095826 (patch)
treedae2b08511e529357d7370ba803a7a257bb94862 /src/configuration.hpp
parentc631ee0bf8f702004c9d21c501d9588458c0ca08 (diff)
Separate methods declarations and implementations.
Get out examples objects to test into another cpp that will be used to be the template for the futur generated code. Change-Id: Ic630478b5419e7a18e4e6446edbac7fbe68299b9 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> Conflicts: src/configuration.hpp
Diffstat (limited to 'src/configuration.hpp')
-rw-r--r--src/configuration.hpp78
1 files changed, 23 insertions, 55 deletions
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 92655a6c..83b20e60 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -51,61 +51,29 @@ class configuration_t
const std::vector<std::vector<can_signal_t>> can_signals_;
const std::vector<std::vector<can_message_definition_t>> can_message_definition_;
- configuration_t& get_configuration()
- {
- return *this;
- }
-
- can_bus_t& get_can_bus_manager()
- {
- return can_bus_manager_;
- }
-
- diagnostic_manager_t& get_diagnostic_manager()
- {
- return diagnostic_manager_;
- }
-
- uint8_t get_active_message_set()
- {
- return active_message_set_;
- }
-
- const std::vector<can_message_set_t>& get_can_message_set()
- {
- return can_message_set_;
- }
-
- const std::vector<can_signal_t>& get_can_signals()
- {
- return can_signals_[active_message_set_];
- }
-
- const std::vector<can_message_definition_t>& get_can_message_definition()
- {
- return can_message_definition_[active_message_set_];
- }
-
- const std::vector<obd2_signal_t>& get_obd2_signals()
- {
- return obd2_signals_;
- }
-
- uint32_t get_signal_id(obd2_signal_t& sig)
- {
- return sig.get_pid();
- }
-
- uint32_t get_signal_id(can_signal_t& sig)
- {
- return sig.get_message()->id;
- }
-
- void set_active_message_set(uint8_t id)
- {
- active_message_set_ = id;
- }
+ configuration_t& get_configuration() const;
+ can_bus_t& get_can_bus_manager() const;
+
+ diagnostic_manager_t& get_diagnostic_manager() const;
+
+ uint8_t get_active_message_set() const;
+
+ const std::vector<can_message_set_t>& get_can_message_set() const;
+
+ const std::vector<can_signal_t>& get_can_signals() const;
+
+ const std::vector<can_message_definition_t>& get_can_message_definition() const;
+
+ const std::vector<obd2_signal_t>& get_obd2_signals() const;
+
+ uint32_t get_signal_id(obd2_signal_t& sig) const;
+
+ uint32_t get_signal_id(can_signal_t& sig) const;
+
+ void set_active_message_set(uint8_t id);
+
+/*
/// TODO: implement this function as method into can_bus class
/// @brief Pre initialize actions made before CAN bus initialization
/// @param[in] bus A CanBus struct defining the bus's metadata
@@ -129,5 +97,5 @@ class configuration_t
/// @param[in] buses An array of active CAN buses.
/// @param[in] busCount The length of the buses array.
bool isBusActive(can_bus_dev_t* bus);
-
+ */
};