X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fbinding%2Fapplication-generated.cpp;h=5ad5951a23ca68015c8401a380c73301b38e1789;hb=8b2bd1e97b47d7bc79e40196c988df146622581f;hp=47fdafa53859f96d69483c45dd7be8ad4b68b723;hpb=7f038fed824cac9b747c033b441263512421c6b2;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp index 47fdafa5..5ad5951a 100644 --- a/low-can-binding/binding/application-generated.cpp +++ b/low-can-binding/binding/application-generated.cpp @@ -5,15 +5,15 @@ application_t::application_t() : can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}} , message_set_{ - {std::make_shared(message_set_t{0,"AGL Virtual Car", + {std::make_shared(message_set_t{0,"example", { // 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 + "steering_wheel.cruise.cancel",// generic_name + 52,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -22,19 +22,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{ - "hvac.temperature.left",// generic_name - 0,// bit_position - 8,// bit_size + "steering_wheel.cruise.distance",// generic_name + 55,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -44,19 +44,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{ - "hvac.temperature.right",// generic_name - 8,// 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 @@ -66,19 +66,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{ - "hvac.temperature.average",// generic_name - 16,// bit_position - 8,// bit_size + "steering_wheel.cruise.limit",// generic_name + 54,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -88,44 +88,18 @@ 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 - 55,// bit_position + "steering_wheel.cruise.resume",// generic_name + 49,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -136,46 +110,26 @@ 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 + decoder_t::decode_boolean,// decoder + 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{ - "vehicle.average.speed",// generic_name - 0,// bit_position - 15,// bit_size - 0.0156250f,// factor + "steering_wheel.horn",// generic_name + 56,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -185,22 +139,18 @@ 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{"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.info",// generic_name + 38,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -210,18 +160,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.lane_departure_warning",// generic_name + 63,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -232,22 +182,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.mode",// generic_name + 34,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -258,18 +204,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.next",// generic_name + 36,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -280,18 +226,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.phone.call",// generic_name + 47,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -302,17 +248,17 @@ 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 + "steering_wheel.phone.hangup",// generic_name 46,// bit_position 1,// bit_size 1.00000f,// factor @@ -324,19 +270,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.previous",// generic_name + 32,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -346,22 +292,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.voice",// generic_name + 45,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -372,18 +314,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.volume.down",// generic_name + 35,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -394,18 +336,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.volume.mute",// generic_name + 39,// bit_position 1,// bit_size 1.00000f,// factor 0.00000f,// offset @@ -416,19 +358,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.volume.up",// generic_name + 33,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -438,25 +380,24 @@ 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 -#ifdef USE_FEATURE_J1939 -, {std::make_shared(message_definition_t{"j1939",61442,"ETC1",8,18,frequency_clock_t(5.00000f),true, +, {std::make_shared(message_definition_t{"ls",0x30,"",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared (signal_t{ - "Eng.Momentary.Overspeed.Enable",// generic_name + "hvac.fan.speed",// generic_name 32,// bit_position - 2,// bit_size - 1.00000f,// factor + 8,// bit_size + 23.5294f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -464,24 +405,20 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {0,"MomentaryEngOverspeedIsDisabled"}, - {1,"MomentaryEngOverspeedIsEnabled"}, - {2,"Reserved"}, - {3,"TakeNoAction"} },// states true,// writable - decoder_t::decode_state,// decoder + 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{ - "Momentary.Eng.Max.Power.Enable",// generic_name - 36,// 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 @@ -490,25 +427,21 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {2,"fault"}, - {1,"mmntarilyRqingMaxPowerAvailable"}, - {3,"notAvailable"}, - {0,"notRqingMaxPowerAvailable"} },// states true,// writable - decoder_t::decode_state,// decoder + 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{ - "Percent.Clutch.Slip",// generic_name - 24,// bit_position + "hvac.temperature.right",// generic_name + 8,// bit_position 8,// bit_size - 0.400000f,// factor + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -522,14 +455,14 @@ application_t::application_t() 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{ - "Progressive.Shift.Disable",// generic_name - 34,// bit_position - 2,// bit_size + "hvac.temperature.average",// generic_name + 16,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -538,25 +471,25 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {1,"ProgressiveShiftIsDisabled"}, - {0,"ProgressiveShiftIsNotDisabled"}, - {2,"Reserved"}, - {3,"TakeNoAction"} },// states true,// writable - decoder_t::decode_state,// decoder + 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 - })}, + })} + } // 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{ - "Src.Addrss.Of.Ctrllng.Dvc.Fr.Trns.Cntrl",// generic_name - 56,// bit_position - 8,// bit_size - 1.00000f,// factor + "engine.speed",// generic_name + 16,// bit_position + 16,// bit_size + 0.250000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -570,14 +503,14 @@ application_t::application_t() 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{ - "Trans.Driveline.Engaged",// generic_name - 0,// bit_position - 2,// bit_size + "fuel.level.low",// generic_name + 55,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -586,25 +519,21 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {0,"DrivelineDisengaged"}, - {1,"DrivelineEngaged"}, - {2,"Error"}, - {3,"NotAvailable"} },// states true,// 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{ - "Trans.Input.Shaft.Speed",// generic_name - 40,// bit_position - 16,// bit_size - 0.125000f,// factor + "fuel.level",// generic_name + 8,// bit_position + 8,// bit_size + 0.392157f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -618,15 +547,19 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// 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{ - "Trans.Output.Shaft.Speed",// generic_name - 8,// bit_position - 16,// bit_size - 0.125000f,// factor + "vehicle.average.speed",// generic_name + 0,// bit_position + 15,// bit_size + 0.0156250f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -635,19 +568,23 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// 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{ - "Trans.Shift.In.Process",// generic_name - 4,// bit_position - 2,// bit_size + "engine.oil.temp",// generic_name + 16,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -656,24 +593,20 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {2,"Error"}, - {3,"NotAvailable"}, - {1,"ShiftInProcess"}, - {0,"ShiftIsNotInProcess"} },// states true,// writable - decoder_t::decode_state,// decoder + 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{ - "Trns.Trq.Cnvrtr.Lckp.Trnstn.In.Prcess",// generic_name - 6,// bit_position - 2,// bit_size + "engine.oil.temp.high",// generic_name + 7,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -682,24 +615,24 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {2,"Error"}, - {3,"NotAvailable"}, - {1,"TransitionIsInProcess"}, - {0,"TransitionIsNotInProcess"} },// states true,// 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 - })}, + })} + } // 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{ - "Trns.Trque.Converter.Lockup.Engaged",// generic_name - 2,// bit_position - 2,// bit_size + "doors.boot.open",// generic_name + 47,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -708,121 +641,21 @@ application_t::application_t() true,// send_same false,// force_send_changed { - {2,"Error"}, - {3,"NotAvailable"}, - {0,"TorqueConverterLockupDisengaged"}, - {1,"TorqueConverterLockupEngaged"} },// states true,// 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 - })} - } // 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 + "doors.front_left.open",// generic_name + 43,// bit_position + 1,// 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 @@ -831,19 +664,19 @@ 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 - "rpm"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared (signal_t{ - "Eng.Starter.Mode",// generic_name - 48,// bit_position - 4,// bit_size + "doors.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -852,33 +685,20 @@ application_t::application_t() 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 + true,// 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{ - "Eng.Torque.Mode",// generic_name - 0,// bit_position - 4,// bit_size + "doors.rear_left.open",// generic_name + 46,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -887,33 +707,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 + true,// 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{ - "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",// generic_name - 40,// bit_position - 8,// bit_size + "doors.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -923,89 +730,23 @@ 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 + 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, +, {std::make_shared(message_definition_t{"hs",0x799,"",8,2,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 - 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 - "m/s/s"// unit - })}, - {std::make_shared (signal_t{ - "Longitudinal.Acceleration",// generic_name - 56,// bit_position - 8,// bit_size - 0.100000f,// factor - -12.5000f,// 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 - "m/s/s"// unit - })}, - {std::make_shared (signal_t{ - "Steer.Wheel.Angle",// generic_name - 0,// bit_position - 16,// bit_size - 0.000976562f,// factor - -31.3740f,// 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 - "rad"// unit - })}, - {std::make_shared (signal_t{ - "Steer.Wheel.Angle.Sensor.Type",// generic_name - 22,// bit_position - 2,// bit_size + "windows.front_left.open",// generic_name + 43,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1014,73 +755,21 @@ 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 + 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{ - "Steer.Wheel.Turn.Counter",// generic_name - 16,// bit_position - 6,// bit_size + "windows.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size 1.00000f,// factor - -32.0000f,// 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 - "turns"// unit - })}, - {std::make_shared (signal_t{ - "Yaw.Rate",// generic_name - 24,// bit_position - 16,// bit_size - 0.000122070f,// factor - -3.92000f,// 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 - "rad/s"// 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, - { // beginning signals vector - {std::make_shared (signal_t{ - "Front.Axle.Speed",// generic_name - 0,// bit_position - 16,// bit_size - 0.00390625f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1089,227 +778,21 @@ application_t::application_t() 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 - "km/h"// 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 - 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 - "km/h"// unit - })}, - {std::make_shared (signal_t{ - "Relative.Speed.Rear.Axle1.Left.Wheel",// generic_name - 32,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// 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 - "km/h"// unit - })}, - {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 - 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 - "km/h"// unit - })}, - {std::make_shared (signal_t{ - "Rlative.Speed.Front.Axle.Right.Wheel",// generic_name - 24,// bit_position - 8,// bit_size - 0.0625000f,// factor - -7.81250f,// 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 - "km/h"// 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 - 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 - "km/h"// unit - })}, - {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 - 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 - "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 - {std::make_shared (signal_t{ - "Eng.Total.Hours.Of.Operation",// generic_name - 0,// bit_position - 32,// bit_size - 0.0500000f,// 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 - "hr"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Total.Revolutions",// generic_name - 32,// bit_position - 32,// bit_size - 1000.00f,// 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 - "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 - {std::make_shared (signal_t{ - "Eng.Coolant.Temp",// generic_name - 0,// bit_position - 8,// bit_size - 0.0312500f,// factor - -273.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 + 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 + "windows.rear_left.open",// generic_name + 46,// 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 @@ -1317,42 +800,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.Temp",// generic_name - 48,// bit_position - 8,// bit_size + "windows.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size 1.00000f,// factor - -40.0000f,// 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 - "deg C"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Intercooler.Thermostat.Opening",// generic_name - 56,// bit_position - 8,// bit_size - 0.400000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -1361,316 +822,20 @@ application_t::application_t() 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.Oil.Temp1",// generic_name - 16,// bit_position - 16,// bit_size - 0.0312500f,// factor - -273.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 - "deg C"// unit - })}, - {std::make_shared (signal_t{ - "Eng.Turbo.Oil.Temp",// generic_name - 32,// bit_position - 16,// bit_size - 0.0312500f,// factor - -273.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 + 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{ - 4, - "engine.load", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 5, - "engine.coolant.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 10, - "fuel.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 11, - "intake.manifold.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 12, - "engine.speed", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 13, - "vehicle.speed", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 15, - "intake.air.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 16, - "mass.airflow", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 17, - "throttle.position", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 31, - "running.time", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 45, - "EGR.error", - 0, - 0, - UNIT::INVALID, - 0.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 47, - "fuel.level", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 51, - "barometric.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 70, - "ambient.air.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 76, - "commanded.throttle.position", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 82, - "ethanol.fuel.percentage", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 90, - "accelerator.pedal.position", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 91, - "hybrid.battery-pack.remaining.life", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 92, - "engine.oil.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 94, - "engine.fuel.rate", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} -, {std::make_shared(diagnostic_message_t{ - 99, - "engine.torque", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true, - false - })} } // end diagnostic_messages_ vector })} // end message_set entry @@ -1699,5 +864,7 @@ application_t::application_t() const std::string application_t::get_diagnostic_bus() const { - return "hs"; + return diagnostic_manager_.get_bus_device_name();; } + +