diff options
-rw-r--r-- | plugins/default-signals.cpp | 614 |
1 files changed, 215 insertions, 399 deletions
diff --git a/plugins/default-signals.cpp b/plugins/default-signals.cpp index de5c5cd6..dbb1a599 100644 --- a/plugins/default-signals.cpp +++ b/plugins/default-signals.cpp @@ -1,195 +1,13 @@ -#include "binding/application.hpp" -#include "can/can-decoder.hpp" -#include "can/can-encoder.hpp" - +#include <binding/application.hpp> +#include <can/can-decoder.hpp> +#include <can/can-encoder.hpp> extern "C" { CTLP_CAPI_REGISTER("agl-virtual-car"); -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",0x111,"",16,16,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (signal_t{ - "sig1.1",// generic_name - 0,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig1.2",// generic_name - 16,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig2.1",// generic_name - 32,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig2.2",// generic_name - 48,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig3.1",// generic_name - 64,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig3.2",// generic_name - 80,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig4.1",// generic_name - 96,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "sig4.2",// generic_name - 112,// bit_position - 16,// bit_size - 1.00000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - static_cast<sign_t>(0),// signed - -1,// bit_sign_position - ""// unit - })} - } // end signals vector - })} // end message_definition entry -,*/{std::make_shared<message_definition_t>(message_definition_t{"ls",0x0,"P_Gear_Manual",0,2,frequency_clock_t(5.00000f),true, +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",0x0,"P_Gear_Manual",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "P_Gearbox_Direction",// generic_name @@ -209,9 +27,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Gearbox_Position_Manual",// generic_name @@ -231,9 +49,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Gearbox_Power",// generic_name @@ -253,9 +71,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Gearbox_Torque",// generic_name @@ -275,18 +93,18 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x1,"P_Powertrain",0,2,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x004,"P_Engine_Sensoric",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "P_Engine_Brake",// generic_name - 48,// bit_position - 6,// bit_size + "P_Engine_Acceleration",// generic_name + 37,// bit_position + 16,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -301,14 +119,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_DiagnoseLight",// generic_name - 31,// bit_position - 1,// bit_size + "P_Engine_Air_Temperature",// generic_name + 20,// bit_position + 9,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -323,14 +141,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Engine_RPM",// generic_name - 32,// bit_position - 15,// bit_size + "P_Engine_Engine_Status",// generic_name + 10,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -345,16 +163,16 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Petrol_Level",// generic_name - 0,// bit_position - 8,// bit_size + "P_Engine_KnockSensor",// generic_name + 9,// bit_position + 1,// bit_size 1.00000f,// factor - 20.0000f,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -367,13 +185,13 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Power",// generic_name - 8,// bit_position + "P_Engine_LambdaSensor",// generic_name + 29,// bit_position 8,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -389,14 +207,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Throttle",// generic_name - 24,// bit_position - 7,// bit_size + "P_Engine_Oil_Temperature",// generic_name + 0,// bit_position + 9,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -411,14 +229,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Torque",// generic_name - 16,// bit_position - 8,// bit_size + "P_Engine_Temperature",// generic_name + 11,// bit_position + 9,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -433,18 +251,18 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x2,"P_Steering",0,2,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x1,"P_Powertrain",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "P_Steering_Angle",// generic_name - 0,// bit_position - 10,// bit_size + "P_Engine_Brake",// generic_name + 48,// bit_position + 6,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -459,13 +277,13 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Steering_Horn",// generic_name - 10,// bit_position + "P_Engine_DiagnoseLight",// generic_name + 31,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -481,18 +299,14 @@ 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 - false,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x3,"P_Steering_Additonal",0,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit + })}, {std::make_shared<signal_t> (signal_t{ - "P_Steering_HandleBar_Angle",// generic_name - 8,// bit_position - 6,// bit_size + "P_Engine_Engine_RPM",// generic_name + 32,// bit_position + 15,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -507,16 +321,16 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Steering_HandleBar_Length",// generic_name + "P_Engine_Petrol_Level",// generic_name 0,// bit_position - 7,// bit_size + 8,// bit_size 1.00000f,// factor - 0.00000f,// offset + 20.0000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -529,18 +343,14 @@ 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 - false,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x4,"P_Engine_Sensoric",0,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit + })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Acceleration",// generic_name - 37,// bit_position - 16,// bit_size + "P_Engine_Power",// generic_name + 8,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -555,14 +365,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Air_Temperature",// generic_name - 20,// bit_position - 9,// bit_size + "P_Engine_Throttle",// generic_name + 24,// bit_position + 7,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -577,14 +387,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Engine_Status",// generic_name - 10,// bit_position - 1,// bit_size + "P_Engine_Torque",// generic_name + 16,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -599,14 +409,18 @@ 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 - false,// is_signed - ""// unit - })}, + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x2,"P_Steering",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "P_Engine_KnockSensor",// generic_name - 9,// bit_position - 1,// bit_size + "P_Steering_Angle",// generic_name + 0,// bit_position + 10,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -621,14 +435,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_LambdaSensor",// generic_name - 29,// bit_position - 8,// bit_size + "P_Steering_Horn",// generic_name + 10,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -643,14 +457,18 @@ 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 - false,// is_signed - ""// unit - })}, + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x3,"P_Steering_Additonal",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "P_Engine_Oil_Temperature",// generic_name - 0,// bit_position - 9,// bit_size + "P_Steering_HandleBar_Angle",// generic_name + 8,// bit_position + 6,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -665,14 +483,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "P_Engine_Temperature",// generic_name - 11,// bit_position - 9,// bit_size + "P_Steering_HandleBar_Length",// generic_name + 0,// bit_position + 7,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -687,13 +505,13 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x5,"P_EngineTronic",0,2,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x5,"P_EngineTronic",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_0",// generic_name @@ -713,9 +531,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_1",// generic_name @@ -735,9 +553,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_2",// generic_name @@ -757,9 +575,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_3",// generic_name @@ -779,9 +597,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_4",// generic_name @@ -801,9 +619,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Valve_5",// generic_name @@ -823,9 +641,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Rail_Pressure",// generic_name @@ -845,9 +663,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_0",// generic_name @@ -867,9 +685,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_1",// generic_name @@ -889,9 +707,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_2",// generic_name @@ -911,9 +729,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_3",// generic_name @@ -933,9 +751,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_4",// generic_name @@ -955,9 +773,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Spark_Plug_5",// generic_name @@ -977,13 +795,13 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x6,"P_Rail_Fuel",0,2,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x6,"P_Rail_Fuel",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "P_Engine_Exhaust_Temperature",// generic_name @@ -1003,9 +821,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_FuelTank_Valve",// generic_name @@ -1025,9 +843,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Fuel_Pump",// generic_name @@ -1047,9 +865,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Fuel_Temperature",// generic_name @@ -1069,9 +887,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_0",// generic_name @@ -1091,9 +909,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_1",// generic_name @@ -1113,9 +931,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_2",// generic_name @@ -1135,9 +953,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_3",// generic_name @@ -1157,9 +975,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_4",// generic_name @@ -1179,9 +997,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_HighPressure_Pump_5",// generic_name @@ -1201,9 +1019,9 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })}, {std::make_shared<signal_t> (signal_t{ "P_Engine_Rail_Valve",// generic_name @@ -1223,15 +1041,14 @@ 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 - false,// is_signed - ""// unit + static_cast<sign_t>(0),// signed + -1,// bit_sign_position + ""// unit })} } // end signals vector })} // end message_definition entry - }, // end message_definition vector - { // beginning diagnostic_messages_ vector +{ // beginning diagnostic_messages_ vector {std::make_shared<diagnostic_message_t>(diagnostic_message_t{ 4, "engine.load", @@ -1496,5 +1313,4 @@ CTLP_ONLOAD(plugin, handle) { return app->add_message_set(cms); } - -} +}
\ No newline at end of file |