diff options
| -rwxr-xr-x | low-can-binding/can/signals.cpp | 7 | ||||
| -rwxr-xr-x | low-can-binding/can/signals.hpp | 3 | ||||
| -rw-r--r-- | plugins/agl-vcar-signals.cpp | 19 | ||||
| -rw-r--r-- | plugins/j1939-signals.cpp | 40 |
4 files changed, 0 insertions, 69 deletions
diff --git a/low-can-binding/can/signals.cpp b/low-can-binding/can/signals.cpp index da8df988..ac2b26c2 100755 --- a/low-can-binding/can/signals.cpp +++ b/low-can-binding/can/signals.cpp @@ -45,7 +45,6 @@ signal_t::signal_t( signal_encoder encoder, bool received, std::pair<bool, int> multiplex, - bool is_big_endian, sign_t sign, int32_t bit_sign_position, std::string unit) @@ -67,7 +66,6 @@ signal_t::signal_t( , received_{received} , last_value_{.0f} , multiplex_{multiplex} - , is_big_endian_{is_big_endian} , sign_{sign} , bit_sign_position_{bit_sign_position} , unit_{unit} @@ -232,11 +230,6 @@ std::pair<bool,int> signal_t::get_multiplex() const return multiplex_; } -bool signal_t::get_is_big_endian() const -{ - return is_big_endian_; -} - sign_t signal_t::get_sign() const { return sign_; diff --git a/low-can-binding/can/signals.hpp b/low-can-binding/can/signals.hpp index bf779981..cd1c919a 100755 --- a/low-can-binding/can/signals.hpp +++ b/low-can-binding/can/signals.hpp @@ -107,7 +107,6 @@ private: std::pair<bool, int> multiplex_; /*!< multiplex_ - If bool is false and int is 0 is not a multiplex signal If bool is true, that indicate that is a multiplexor If int is different of 0, that indicate the link with a multiplexor */ - bool is_big_endian_; /*!< is_big_endian - True if the signal's data are meant to be read as a big_endian */ sign_t sign_; /* !< sign_ - if the data is signed it indicates the encode */ int32_t bit_sign_position_; /*!< bit_sign_position_ - The bit that indicates the sign of the signal in its CAN message*/ std::string unit_; /* !< unit_ - The unit of the data */ @@ -131,7 +130,6 @@ public: signal_encoder encoder, bool received, std::pair<bool, int> multiplex, - bool is_big_endian, sign_t sign, int32_t bit_sign_position, std::string unit); @@ -173,7 +171,6 @@ public: float get_last_value() const; std::pair<float, uint64_t> get_last_value_with_timestamp() const; std::pair<bool, int> get_multiplex() const; - bool get_is_big_endian() const; sign_t get_sign() const; int32_t get_bit_sign_position() const; const std::string get_unit() const; diff --git a/plugins/agl-vcar-signals.cpp b/plugins/agl-vcar-signals.cpp index 946d0564..457e7bc9 100644 --- a/plugins/agl-vcar-signals.cpp +++ b/plugins/agl-vcar-signals.cpp @@ -29,7 +29,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -52,7 +51,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -75,7 +73,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -98,7 +95,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -125,7 +121,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -148,7 +143,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -171,7 +165,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -198,7 +191,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -225,7 +217,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -248,7 +239,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -275,7 +265,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -298,7 +287,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -321,7 +309,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -344,7 +331,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -367,7 +353,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -394,7 +379,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -417,7 +401,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -440,7 +423,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -463,7 +445,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit diff --git a/plugins/j1939-signals.cpp b/plugins/j1939-signals.cpp index 90962f66..d7d5c526 100644 --- a/plugins/j1939-signals.cpp +++ b/plugins/j1939-signals.cpp @@ -33,7 +33,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -60,7 +59,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -83,7 +81,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -110,7 +107,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -133,7 +129,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -160,7 +155,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -183,7 +177,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "rpm"// unit @@ -206,7 +199,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "rpm"// unit @@ -233,7 +225,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -260,7 +251,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -287,7 +277,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -318,7 +307,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -341,7 +329,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -364,7 +351,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -387,7 +373,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -410,7 +395,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "rpm"// unit @@ -446,7 +430,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -482,7 +465,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -505,7 +487,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -532,7 +513,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "m/s/s"// unit @@ -555,7 +535,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "m/s/s"// unit @@ -578,7 +557,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "rad"// unit @@ -605,7 +583,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position ""// unit @@ -628,7 +605,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "turns"// unit @@ -651,7 +627,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "rad/s"// unit @@ -678,7 +653,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -701,7 +675,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -724,7 +697,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -747,7 +719,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -770,7 +741,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -793,7 +763,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -816,7 +785,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "km/h"// unit @@ -843,7 +811,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "hr"// unit @@ -866,7 +833,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "r"// unit @@ -893,7 +859,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "deg C"// unit @@ -916,7 +881,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "deg C"// unit @@ -939,7 +903,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "deg C"// unit @@ -962,7 +925,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "%"// unit @@ -985,7 +947,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "deg C"// unit @@ -1008,7 +969,6 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - false,// is_big_endian static_cast<sign_t>(0),// signed -1,// bit_sign_position "deg C"// unit |