diff options
author | Arthur Guyader <arthur.guyader@iot.bzh> | 2019-07-02 17:46:16 +0200 |
---|---|---|
committer | Arthur Guyader <arthur.guyader@iot.bzh> | 2019-08-12 15:06:45 +0200 |
commit | 8c0a3d45ca37f710100afab065b07e82682dc1ef (patch) | |
tree | d2374f3dc618f07ad46d4639aa2c846c79c8ce93 /examples/agl-vcar | |
parent | 3977705505069b4210b29e8188cdd35813c65886 (diff) |
Update examples and can_samples
Update of examples for new features (is_fd,is_extended,is_j1939).
Bug-AGL: SPEC-2386
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Change-Id: I8c3afbafdde4f5818d73c0e71a3b7e47fb7d8fc6
Diffstat (limited to 'examples/agl-vcar')
-rw-r--r-- | examples/agl-vcar/application-generated.cpp | 50 | ||||
-rw-r--r-- | examples/agl-vcar/signals.json | 18 |
2 files changed, 43 insertions, 25 deletions
diff --git a/examples/agl-vcar/application-generated.cpp b/examples/agl-vcar/application-generated.cpp index 38d26cc1..35d847b7 100644 --- a/examples/agl-vcar/application-generated.cpp +++ b/examples/agl-vcar/application-generated.cpp @@ -7,14 +7,14 @@ 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,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"ls",0x30,"",0,false,message_format_t::EXTENDED,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 - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -36,7 +36,7 @@ application_t::application_t() 0,// bit_position 8,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -58,7 +58,7 @@ application_t::application_t() 8,// bit_position 8,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -80,7 +80,7 @@ application_t::application_t() 16,// bit_position 8,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -99,14 +99,14 @@ application_t::application_t() })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",0,true,message_format_t::STANDARD,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.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -128,7 +128,7 @@ application_t::application_t() 55,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -150,7 +150,7 @@ application_t::application_t() 8,// bit_position 8,// bit_size 0.392157f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -169,14 +169,14 @@ application_t::application_t() })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,"",0,false,message_format_t::STANDARD,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 - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -195,14 +195,14 @@ application_t::application_t() })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,"",0,false,message_format_t::STANDARD,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 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -224,7 +224,7 @@ application_t::application_t() 7,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -243,14 +243,14 @@ application_t::application_t() })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x620,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x620,"",0,false,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "doors.boot.open",// generic_name 47,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -272,7 +272,7 @@ application_t::application_t() 43,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -294,7 +294,7 @@ application_t::application_t() 44,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -316,7 +316,7 @@ application_t::application_t() 46,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -338,7 +338,7 @@ application_t::application_t() 45,// bit_position 4,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -357,14 +357,14 @@ application_t::application_t() })} } // end signals vector })} // end message_definition entry -, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, +, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x799,"",0,false,message_format_t::STANDARD,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 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -386,7 +386,7 @@ application_t::application_t() 44,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -408,7 +408,7 @@ application_t::application_t() 46,// bit_position 1,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -430,7 +430,7 @@ application_t::application_t() 45,// bit_position 4,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency diff --git a/examples/agl-vcar/signals.json b/examples/agl-vcar/signals.json index 8d64b52d..679ab68e 100644 --- a/examples/agl-vcar/signals.json +++ b/examples/agl-vcar/signals.json @@ -7,6 +7,9 @@ "messages": { "0x620": { "bus": "hs", + "is_fd" : false, + "is_extended": false, + "is_j1939" : false, "signals": { "doors.driver.open": { "generic_name": "doors.front_left.open", @@ -47,6 +50,9 @@ }, "0x799": { "bus": "hs", + "is_fd" : false, + "is_extended": false, + "is_j1939" : false, "signals": { "windows.driver.open": { "generic_name": "windows.front_left.open", @@ -80,6 +86,9 @@ }, "0x3D9": { "bus": "hs", + "is_fd" : true, + "is_extended": false, + "is_j1939" : false, "signals": { "PT_FuelLevelPct": { "generic_name": "fuel.level", @@ -107,6 +116,9 @@ }, "0x4D1": { "bus": "hs", + "is_fd" : false, + "is_extended": false, + "is_j1939" : false, "signals": { "PT_EngineOilTempHigh": { "generic_name": "engine.oil.temp.high", @@ -127,6 +139,9 @@ }, "0x3E9": { "bus": "hs", + "is_fd" : false, + "is_extended": false, + "is_j1939" : false, "signals": { "PT_VehicleAvgSpeed": { "generic_name": "vehicle.average.speed", @@ -139,6 +154,9 @@ }, "0x30": { "bus": "ls", + "is_fd" : false, + "is_extended": true, + "is_j1939" : false, "signals": { "LeftTemperature": { "generic_name": "hvac.temperature.left", |