From 42163fc4757fa2bb4a8fba54afb8a092ccd0878d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 13 Nov 2019 00:37:23 -0500 Subject: Add steering wheel LIN message signal definitions Add signal definitions for the button status information in the steering wheel demo LIN message. Bug-AGL: SPEC-2951 Signed-off-by: Scott Murray Change-Id: Id4909161f8f159858a3d29e310a3b43a787f2d03 --- low-can-binding/binding/application-generated.cpp | 1369 +++++---------------- 1 file changed, 311 insertions(+), 1058 deletions(-) (limited to 'low-can-binding/binding/application-generated.cpp') diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp index bd1837fc..f4d2635d 100644 --- a/low-can-binding/binding/application-generated.cpp +++ b/low-can-binding/binding/application-generated.cpp @@ -7,78 +7,12 @@ application_t::application_t() , message_set_{ {std::make_shared(message_set_t{0,"AGL Virtual Car", { // beginning message_definition_ vector - {std::make_shared(message_definition_t{"ls",0x30,"",8,4,frequency_clock_t(5.00000f),true, + {std::make_shared(message_definition_t{"ls",0x21,"",0,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared (signal_t{ - "hvac.fan.speed",// generic_name - 32,// bit_position - 8,// bit_size - 23.5294f,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "hvac.temperature.left",// generic_name - 0,// bit_position - 8,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "hvac.temperature.right",// generic_name - 8,// bit_position - 8,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "hvac.temperature.average",// generic_name - 16,// bit_position - 8,// bit_size + "steering_wheel.cruise.cancel",// generic_name + 52,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -88,43 +22,17 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"hs",0x3D9,"",8,2050,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (signal_t{ - "engine.speed",// generic_name - 16,// bit_position - 16,// bit_size - 0.250000f,// 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 + false,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "fuel.level.low",// generic_name + "steering_wheel.cruise.distance",// generic_name 55,// bit_position 1,// bit_size 1.00000f,// factor @@ -136,71 +44,19 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "fuel.level",// generic_name - 8,// bit_position - 8,// bit_size - 0.392157f,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"hs",0x3E9,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (signal_t{ - "vehicle.average.speed",// generic_name - 0,// bit_position - 15,// bit_size - 0.0156250f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - false,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"hs",0x4D1,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (signal_t{ - "engine.oil.temp",// generic_name - 16,// bit_position - 8,// bit_size + "steering_wheel.cruise.enable",// generic_name + 48,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -210,18 +66,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable - nullptr,// decoder + false,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "engine.oil.temp.high",// generic_name - 7,// bit_position + "steering_wheel.cruise.limit",// generic_name + 54,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -232,22 +88,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"hs",0x620,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared (signal_t{ - "doors.boot.open",// generic_name - 47,// bit_position + "steering_wheel.cruise.resume",// generic_name + 49,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -258,18 +110,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "doors.front_left.open",// generic_name - 43,// bit_position + "steering_wheel.cruise.set",// generic_name + 51,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -280,18 +132,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "doors.front_right.open",// generic_name - 44,// bit_position + "steering_wheel.horn",// generic_name + 56,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -302,18 +154,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "doors.rear_left.open",// generic_name - 46,// bit_position + "steering_wheel.info",// generic_name + 38,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -324,19 +176,19 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "doors.rear_right.open",// generic_name - 45,// bit_position - 4,// bit_size + "steering_wheel.lane_departure_warning",// generic_name + 63,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -346,22 +198,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"hs",0x799,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared (signal_t{ - "windows.front_left.open",// generic_name - 43,// bit_position + "steering_wheel.mode",// generic_name + 34,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -372,18 +220,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "windows.front_right.open",// generic_name - 44,// bit_position + "steering_wheel.next",// generic_name + 36,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -394,18 +242,18 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "windows.rear_left.open",// generic_name - 46,// bit_position + "steering_wheel.phone.call",// generic_name + 47,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -416,19 +264,19 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "windows.rear_right.open",// generic_name - 45,// bit_position - 4,// bit_size + "steering_wheel.phone.hangup",// generic_name + 46,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -438,46 +286,19 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -#ifdef USE_FEATURE_ISOTP -, {std::make_shared(message_definition_t{"ls",0x111,"",16,66,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "sig1.2",// generic_name - 16,// bit_position - 16,// bit_size + "steering_wheel.previous",// generic_name + 32,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -487,580 +308,19 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable - nullptr,// decoder + false,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -#endif -#ifdef USE_FEATURE_J1939 -, {std::make_shared(message_definition_t{"j1939",61442,"ETC1",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (signal_t{ - "Eng.Momentary.Overspeed.Enable",// generic_name - 32,// bit_position - 2,// 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 - { - {0,"MomentaryEngOverspeedIsDisabled"}, - {1,"MomentaryEngOverspeedIsEnabled"}, - {2,"Reserved"}, - {3,"TakeNoAction"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Momentary.Eng.Max.Power.Enable",// generic_name - 36,// bit_position - 2,// 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 - { - {2,"fault"}, - {1,"mmntarilyRqingMaxPowerAvailable"}, - {3,"notAvailable"}, - {0,"notRqingMaxPowerAvailable"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Percent.Clutch.Slip",// generic_name - 24,// bit_position - 8,// bit_size - 0.400000f,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared (signal_t{ - "Progressive.Shift.Disable",// generic_name - 34,// bit_position - 2,// 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 - { - {1,"ProgressiveShiftIsDisabled"}, - {0,"ProgressiveShiftIsNotDisabled"}, - {2,"Reserved"}, - {3,"TakeNoAction"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Src.Addrss.Of.Ctrllng.Dvc.Fr.Trns.Cntrl",// generic_name - 56,// bit_position - 8,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Trans.Driveline.Engaged",// generic_name - 0,// bit_position - 2,// 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 - { - {0,"DrivelineDisengaged"}, - {1,"DrivelineEngaged"}, - {2,"Error"}, - {3,"NotAvailable"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Trans.Input.Shaft.Speed",// generic_name - 40,// bit_position - 16,// bit_size - 0.125000f,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared (signal_t{ - "Trans.Output.Shaft.Speed",// generic_name - 8,// bit_position - 16,// bit_size - 0.125000f,// 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(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared (signal_t{ - "Trans.Shift.In.Process",// generic_name - 4,// bit_position - 2,// 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 - { - {2,"Error"}, - {3,"NotAvailable"}, - {1,"ShiftInProcess"}, - {0,"ShiftIsNotInProcess"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Trns.Trq.Cnvrtr.Lckp.Trnstn.In.Prcess",// generic_name - 6,// bit_position - 2,// 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 - { - {2,"Error"}, - {3,"NotAvailable"}, - {1,"TransitionIsInProcess"}, - {0,"TransitionIsNotInProcess"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Trns.Trque.Converter.Lockup.Engaged",// generic_name - 2,// bit_position - 2,// 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 - { - {2,"Error"}, - {3,"NotAvailable"}, - {0,"TorqueConverterLockupDisengaged"}, - {1,"TorqueConverterLockupEngaged"} - },// states - true,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"j1939",61444,"EEC1",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared (signal_t{ - "Actl.Eng.Prcnt.Trque.High.Resolution",// generic_name - 4,// bit_position - 4,// bit_size - 0.125000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - {0,"0000"}, - {1,"0125"}, - {7,"0875"}, - {8,"1111NotAvailable"} - },// states - false,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared (signal_t{ - "Actual.Eng.Percent.Torque",// generic_name - 16,// bit_position - 8,// bit_size - 1.00000f,// factor - -125.000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - false,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared (signal_t{ - "Drivers.Demand.Eng.Percent.Torque",// generic_name - 8,// bit_position - 8,// bit_size - 1.00000f,// factor - -125.000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - false,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Demand.Percent.Torque",// generic_name - 56,// bit_position - 8,// bit_size - 1.00000f,// factor - -125.000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - false,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Speed",// generic_name - 24,// bit_position - 16,// bit_size - 0.125000f,// factor - 0.00000f,// offset - 0,// min_value - 0,// max_value - frequency_clock_t(0.00000f),// frequency - true,// send_same - false,// force_send_changed - { - },// states - false,// writable - nullptr,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Starter.Mode",// generic_name - 48,// bit_position - 4,// 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 - { - {9,"1011Reserved"}, - {14,"error"}, - {15,"notAvailable"}, - {0,"startNotRqed"}, - {2,"starterActiveGearEngaged"}, - {1,"starterActiveGearNotEngaged"}, - {12,"starterInhibitedReasonUnknown"}, - {3,"strtFnshdStrtrNtActvAftrHvngBnA"}, - {6,"strtrInhbtdDTDrvlnEnggdOthrTrns"}, - {5,"strtrInhbtdDTEngNtReadyForStart"}, - {7,"strtrInhbtdDToActiveImmobilizer"}, - {4,"strtrInhbtdDToEngAlreadyRunning"}, - {8,"strtrInhbtdDueToStarterOvertemp"} - },// states - false,// writable - decoder_t::decode_state,// decoder - nullptr,// encoder - false,// received - std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared (signal_t{ - "Eng.Torque.Mode",// generic_name - 0,// bit_position - 4,// bit_size + "steering_wheel.voice",// generic_name + 45,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1069,33 +329,20 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {7,"ABS control"}, - {5,"ASR control"}, - {1,"Accelerator pedal/operator selec"}, - {10,"Braking system"}, - {2,"Cruise control"}, - {9,"High speed governor"}, - {0,"Low idle governor/no request (de"}, - {15,"Not available"}, - {3,"PTO governor"}, - {11,"Remote accelerator"}, - {4,"Road speed governor"}, - {8,"Torque limiting"}, - {6,"Transmission control"} },// states false,// writable - decoder_t::decode_state,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",// generic_name - 40,// bit_position - 8,// bit_size + "steering_wheel.volume.down",// generic_name + 35,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1106,24 +353,20 @@ application_t::application_t() { },// states false,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"j1939",61449,"VDC2",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared (signal_t{ - "Lateral.Acceleration",// generic_name - 40,// bit_position - 16,// bit_size - 0.000488281f,// factor - -15.6870f,// offset + "steering_wheel.volume.mute",// generic_name + 39,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1132,20 +375,20 @@ application_t::application_t() { },// states false,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "m/s/s"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Longitudinal.Acceleration",// generic_name - 56,// bit_position - 8,// bit_size - 0.100000f,// factor - -12.5000f,// offset + "steering_wheel.volume.up",// generic_name + 33,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1154,20 +397,24 @@ application_t::application_t() { },// states false,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "m/s/s"// unit - })}, + false,// is_big_endian + false,// is_signed + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared(message_definition_t{"ls",0x30,"",8,4,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared (signal_t{ - "Steer.Wheel.Angle",// generic_name - 0,// bit_position - 16,// bit_size - 0.000976562f,// factor - -31.3740f,// offset + "hvac.fan.speed",// generic_name + 32,// bit_position + 8,// bit_size + 23.5294f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1175,19 +422,19 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rad"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Steer.Wheel.Angle.Sensor.Type",// generic_name - 22,// bit_position - 2,// bit_size + "hvac.temperature.left",// generic_name + 0,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1196,26 +443,22 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {1,"AbsMeasuringPrinciple"}, - {3,"NotAvailable"}, - {0,"RelativeMeasuringPrinciple"}, - {2,"Reserved"} },// states - false,// writable - decoder_t::decode_state,// decoder + true,// writable + nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared (signal_t{ - "Steer.Wheel.Turn.Counter",// generic_name - 16,// bit_position - 6,// bit_size + "hvac.temperature.right",// generic_name + 8,// bit_position + 8,// bit_size 1.00000f,// factor - -32.0000f,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1223,21 +466,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "turns"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Yaw.Rate",// generic_name - 24,// bit_position - 16,// bit_size - 0.000122070f,// factor - -3.92000f,// offset + "hvac.temperature.average",// generic_name + 16,// bit_position + 8,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1245,24 +488,24 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rad/s"// unit + false,// is_big_endian + false,// is_signed + ""// unit })} } // end signals vector })} // end message_definition entry -, {std::make_shared(message_definition_t{"j1939",65215,"EBC2",8,18,frequency_clock_t(5.00000f),true, +, {std::make_shared(message_definition_t{"hs",0x3D9,"",8,2050,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared (signal_t{ - "Front.Axle.Speed",// generic_name - 0,// bit_position + "engine.speed",// generic_name + 16,// bit_position 16,// bit_size - 0.00390625f,// factor + 0.250000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1271,21 +514,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Relative.Speed.Front.Axle.Left.Wheel",// generic_name - 16,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + "fuel.level.low",// generic_name + 55,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1293,21 +536,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Relative.Speed.Rear.Axle1.Left.Wheel",// generic_name - 32,// bit_position + "fuel.level",// generic_name + 8,// bit_position 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + 0.392157f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1315,21 +558,25 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, + false,// is_big_endian + false,// is_signed + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared(message_definition_t{"hs",0x3E9,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared (signal_t{ - "Relative.Speed.Rear.Axle2.Left.Wheel",// generic_name - 48,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + "vehicle.average.speed",// generic_name + 0,// bit_position + 15,// bit_size + 0.0156250f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1342,16 +589,20 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, + false,// is_big_endian + false,// is_signed + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared(message_definition_t{"hs",0x4D1,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared (signal_t{ - "Rlative.Speed.Front.Axle.Right.Wheel",// generic_name - 24,// bit_position + "engine.oil.temp",// generic_name + 16,// bit_position 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1359,21 +610,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable + true,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Rlative.Speed.Rear.Axle1.Right.Wheel",// generic_name - 40,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + "engine.oil.temp.high",// generic_name + 7,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1381,21 +632,25 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, + false,// is_big_endian + false,// is_signed + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared(message_definition_t{"hs",0x620,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared (signal_t{ - "Rlative.Speed.Rear.Axle2.Right.Wheel",// generic_name - 56,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// offset + "doors.boot.open",// generic_name + 47,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1403,24 +658,20 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"j1939",65253,"HOURS",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector + false,// is_big_endian + false,// is_signed + ""// unit + })}, {std::make_shared (signal_t{ - "Eng.Total.Hours.Of.Operation",// generic_name - 0,// bit_position - 32,// bit_size - 0.0500000f,// factor + "doors.front_left.open",// generic_name + 43,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1429,20 +680,20 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "hr"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Total.Revolutions",// generic_name - 32,// bit_position - 32,// bit_size - 1000.00f,// factor + "doors.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1451,25 +702,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "r"// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared(message_definition_t{"j1939",65262,"ET1",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector + false,// is_big_endian + false,// is_signed + ""// unit + })}, {std::make_shared (signal_t{ - "Eng.Coolant.Temp",// generic_name - 0,// bit_position - 8,// bit_size - 0.0312500f,// factor - -273.000f,// offset + "doors.rear_left.open",// generic_name + 46,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1477,21 +724,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Fuel.Temp1",// generic_name - 8,// bit_position - 8,// bit_size + "doors.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size 1.00000f,// factor - -40.0000f,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1499,21 +746,25 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit - })}, + false,// is_big_endian + false,// is_signed + ""// unit + })} + } // end signals vector + })} // end message_definition entry +, {std::make_shared(message_definition_t{"hs",0x799,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared (signal_t{ - "Eng.Intercooler.Temp",// generic_name - 48,// bit_position - 8,// bit_size + "windows.front_left.open",// generic_name + 43,// bit_position + 1,// bit_size 1.00000f,// factor - -40.0000f,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1521,20 +772,20 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Intercooler.Thermostat.Opening",// generic_name - 56,// bit_position - 8,// bit_size - 0.400000f,// factor + "windows.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1543,21 +794,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Oil.Temp1",// generic_name - 16,// bit_position - 16,// bit_size - 0.0312500f,// factor - -273.000f,// offset + "windows.rear_left.open",// generic_name + 46,// bit_position + 1,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1565,21 +816,21 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Turbo.Oil.Temp",// generic_name - 32,// bit_position - 16,// bit_size - 0.0312500f,// factor - -273.000f,// offset + "windows.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size + 1.00000f,// factor + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -1587,18 +838,18 @@ application_t::application_t() false,// force_send_changed { },// states - false,// writable - nullptr,// decoder + true,// writable + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit + false,// is_big_endian + false,// is_signed + ""// unit })} } // end signals vector })} // end message_definition entry -#endif + }, // end message_definition vector { // beginning diagnostic_messages_ vector {std::make_shared(diagnostic_message_t{ @@ -1883,3 +1134,5 @@ const std::string application_t::get_diagnostic_bus() const { return "hs"; } + + -- cgit 1.2.3-korg