summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-09 10:43:30 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit72305e67ee45ba6b56bca48b17303bf0322a8209 (patch)
treeaf6d83504a943f2b9fae8678edaddd50bc23cc4b
parent5ad1fd6926254db46621e252d0da6dc5ec95c390 (diff)
Fix: wrong signature due to reference discarding "const".
Change-Id: I7dada9d01eb8619c3807647b6df378dd147bb7fb Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--src/configuration.cpp29
-rw-r--r--src/configuration.hpp20
2 files changed, 26 insertions, 23 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 2257cbf8..aeecdb6a 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-#include <configuration.hpp>
+#include "configuration.hpp"
+
+#include "utils/signals.hpp"
#define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
@@ -51,9 +53,10 @@ std::vector<std::vector<can_signal_t>> SIGNALS;
configuration_t::configuration_t()
: obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION}
+{}
configuration_t& configuration_t::get_configuration()
-{
+{
return *this;
}
@@ -62,7 +65,7 @@ can_bus_t& configuration_t::get_can_bus_manager()
return can_bus_manager_;
}
-diagnostic_manager_t& configuration_t::get_diagnostic_manager() const
+diagnostic_manager_t& configuration_t::get_diagnostic_manager()
{
return diagnostic_manager_;
}
@@ -72,24 +75,24 @@ uint8_t configuration_t::get_active_message_set() const
return active_message_set_;
}
-const std::vector<can_message_set_t>& configuration_t::get_can_message_set() const
+const std::vector<can_message_set_t>& configuration_t::get_can_message_set()
{
return can_message_set_;
}
-std::vector<can_signal_t>& configuration_t::get_can_signals() const
+std::vector<can_signal_t>& configuration_t::get_can_signals()
{
return can_signals_[active_message_set_];
}
-const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition() const
+const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
{
return can_message_definition_[active_message_set_];
}
-std::vector<obd2_signal_t>& configuration_t::get_obd2_signals() const
+std::vector<obd2_signal_t>& configuration_t::get_obd2_signals()
{
- return obd2_signals_;
+ return obd2_signals_[active_message_set_];
}
uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const
@@ -99,7 +102,7 @@ uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const
uint32_t configuration_t::get_signal_id(can_signal_t& sig) const
{
- return sig.get_message()->get_id();
+ return sig.get_message().get_id();
}
void configuration_t::set_active_message_set(uint8_t id)
@@ -121,10 +124,10 @@ void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vec
switch(key.type)
{
case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
- lookup_signals_by_name(key.string_value, obd2_signals_, found_signals);
+ lookup_signals_by_name(key.string_value, obd2_signals_[active_message_set_], found_signals);
break;
case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
- lookup_signals_by_id(key.numeric_value, obd2_signals_, found_signals);
+ lookup_signals_by_id(key.numeric_value, obd2_signals_[active_message_set_], found_signals);
break;
default:
ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
@@ -147,10 +150,10 @@ void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vect
switch(key.type)
{
case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
- lookup_signals_by_name(std::string(key.string_value), can_signals_, found_signals);
+ lookup_signals_by_name(std::string(key.string_value), can_signals_[active_message_set_], found_signals);
break;
case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
- lookup_signals_by_id(key.numeric_value, can_signals_ found_signals);
+ lookup_signals_by_id(key.numeric_value, can_signals_[active_message_set_], found_signals);
break;
default:
ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 9c49da04..981e69e4 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -48,26 +48,26 @@ class configuration_t
public:
configuration_t();
- const std::vector<obd2_signal_t> obd2_signals_;
- const std::vector<can_message_set_t> can_message_set_;
- const std::vector<std::vector<can_signal_t>> can_signals_;
- const std::vector<std::vector<can_message_definition_t>> can_message_definition_;
+ std::vector<can_message_set_t> can_message_set_;
+ std::vector<std::vector<can_signal_t>> can_signals_;
+ std::vector<std::vector<obd2_signal_t>> obd2_signals_;
+ std::vector<std::vector<can_message_definition_t>> can_message_definition_;
- configuration_t& get_configuration() const;
+ configuration_t& get_configuration() ;
can_bus_t& get_can_bus_manager();
- diagnostic_manager_t& get_diagnostic_manager() const;
+ diagnostic_manager_t& get_diagnostic_manager() ;
uint8_t get_active_message_set() const;
- const std::vector<can_message_set_t>& get_can_message_set() const;
+ const std::vector<can_message_set_t>& get_can_message_set();
- std::vector<can_signal_t>& get_can_signals() const;
+ std::vector<can_signal_t>& get_can_signals();
- const std::vector<can_message_definition_t>& get_can_message_definition() const;
+ const std::vector<can_message_definition_t>& get_can_message_definition();
- std::vector<obd2_signal_t>& get_obd2_signals() const;
+ std::vector<obd2_signal_t>& get_obd2_signals();
uint32_t get_signal_id(obd2_signal_t& sig) const;