summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-12-03 16:07:49 -0500
committerScott Murray <scott.murray@konsulko.com>2019-12-03 22:06:08 +0000
commit6af1b5e243df2333a9ecdedf9c9ba23a3619de58 (patch)
tree8f3a57d811737f36220b225e7b3c0455da3e72c3
parent42163fc4757fa2bb4a8fba54afb8a092ccd0878d (diff)
Update steering wheel LIN message definition
The steering wheel LIN message does not work in low-can after it has been updated to include commit "Update function rx_filter_can for multi frame prevision." (59bffa4 in master, a41ee0d in halibut), due to the length value now being required in the message definition. The length has been added to the definition for agl-vcar and the application-generated.cpp files regenerated. As well, the new J1939 and FD flags have been added to the message definition for consistency. Bug-AGL: SPEC-2951 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ice079268827dfbb2bf2c79b6c5e897dcab8fc433
-rw-r--r--examples/agl-vcar/application-generated.cpp2
-rw-r--r--examples/agl-vcar/signals.json4
-rw-r--r--low-can-binding/binding/application-generated.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/agl-vcar/application-generated.cpp b/examples/agl-vcar/application-generated.cpp
index f4d2635d..37d06c63 100644
--- a/examples/agl-vcar/application-generated.cpp
+++ b/examples/agl-vcar/application-generated.cpp
@@ -7,7 +7,7 @@ application_t::application_t()
, message_set_{
{std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car",
{ // beginning message_definition_ vector
- {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",0,2,frequency_clock_t(5.00000f),true,
+ {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",8,2,frequency_clock_t(5.00000f),true,
{ // beginning signals vector
{std::make_shared<signal_t> (signal_t{
"steering_wheel.cruise.cancel",// generic_name
diff --git a/examples/agl-vcar/signals.json b/examples/agl-vcar/signals.json
index 51bf1607..45aefd68 100644
--- a/examples/agl-vcar/signals.json
+++ b/examples/agl-vcar/signals.json
@@ -216,6 +216,10 @@
},
"0x21": {
"bus": "ls",
+ "is_fd" : false,
+ "is_extended": false,
+ "is_j1939" : false,
+ "length" : 8,
"signals": {
"SW_Previous": {
"generic_name": "steering_wheel.previous",
diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp
index f4d2635d..37d06c63 100644
--- a/low-can-binding/binding/application-generated.cpp
+++ b/low-can-binding/binding/application-generated.cpp
@@ -7,7 +7,7 @@ application_t::application_t()
, message_set_{
{std::make_shared<message_set_t>(message_set_t{0,"AGL Virtual Car",
{ // beginning message_definition_ vector
- {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",0,2,frequency_clock_t(5.00000f),true,
+ {std::make_shared<message_definition_t>(message_definition_t{"ls",0x21,"",8,2,frequency_clock_t(5.00000f),true,
{ // beginning signals vector
{std::make_shared<signal_t> (signal_t{
"steering_wheel.cruise.cancel",// generic_name