aboutsummaryrefslogtreecommitdiffstats
path: root/examples/engine
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-11-26 16:18:26 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2019-11-28 16:11:46 +0100
commit006598ee46a227f52bcac7be172cd45a8a364aff (patch)
tree34c0a189dd55598e1d48456f21efdcc416584fc7 /examples/engine
parent0542ed0b415302cc03907a97080b0cd007196147 (diff)
Update examples and can_samples
Update of examples for new features (is_fd,is_extended,is_j1939). Bug-AGL: SPEC-2386 Bug-AGL: SPEC-2976 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Change-Id: I8c3afbafdde4f5818d73c0e71a3b7e47fb7d8fc6 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'examples/engine')
-rw-r--r--examples/engine/application-generated.cpp18
-rw-r--r--examples/engine/signals.json9
2 files changed, 18 insertions, 9 deletions
diff --git a/examples/engine/application-generated.cpp b/examples/engine/application-generated.cpp
index 3b9ecfde..bc66b5ec 100644
--- a/examples/engine/application-generated.cpp
+++ b/examples/engine/application-generated.cpp
@@ -7,14 +7,14 @@ application_t::application_t()
, message_set_{
{std::make_shared<message_set_t>(message_set_t{0,"example",
{ // beginning message_definition_ vector
- {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,0,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+ {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3D9,"",0,false,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
@@ -36,7 +36,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
@@ -58,7 +58,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
@@ -77,14 +77,14 @@ application_t::application_t()
})}
} // end signals vector
})} // end message_definition entry
-, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x3E9,0,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
@@ -103,14 +103,14 @@ application_t::application_t()
})}
} // end signals vector
})} // end message_definition entry
-, {std::make_shared<message_definition_t>(message_definition_t{"hs",0x4D1,0,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
@@ -132,7 +132,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
diff --git a/examples/engine/signals.json b/examples/engine/signals.json
index 83ed38e2..a64fa138 100644
--- a/examples/engine/signals.json
+++ b/examples/engine/signals.json
@@ -7,6 +7,9 @@
"messages": {
"0x3D9": {
"bus": "hs",
+ "is_fd" : false,
+ "is_extended": false,
+ "is_j1939" : false,
"signals": {
"PT_FuelLevelPct": {
"generic_name": "fuel.level",
@@ -34,6 +37,9 @@
},
"0x4D1": {
"bus": "hs",
+ "is_fd" : false,
+ "is_extended": false,
+ "is_j1939" : false,
"signals": {
"PT_EngineOilTempHigh": {
"generic_name": "engine.oil.temp.high",
@@ -54,6 +60,9 @@
},
"0x3E9": {
"bus": "hs",
+ "is_fd" : false,
+ "is_extended": false,
+ "is_j1939" : false,
"signals": {
"PT_VehicleAvgSpeed": {
"generic_name": "vehicle.average.speed",