From ab1adbd3a5d69dced58ef2a37d5defea600452e9 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 27 Jul 2018 19:51:52 +0200 Subject: Updated examples files and default configuration Let use the new decoder's function and set some hvac signals as writable to be able to test this feature. Change-Id: I27e1c2be069b8bb55ed931ad1fb629aa2d4e5b86 Signed-off-by: Romain Forlot --- examples/agl-vcar/application-generated.cpp | 8 ++++---- examples/agl-vcar/signals.json | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 17 deletions(-) (limited to 'examples/agl-vcar') 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{0,"example", + {std::make_shared(can_message_set_t{0,"AGL Virtual Car", { // beginning can_message_definition_ vector {std::make_shared(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", -- cgit 1.2.3-korg