summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/agl-vcar/application-generated.cpp8
-rw-r--r--examples/agl-vcar/signals.json29
-rw-r--r--examples/engine/application-generated.cpp4
-rw-r--r--examples/engine/signals.json4
-rw-r--r--examples/toyota/auris/application-generated.cpp22
-rw-r--r--examples/toyota/auris/signals.json22
-rw-r--r--low-can-binding/binding/application-generated.cpp12
7 files changed, 52 insertions, 49 deletions
diff --git a/examples/agl-vcar/application-generated.cpp b/examples/agl-vcar/application-generated.cpp
index 9ec8fb33..9eb89dfa 100644
--- a/examples/agl-vcar/application-generated.cpp
+++ b/examples/agl-vcar/application-generated.cpp
@@ -4,7 +4,7 @@
application_t::application_t()
: can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}
, can_message_set_{
- {std::make_shared<can_message_set_t>(can_message_set_t{0,"example",
+ {std::make_shared<can_message_set_t>(can_message_set_t{0,"AGL Virtual Car",
{ // beginning can_message_definition_ vector
{std::make_shared<can_message_definition_t>(can_message_definition_t{"ls",0x30,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
{ // beginning can_signals vector
@@ -39,7 +39,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
@@ -57,7 +57,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
@@ -75,7 +75,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
diff --git a/examples/agl-vcar/signals.json b/examples/agl-vcar/signals.json
index 9fa9b30b..8d64b52d 100644
--- a/examples/agl-vcar/signals.json
+++ b/examples/agl-vcar/signals.json
@@ -21,28 +21,28 @@
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.rearleft.open": {
"generic_name": "doors.rear_left.open",
"bit_position": 46,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.rearright.open": {
"generic_name": "doors.rear_right.open",
"bit_position": 45,
"bit_size": 4,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.coffer.open": {
"generic_name": "doors.boot.open",
"bit_position": 47,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"}
+ "decoder": "decoder_t::decode_boolean"}
}
},
"0x799": {
@@ -54,28 +54,28 @@
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.passenger.open": {
"generic_name": "windows.front_right.open",
"bit_position": 44,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.rearleft.open": {
"generic_name": "windows.rear_left.open",
"bit_position": 46,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.rearright.open": {
"generic_name": "windows.rear_right.open",
"bit_position": 45,
"bit_size": 4,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"}
+ "decoder": "decoder_t::decode_boolean"}
}
},
"0x3D9": {
@@ -101,7 +101,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
}
}
},
@@ -114,7 +114,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
},
"PT_EngineOilTemp": {
"generic_name": "engine.oil.temp",
@@ -145,21 +145,24 @@
"bit_position": 0,
"bit_size": 8,
"factor": 1,
- "offset": 0
+ "offset": 0,
+ "writable": true
},
"RightTemperature": {
"generic_name": "hvac.temperature.right",
"bit_position": 8,
"bit_size": 8,
"factor": 1,
- "offset": 0
+ "offset": 0,
+ "writable": true
},
"Temperature": {
"generic_name": "hvac.temperature.average",
"bit_position": 16,
"bit_size": 8,
"factor": 1,
- "offset": 0
+ "offset": 0,
+ "writable": true
},
"FanSpeed": {
"generic_name": "hvac.fan.speed",
diff --git a/examples/engine/application-generated.cpp b/examples/engine/application-generated.cpp
index cc123b7d..6c395957 100644
--- a/examples/engine/application-generated.cpp
+++ b/examples/engine/application-generated.cpp
@@ -40,7 +40,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -120,7 +120,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})}
diff --git a/examples/engine/signals.json b/examples/engine/signals.json
index 5aaf6564..83ed38e2 100644
--- a/examples/engine/signals.json
+++ b/examples/engine/signals.json
@@ -28,7 +28,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
}
}
},
@@ -41,7 +41,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
},
"PT_EngineOilTemp": {
"generic_name": "engine.oil.temp",
diff --git a/examples/toyota/auris/application-generated.cpp b/examples/toyota/auris/application-generated.cpp
index 3421969d..9bf7c955 100644
--- a/examples/toyota/auris/application-generated.cpp
+++ b/examples/toyota/auris/application-generated.cpp
@@ -40,7 +40,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -120,7 +120,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})}
@@ -142,7 +142,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -160,7 +160,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -178,7 +178,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -196,7 +196,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -214,7 +214,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})}
@@ -236,7 +236,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -254,7 +254,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -272,7 +272,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})},
@@ -290,7 +290,7 @@ application_t::application_t()
{
},
false,
- decoder_t::booleanDecoder,
+ decoder_t::decode_boolean,
nullptr,
false
})}
diff --git a/examples/toyota/auris/signals.json b/examples/toyota/auris/signals.json
index cd089188..c6345ef4 100644
--- a/examples/toyota/auris/signals.json
+++ b/examples/toyota/auris/signals.json
@@ -14,35 +14,35 @@
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.passenger.open": {
"generic_name": "doors.front_right.open",
"bit_position": 44,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.rearleft.open": {
"generic_name": "doors.rear_left.open",
"bit_position": 46,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.rearright.open": {
"generic_name": "doors.rear_right.open",
"bit_position": 45,
"bit_size": 4,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"doors.coffer.open": {
"generic_name": "doors.boot.open",
"bit_position": 47,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"}
+ "decoder": "decoder_t::decode_boolean"}
}
},
"0x799": {
@@ -54,28 +54,28 @@
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.passenger.open": {
"generic_name": "windows.front_right.open",
"bit_position": 44,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.rearleft.open": {
"generic_name": "windows.rear_left.open",
"bit_position": 46,
"bit_size": 1,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"},
+ "decoder": "decoder_t::decode_boolean"},
"windows.rearright.open": {
"generic_name": "windows.rear_right.open",
"bit_position": 45,
"bit_size": 4,
"factor": 1.0,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"}
+ "decoder": "decoder_t::decode_boolean"}
}
},
"0x3D9": {
@@ -101,7 +101,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
}
}
},
@@ -114,7 +114,7 @@
"bit_size": 1,
"factor": 1,
"offset": 0,
- "decoder": "decoder_t::booleanDecoder"
+ "decoder": "decoder_t::decode_boolean"
},
"PT_EngineOilTemp": {
"generic_name": "engine.oil.temp",
diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp
index 8253c62e..9eb89dfa 100644
--- a/low-can-binding/binding/application-generated.cpp
+++ b/low-can-binding/binding/application-generated.cpp
@@ -4,7 +4,7 @@
application_t::application_t()
: can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}
, can_message_set_{
- {std::make_shared<can_message_set_t>(can_message_set_t{0,"example",
+ {std::make_shared<can_message_set_t>(can_message_set_t{0,"AGL Virtual Car",
{ // beginning can_message_definition_ vector
{std::make_shared<can_message_definition_t>(can_message_definition_t{"ls",0x30,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
{ // beginning can_signals vector
@@ -39,7 +39,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
@@ -57,7 +57,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
@@ -75,7 +75,7 @@ application_t::application_t()
false,
{
},
- false,
+ true,
nullptr,
nullptr,
false
@@ -429,7 +429,7 @@ application_t::application_t()
0,
0,
UNIT::INVALID,
- 6.00000f,
+ 5.00000f,
decoder_t::decode_obd2_response,
nullptr,
true,
@@ -441,7 +441,7 @@ application_t::application_t()
0,
0,
UNIT::INVALID,
- 6.00000f,
+ 5.00000f,
decoder_t::decode_obd2_response,
nullptr,
true,