From f6dcb18fa4d6637b0e9a2ff7eb39f2fe98e815d6 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Sat, 18 Mar 2017 16:52:34 +0000
Subject: Improve Toyota examples.

Generate a new version of the configuration generated for Toyota Auris 2010.
Remove the one from src directory. It has to be paste prior to build the binding
once generated.

Change-Id: I0b8e5415df0d0fade70dfa193ad45770c6db38dd
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 examples/toyota/configuration-generated.cpp | 73 +++++++++++++++++++++++++----
 examples/toyota/signals.json                | 37 ++++++++++-----
 2 files changed, 91 insertions(+), 19 deletions(-)

(limited to 'examples')

diff --git a/examples/toyota/configuration-generated.cpp b/examples/toyota/configuration-generated.cpp
index fe8b56d1..b7a761e7 100644
--- a/examples/toyota/configuration-generated.cpp
+++ b/examples/toyota/configuration-generated.cpp
@@ -2,11 +2,10 @@
 #include "can/can-decoder.hpp"
 
 configuration_t::configuration_t()
-	: can_message_set_{{0, "example", 0, 2, 2, 0, 19}}
+	: can_message_set_{{0, "example", 0, 1, 5, 0, 19}}
 	, can_message_definition_
 	{
 		{
-			can_message_definition_t(0, "vcan0", 0x442, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true),
 			can_message_definition_t(0, "vcan0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true)
 		}
 	}
@@ -16,9 +15,29 @@ configuration_t::configuration_t()
 			{
 				0,
 				0,
-				"doors.passenger.open",
+				"doors.coffer.open",
+				88,
+				1,
+				0.00000f, 
+				0, 
 				0,
-				4,
+				0,
+				frequency_clock_t(0.00000f),
+				true,
+				false,
+				{
+				},
+				false,
+				decoder_t::booleanDecoder,
+				nullptr,
+				false
+			},
+			{
+				0,
+				0,
+				"doors.driver.open",
+				78,
+				1,
 				0.00000f, 
 				0, 
 				0,
@@ -32,14 +51,52 @@ configuration_t::configuration_t()
 				decoder_t::booleanDecoder,
 				nullptr,
 				false
-			}
-		},
-		{
+			},
 			{
 				0,
+				0,
+				"doors.passenger.open",
+				79,
 				1,
-				"doors.driver.open",
+				0.00000f, 
+				0, 
+				0,
+				0,
+				frequency_clock_t(0.00000f),
+				true,
+				false,
+				{
+				},
+				false,
+				decoder_t::booleanDecoder,
+				nullptr,
+				false
+			},
+			{
+				0,
+				0,
+				"doors.rearleft.open",
+				86,
+				1,
+				0.00000f, 
+				0, 
+				0,
+				0,
+				frequency_clock_t(0.00000f),
+				true,
+				false,
+				{
+				},
+				false,
+				decoder_t::booleanDecoder,
+				nullptr,
+				false
+			},
+			{
+				0,
 				0,
+				"doors.rearright.open",
+				85,
 				4,
 				0.00000f, 
 				0, 
diff --git a/examples/toyota/signals.json b/examples/toyota/signals.json
index 037b4d72..b9d20409 100644
--- a/examples/toyota/signals.json
+++ b/examples/toyota/signals.json
@@ -10,25 +10,41 @@
             "signals": {
                 "doors.driver.open": {
                     "generic_name": "doors.driver.open",
-                    "bit_position": 0,
-                    "bit_size": 4,
+                    "bit_position": 78,
+                    "bit_size": 1,
                     "factor": 0,
                     "offset": 0,
-                    "decoder": "decoder_t::booleanDecoder"}
-            }
-        },
-		"0x442": {
-			"bus": "vcan0",
-            "signals": {
+                    "decoder": "decoder_t::booleanDecoder"},
                 "doors.passenger.open": {
                     "generic_name": "doors.passenger.open",
-                    "bit_position": 0,
+                    "bit_position": 79,
+                    "bit_size": 1,
+                    "factor": 0,
+                    "offset": 0,
+                    "decoder": "decoder_t::booleanDecoder"},
+                "doors.rearleft.open": {
+                    "generic_name": "doors.rearleft.open",
+                    "bit_position": 86,
+                    "bit_size": 1,
+                    "factor": 0,
+                    "offset": 0,
+                    "decoder": "decoder_t::booleanDecoder"},
+                "doors.rearright.open": {
+                    "generic_name": "doors.rearright.open",
+                    "bit_position": 85,
                     "bit_size": 4,
                     "factor": 0,
                     "offset": 0,
+                    "decoder": "decoder_t::booleanDecoder"},
+                "doors.coffer.open": {
+                    "generic_name": "doors.coffer.open",
+                    "bit_position": 88,
+                    "bit_size": 1,
+                    "factor": 0,
+                    "offset": 0,
                     "decoder": "decoder_t::booleanDecoder"}
-            }
 		}
+	}
     },
     "diagnostic_messages": [
         {
@@ -164,6 +180,5 @@
 			"frequency": 1,
             "decoder": "decoder_t::decode_obd2_response"
         }
-
     ]
 }
-- 
cgit 1.2.3-korg