diff options
| author |   Arthur Guyader <arthur.guyader@iot.bzh> | 2019-07-02 17:46:16 +0200 |
|---|---|---|
| committer | Arthur Guyader <arthur.guyader@iot.bzh> | 2019-08-12 15:06:45 +0200 |
| commit | 8c0a3d45ca37f710100afab065b07e82682dc1ef (patch) | |
| tree | d2374f3dc618f07ad46d4639aa2c846c79c8ce93 /examples/basic | |
| parent | 3977705505069b4210b29e8188cdd35813c65886 (diff) | |
Update examples and can_samples
Update of examples for new features (is_fd,is_extended,is_j1939).
Bug-AGL: SPEC-2386
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Change-Id: I8c3afbafdde4f5818d73c0e71a3b7e47fb7d8fc6
Diffstat (limited to 'examples/basic')
| -rw-r--r-- | examples/basic/application-generated.cpp | 14 | ||||
| -rw-r--r-- | examples/basic/signals.json | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/examples/basic/application-generated.cpp b/examples/basic/application-generated.cpp index e05397ad..19857603 100644 --- a/examples/basic/application-generated.cpp +++ b/examples/basic/application-generated.cpp @@ -34,14 +34,14 @@ application_t::application_t() , message_set_{ {std::make_shared<message_set_t>(message_set_t{0,"example", { // beginning message_definition_ vector - {std::make_shared<message_definition_t>(message_definition_t{"hs",0x128,0,0,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, + {std::make_shared<message_definition_t>(message_definition_t{"hs",0x128,"ECM_z_5D2",0,false,message_format_t::STANDARD,frequency_clock_t(5.00000f),true, { // beginning signals vector {std::make_shared<signal_t> (signal_t{ "engine_speed",// generic_name 12,// bit_position 8,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(15.0000f),// frequency @@ -63,7 +63,7 @@ application_t::application_t() 41,// bit_position 3,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -78,7 +78,7 @@ application_t::application_t() {3,"THIRD"} },// states false,// writable - nullptr,// decoder + decoder_t::decode_state,// decoder nullptr,// encoder false,// received std::make_pair<bool, int>(false, 0),// multiplex @@ -91,7 +91,7 @@ application_t::application_t() 52,// bit_position 12,// bit_size 0.153920f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -113,7 +113,7 @@ application_t::application_t() 44,// bit_position 12,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency @@ -135,7 +135,7 @@ application_t::application_t() 52,// bit_position 12,// bit_size 1.00000f,// factor - 0.00000,// offset + 0.00000f,// offset 0,// min_value 0,// max_value frequency_clock_t(0.00000f),// frequency diff --git a/examples/basic/signals.json b/examples/basic/signals.json index 8d9a2d24..dc2e346c 100644 --- a/examples/basic/signals.json +++ b/examples/basic/signals.json @@ -27,6 +27,9 @@ "0x128": { "name": "ECM_z_5D2", "bus": "hs", + "is_fd" : false, + "is_extended": false, + "is_j1939" : false, "signals": { "StrAnglAct": { "generic_name": "SteeringWheelAngle", |