Updated examples files and default configuration 23/15823/1
authorRomain Forlot <romain.forlot@iot.bzh>
Fri, 27 Jul 2018 17:51:52 +0000 (19:51 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Fri, 27 Jul 2018 18:10:42 +0000 (20:10 +0200)
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 <romain.forlot@iot.bzh>
examples/agl-vcar/application-generated.cpp
examples/agl-vcar/signals.json
examples/engine/application-generated.cpp
examples/engine/signals.json
examples/toyota/auris/application-generated.cpp
examples/toyota/auris/signals.json
low-can-binding/binding/application-generated.cpp

index 9ec8fb3..9eb89df 100644 (file)
@@ -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
index 9fa9b30..8d64b52 100644 (file)
                                        "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": {
                                        "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": {
                        "bit_size": 1,
                        "factor": 1,
                        "offset": 0,
-                       "decoder": "decoder_t::booleanDecoder"
+                       "decoder": "decoder_t::decode_boolean"
                }
        }
        },
                        "bit_size": 1,
                        "factor": 1,
                        "offset": 0,
-                       "decoder": "decoder_t::booleanDecoder"
+                       "decoder": "decoder_t::decode_boolean"
                },
                "PT_EngineOilTemp": {
                        "generic_name": "engine.oil.temp",
                        "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",
index cc123b7..6c39595 100644 (file)
@@ -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
                                                })}
index 5aaf656..83ed38e 100644 (file)
@@ -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",
index 3421969..9bf7c95 100644 (file)
@@ -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
                                                })}
index cd08918..c6345ef 100644 (file)
                     "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": {
                     "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": {
           "bit_size": 1,
           "factor": 1,
           "offset": 0,
-          "decoder": "decoder_t::booleanDecoder"
+          "decoder": "decoder_t::decode_boolean"
         }
       }
     },
           "bit_size": 1,
           "factor": 1,
           "offset": 0,
-          "decoder": "decoder_t::booleanDecoder"
+          "decoder": "decoder_t::decode_boolean"
         },
         "PT_EngineOilTemp": {
           "generic_name": "engine.oil.temp",
index 8253c62..9eb89df 100644 (file)
@@ -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,