diff options
| -rw-r--r-- | low-can-binding/can/message-definition.cpp | 6 | ||||
| -rw-r--r-- | low-can-binding/can/message-definition.hpp | 4 | ||||
| -rw-r--r-- | low-can-binding/can/message/message.hpp | 1 | ||||
| -rw-r--r-- | plugins/agl-vcar-signals.cpp | 12 | ||||
| -rw-r--r-- | plugins/j1939-signals.cpp | 12 |
5 files changed, 14 insertions, 21 deletions
diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp index 5977fb49..5935f726 100644 --- a/low-can-binding/can/message-definition.cpp +++ b/low-can-binding/can/message-definition.cpp @@ -23,7 +23,6 @@ message_definition_t::message_definition_t( const std::string bus, uint32_t id, uint32_t flags, - bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals) @@ -31,7 +30,6 @@ message_definition_t::message_definition_t( bus_{bus}, id_{id}, flags_{flags}, - frame_layout_is_little_{frame_layout_is_little}, frequency_clock_{frequency_clock}, force_send_changed_{force_send_changed}, last_value_{CAN_MESSAGE_SIZE}, @@ -43,7 +41,6 @@ message_definition_t::message_definition_t(const std::string bus, const std::string name, uint32_t length, uint32_t flags, - bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals) @@ -53,7 +50,6 @@ message_definition_t::message_definition_t(const std::string bus, name_{name}, length_{length}, flags_{flags}, - frame_layout_is_little_{frame_layout_is_little}, frequency_clock_{frequency_clock}, force_send_changed_{force_send_changed}, last_value_{CAN_MESSAGE_SIZE}, @@ -116,5 +112,5 @@ uint32_t message_definition_t::get_flags() const } bool message_definition_t::frame_layout_is_little() const{ - return frame_layout_is_little_; + return (flags_ & FRAME_LAYOUT_IS_LE); } diff --git a/low-can-binding/can/message-definition.hpp b/low-can-binding/can/message-definition.hpp index ab6b4be8..b0866d39 100644 --- a/low-can-binding/can/message-definition.hpp +++ b/low-can-binding/can/message-definition.hpp @@ -46,8 +46,6 @@ private: std::string name_; ///< name_ - J1939 PGN name uint32_t length_; ///< length_ - Message data length in bytes. For J1939 message, this is the expected data size uint32_t flags_; ///< format_ - the format of the message's ID.*/ - bool frame_layout_is_little_; ///<frame_layout_is_little_ Defines if the can frame layout is little endian or big endian. - /// Default is true; frequency_clock_t frequency_clock_; ///< clock_ - an optional frequency clock to control the output of this /// message, if sent raw, or simply to mark the max frequency for custom /// handlers to retrieve.*/ @@ -66,7 +64,6 @@ public: message_definition_t(const std::string bus, uint32_t id, uint32_t flags, - bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals); @@ -75,7 +72,6 @@ public: std::string name, uint32_t length, uint32_t flags, - bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals); diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp index af34615a..9a074e31 100644 --- a/low-can-binding/can/message/message.hpp +++ b/low-can-binding/can/message/message.hpp @@ -44,6 +44,7 @@ #define ISOTP_SEND 0x0020 #define ISOTP_RECEIVE 0x0040 #define CAN_PROTOCOL_WITH_FD_FRAME 0x0080 +#define FRAME_LAYOUT_IS_LE 0x0100 /// @class message_t /// diff --git a/plugins/agl-vcar-signals.cpp b/plugins/agl-vcar-signals.cpp index 12b2d630..8c1b03f8 100644 --- a/plugins/agl-vcar-signals.cpp +++ b/plugins/agl-vcar-signals.cpp @@ -9,7 +9,7 @@ CTLP_CAPI_REGISTER("agl-vcar-signals"); std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car", { // beginning message_definition_ vector - {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,0,true,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,0,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "hvac.fan.speed",// generic_name @@ -105,7 +105,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",8,128,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",8,128,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "engine.speed",// generic_name @@ -178,7 +178,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,"",8,0,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,"",8,0,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "vehicle.average.speed",// generic_name @@ -205,7 +205,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,"",8,0,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,"",8,0,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "engine.oil.temp",// generic_name @@ -255,7 +255,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x620,"",8,0,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x620,"",8,0,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "doors.boot.open",// generic_name @@ -374,7 +374,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,"",8,0,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,"",8,0,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "windows.front_left.open",// generic_name diff --git a/plugins/j1939-signals.cpp b/plugins/j1939-signals.cpp index 863df576..90962f66 100644 --- a/plugins/j1939-signals.cpp +++ b/plugins/j1939-signals.cpp @@ -9,7 +9,7 @@ CTLP_CAPI_REGISTER("j1939-signals"); std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set_t{0,"Virtual J1939", { // beginning message_definition_ vector - {std::make_shared<message_definition_t>(message_definition_t{"j1939",61442,"ETC1",8,4,true,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"j1939",61442,"ETC1",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Eng.Momentary.Overspeed.Enable",// generic_name @@ -294,7 +294,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",61444,"EEC1",8,4,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"j1939",61444,"EEC1",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Actl.Eng.Prcnt.Trque.High.Resolution",// generic_name @@ -512,7 +512,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",61449,"VDC2",8,4,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"j1939",61449,"VDC2",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Lateral.Acceleration",// generic_name @@ -658,7 +658,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65215,"EBC2",8,4,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65215,"EBC2",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Front.Axle.Speed",// generic_name @@ -823,7 +823,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65253,"HOURS",8,4,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65253,"HOURS",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Eng.Total.Hours.Of.Operation",// generic_name @@ -873,7 +873,7 @@ std::shared_ptr<message_set_t> cms = std::make_shared<message_set_t>(message_set })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65262,"ET1",8,4,true,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"j1939",65262,"ET1",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "Eng.Coolant.Temp",// generic_name |