diff options
| -rw-r--r-- | examples/agl-vcar/application-generated.cpp | 478 | ||||
| -rw-r--r-- | examples/agl-vcar/signals.json | 171 | ||||
| -rw-r--r-- | low-can-binding/binding/application-generated.cpp | 1243 |
3 files changed, 856 insertions, 1036 deletions
diff --git a/examples/agl-vcar/application-generated.cpp b/examples/agl-vcar/application-generated.cpp index bfe3d861..f4d2635d 100644 --- a/examples/agl-vcar/application-generated.cpp +++ b/examples/agl-vcar/application-generated.cpp @@ -7,7 +7,407 @@ application_t::application_t() , message_set_{ {std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car", { // beginning message_definition_ vector - {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,4,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",0,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.cancel",// generic_name + 52,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.distance",// 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 + true,// send_same + false,// force_send_changed + { + },// states + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.enable",// generic_name + 48,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.limit",// generic_name + 54,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.resume",// generic_name + 49,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.cruise.set",// generic_name + 51,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.horn",// generic_name + 56,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.info",// generic_name + 38,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.lane_departure_warning",// generic_name + 63,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.mode",// generic_name + 34,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.next",// generic_name + 36,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.phone.call",// 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 + true,// send_same + false,// force_send_changed + { + },// states + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.phone.hangup",// 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 + true,// send_same + false,// force_send_changed + { + },// states + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.previous",// generic_name + 32,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.voice",// generic_name + 45,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "steering_wheel.volume.down",// generic_name + 35,// bit_position + 1,// 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 + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "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 + true,// send_same + false,// force_send_changed + { + },// states + false,// writable + decoder_t::decode_boolean,// decoder + nullptr,// encoder + false,// received + std::make_pair<bool, int>(false, 0),// multiplex + false,// is_big_endian + false,// is_signed + ""// unit + })}, + {std::make_shared<signal_t> (signal_t{ + "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 + true,// send_same + false,// force_send_changed + { + },// states + false,// writable + decoder_t::decode_boolean,// decoder + 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",0x30,"",8,4,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "hvac.fan.speed",// generic_name @@ -27,8 +427,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -49,8 +449,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -71,8 +471,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -93,8 +493,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector @@ -119,8 +519,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -141,8 +541,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -163,8 +563,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector @@ -189,8 +589,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector @@ -215,8 +615,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -237,8 +637,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector @@ -263,8 +663,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -285,8 +685,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -307,8 +707,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -329,8 +729,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -351,8 +751,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector @@ -377,8 +777,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -399,8 +799,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -421,8 +821,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ @@ -443,8 +843,8 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })} } // end signals vector diff --git a/examples/agl-vcar/signals.json b/examples/agl-vcar/signals.json index 9fecd922..51bf1607 100644 --- a/examples/agl-vcar/signals.json +++ b/examples/agl-vcar/signals.json @@ -53,8 +53,8 @@ "offset": 0, "writable": true, "decoder": "decoder_t::decode_boolean"} - } - }, + } + }, "0x799": { "bus": "hs", "is_fd" : false, @@ -213,6 +213,173 @@ "writable": true } } + }, + "0x21": { + "bus": "ls", + "signals": { + "SW_Previous": { + "generic_name": "steering_wheel.previous", + "bit_position": 32, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_VolumeUp": { + "generic_name": "steering_wheel.volume.up", + "bit_position": 33, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_Mode": { + "generic_name": "steering_wheel.mode", + "bit_position": 34, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_VolumeDown": { + "generic_name": "steering_wheel.volume.down", + "bit_position": 35, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_Next": { + "generic_name": "steering_wheel.next", + "bit_position": 36, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_Info": { + "generic_name": "steering_wheel.info", + "bit_position": 38, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_VolumeMute": { + "generic_name": "steering_wheel.volume.mute", + "bit_position": 39, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_Voice": { + "generic_name": "steering_wheel.voice", + "bit_position": 45, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_PhoneHangup": { + "generic_name": "steering_wheel.phone.hangup", + "bit_position": 46, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_PhoneCall": { + "generic_name": "steering_wheel.phone.call", + "bit_position": 47, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseEnable": { + "generic_name": "steering_wheel.cruise.enable", + "bit_position": 48, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseResume": { + "generic_name": "steering_wheel.cruise.resume", + "bit_position": 49, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseSet": { + "generic_name": "steering_wheel.cruise.set", + "bit_position": 51, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseCancel": { + "generic_name": "steering_wheel.cruise.cancel", + "bit_position": 52, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseLimit": { + "generic_name": "steering_wheel.cruise.limit", + "bit_position": 54, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_CruiseDistance": { + "generic_name": "steering_wheel.cruise.distance", + "bit_position": 55, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_Horn": { + "generic_name": "steering_wheel.horn", + "bit_position": 56, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + }, + "SW_LaneDepartureWarning": { + "generic_name": "steering_wheel.lane_departure_warning", + "bit_position": 63, + "bit_size": 1, + "factor": 1, + "offset": 0, + "decoder": "decoder_t::decode_boolean", + "writable": false + } + } } }, "diagnostic_messages": [ 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,13 +7,13 @@ application_t::application_t() , message_set_{ {std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car", { // beginning message_definition_ vector - {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,4,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",0,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })} - } // end signals vector - })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",8,2050,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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,20 +110,20 @@ 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "fuel.level",// generic_name - 8,// bit_position - 8,// bit_size - 0.392157f,// factor + "steering_wheel.cruise.set",// generic_name + 51,// bit_position + 1,// bit_size + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -158,24 +132,20 @@ 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<bool, int>(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>(message_definition_t{"hs",0x3E9,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared<signal_t> (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 +155,18 @@ application_t::application_t() { },// states false,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(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>(message_definition_t{"hs",0x4D1,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared<signal_t> (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 +176,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +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<bool, int>(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>(message_definition_t{"hs",0x620,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared<signal_t> (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 +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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +264,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +308,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<bool, int>(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>(message_definition_t{"hs",0x799,"",8,2,frequency_clock_t(5.00000f),true, - { // beginning signals vector + })}, {std::make_shared<signal_t> (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 +330,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +352,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +374,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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 +396,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<bool, int>(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_ISOTP -, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x111,"",16,66,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",8,4,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 + "hvac.fan.speed",// generic_name + 32,// bit_position + 8,// bit_size + 23.5294f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -470,14 +427,14 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "sig1.2",// generic_name - 16,// bit_position - 16,// bit_size + "hvac.temperature.left",// generic_name + 0,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -492,14 +449,14 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "sig2.1",// generic_name - 32,// bit_position - 16,// bit_size + "hvac.temperature.right",// generic_name + 8,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -514,14 +471,14 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "sig2.2",// generic_name - 48,// bit_position - 16,// bit_size + "hvac.temperature.average",// generic_name + 16,// bit_position + 8,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -536,15 +493,19 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(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>(message_definition_t{"hs",0x3D9,"",8,2050,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "sig3.1",// generic_name - 64,// bit_position + "engine.speed",// generic_name + 16,// bit_position 16,// bit_size - 1.00000f,// factor + 0.250000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -558,14 +519,14 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "sig3.2",// generic_name - 80,// bit_position - 16,// bit_size + "fuel.level.low",// generic_name + 55,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -576,19 +537,19 @@ application_t::application_t() { },// states true,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "sig4.1",// generic_name - 96,// bit_position - 16,// bit_size - 1.00000f,// factor + "fuel.level",// generic_name + 8,// bit_position + 8,// bit_size + 0.392157f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -602,15 +563,19 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(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>(message_definition_t{"hs",0x3E9,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "sig4.2",// generic_name - 112,// bit_position - 16,// bit_size - 1.00000f,// factor + "vehicle.average.speed",// generic_name + 0,// bit_position + 15,// bit_size + 0.0156250f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -619,78 +584,24 @@ application_t::application_t() false,// force_send_changed { },// states - true,// writable + false,// writable nullptr,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(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 -#endif -#ifdef USE_FEATURE_J1939 -, {std::make_shared<message_definition_t>(message_definition_t{"j1939",61442,"ETC1",8,18,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,"",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Percent.Clutch.Slip",// generic_name - 24,// bit_position + "engine.oil.temp",// generic_name + 16,// bit_position 8,// bit_size - 0.400000f,// factor + 1.00000f,// factor 0.00000f,// offset 0,// min_value 0,// max_value @@ -704,14 +615,14 @@ application_t::application_t() nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit + false,// is_big_endian + false,// is_signed + ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Progressive.Shift.Disable",// generic_name - 34,// 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 @@ -720,24 +631,24 @@ 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 + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(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>(message_definition_t{"hs",0x620,"",8,2,frequency_clock_t(5.00000f),true, + { // beginning signals vector {std::make_shared<signal_t> (signal_t{ - "Src.Addrss.Of.Ctrllng.Dvc.Fr.Trns.Cntrl",// generic_name - 56,// bit_position - 8,// bit_size + "doors.boot.open",// generic_name + 47,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -748,18 +659,18 @@ application_t::application_t() { },// states true,// writable - nullptr,// decoder + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Trans.Driveline.Engaged",// generic_name - 0,// bit_position - 2,// bit_size + "doors.front_left.open",// generic_name + 43,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -768,68 +679,20 @@ 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Trans.Shift.In.Process",// generic_name - 4,// bit_position - 2,// bit_size + "doors.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -838,24 +701,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 + decoder_t::decode_boolean,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Trns.Trq.Cnvrtr.Lckp.Trnstn.In.Prcess",// generic_name - 6,// bit_position - 2,// bit_size + "doors.rear_left.open",// generic_name + 46,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -864,24 +723,20 @@ 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Trns.Trque.Converter.Lockup.Engaged",// generic_name - 2,// bit_position - 2,// bit_size + "doors.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -890,142 +745,24 @@ 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<bool, int>(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>(message_definition_t{"j1939",61444,"EEC1",8,18,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,"",8,2,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rpm"// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Eng.Starter.Mode",// generic_name - 48,// bit_position - 4,// bit_size + "windows.front_left.open",// generic_name + 43,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1034,33 +771,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Eng.Torque.Mode",// generic_name - 0,// bit_position - 4,// bit_size + "windows.front_right.open",// generic_name + 44,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1069,33 +793,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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit })}, {std::make_shared<signal_t> (signal_t{ - "Src.AddrssOf.Ctrllng.Dvc.Fr.Eng.Cntrl",// generic_name - 40,// bit_position - 8,// bit_size + "windows.rear_left.open",// generic_name + 46,// bit_position + 1,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1105,89 +816,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<bool, int>(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>(message_definition_t{"j1939",61449,"VDC2",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "m/s/s"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "m/s/s"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "rad"// unit })}, {std::make_shared<signal_t> (signal_t{ - "Steer.Wheel.Angle.Sensor.Type",// generic_name - 22,// bit_position - 2,// bit_size + "windows.rear_right.open",// generic_name + 45,// bit_position + 4,// bit_size 1.00000f,// factor 0.00000f,// offset 0,// min_value @@ -1196,409 +837,19 @@ 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed + false,// is_big_endian + false,// is_signed ""// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Steer.Wheel.Turn.Counter",// generic_name - 16,// bit_position - 6,// 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "turns"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(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>(message_definition_t{"j1939",65215,"EBC2",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (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 - 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "km/h"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(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>(message_definition_t{"j1939",65253,"HOURS",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "hr"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(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>(message_definition_t{"j1939",65262,"ET1",8,18,frequency_clock_t(5.00000f),true, - { // beginning signals vector - {std::make_shared<signal_t> (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 - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Eng.Fuel.Temp1",// generic_name - 8,// bit_position - 8,// 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit - })}, - {std::make_shared<signal_t> (signal_t{ - "Eng.Intercooler.Temp",// generic_name - 48,// bit_position - 8,// 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit - })}, - {std::make_shared<signal_t> (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 - 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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "%"// unit - })}, - {std::make_shared<signal_t> (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<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit - })}, - {std::make_shared<signal_t> (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 - nullptr,// encoder - false,// received - std::make_pair<bool, int>(false, 0),// multiplex - 0,// is_big_endian - 0,// is_signed - "deg C"// unit })} } // end signals vector })} // end message_definition entry -#endif + }, // end message_definition vector { // beginning diagnostic_messages_ vector {std::make_shared<diagnostic_message_t>(diagnostic_message_t{ @@ -1883,3 +1134,5 @@ const std::string application_t::get_diagnostic_bus() const { return "hs"; } + + |