aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-04-25 20:00:05 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-04-27 01:03:34 +0200
commit3294f6fd9ad00d9412518b13b528ae14067cb3cf (patch)
tree2102d2ba1a6b8d22f2c8cf5dfff9b96636e74457
parent14043c56960ced9141ef107c66a6a041a75f6cb3 (diff)
Fix bit alignment errors...
Change-Id: Iea1bb66bb3aea8a120e7bbb3b55895682044cf23 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--CAN-binder/examples/toyota/signals.json20
-rw-r--r--CAN-binder/low-can-binding/configuration-generated.cpp20
2 files changed, 20 insertions, 20 deletions
diff --git a/CAN-binder/examples/toyota/signals.json b/CAN-binder/examples/toyota/signals.json
index e6260c1a..68c068a7 100644
--- a/CAN-binder/examples/toyota/signals.json
+++ b/CAN-binder/examples/toyota/signals.json
@@ -10,37 +10,37 @@
"signals": {
"doors.driver.open": {
"generic_name": "doors.driver.open",
- "bit_position": 78,
+ "bit_position": 46,
"bit_size": 1,
- "factor": 0,
+ "factor": 1.0,
"offset": 0,
"decoder": "decoder_t::booleanDecoder"},
"doors.passenger.open": {
"generic_name": "doors.passenger.open",
- "bit_position": 79,
+ "bit_position": 47,
"bit_size": 1,
- "factor": 0,
+ "factor": 1.0,
"offset": 0,
"decoder": "decoder_t::booleanDecoder"},
"doors.rearleft.open": {
"generic_name": "doors.rearleft.open",
- "bit_position": 86,
+ "bit_position": 54,
"bit_size": 1,
- "factor": 0,
+ "factor": 1.0,
"offset": 0,
"decoder": "decoder_t::booleanDecoder"},
"doors.rearright.open": {
"generic_name": "doors.rearright.open",
- "bit_position": 85,
+ "bit_position": 53,
"bit_size": 4,
- "factor": 0,
+ "factor": 1.0,
"offset": 0,
"decoder": "decoder_t::booleanDecoder"},
"doors.coffer.open": {
"generic_name": "doors.coffer.open",
- "bit_position": 88,
+ "bit_position": 56,
"bit_size": 1,
- "factor": 0,
+ "factor": 1.0,
"offset": 0,
"decoder": "decoder_t::booleanDecoder"}
}
diff --git a/CAN-binder/low-can-binding/configuration-generated.cpp b/CAN-binder/low-can-binding/configuration-generated.cpp
index 1691a697..1249ab40 100644
--- a/CAN-binder/low-can-binding/configuration-generated.cpp
+++ b/CAN-binder/low-can-binding/configuration-generated.cpp
@@ -17,9 +17,9 @@ configuration_t::configuration_t()
0,
0,
"doors.coffer.open",
- 88,
+ 56,
1,
- 0.00000f,
+ 1.00000f,
0,
0,
0,
@@ -37,9 +37,9 @@ configuration_t::configuration_t()
0,
0,
"doors.driver.open",
- 78,
+ 46,
1,
- 0.00000f,
+ 1.00000f,
0,
0,
0,
@@ -57,9 +57,9 @@ configuration_t::configuration_t()
0,
0,
"doors.passenger.open",
- 79,
+ 47,
1,
- 0.00000f,
+ 1.00000f,
0,
0,
0,
@@ -77,9 +77,9 @@ configuration_t::configuration_t()
0,
0,
"doors.rearleft.open",
- 86,
+ 54,
1,
- 0.00000f,
+ 1.00000f,
0,
0,
0,
@@ -97,9 +97,9 @@ configuration_t::configuration_t()
0,
0,
"doors.rearright.open",
- 85,
+ 55,
4,
- 0.00000f,
+ 1.00000f,
0,
0,
0,