diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-02 22:34:23 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-02 22:34:23 +0100 |
| commit | e914a50b0bd655de77a6c0225c6ede7cbd0e606f (patch) | |
| tree | 2a3a3be71f2efec2eb5e437c22104df9ca5580ad /src/can-signals.cpp | |
| parent | b948ba030ca3b49a79b1e77a87229438209e422c (diff) | |
Fix: Wrong set up of vector.
Change-Id: Id9fa04541a62714802a64492e3981b204756212e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can-signals.cpp')
| -rw-r--r-- | src/can-signals.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/can-signals.cpp b/src/can-signals.cpp index 3832c331..5e8818b9 100644 --- a/src/can-signals.cpp +++ b/src/can-signals.cpp @@ -23,7 +23,10 @@ #include "low-can-binding.hpp" std::vector<std::vector<CanMessageDefinition>> CAN_MESSAGES = { - {{0x620, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL}}, + { + {0x620, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL}, + {0x442, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL}, + }, }; /** @@ -31,7 +34,10 @@ std::vector<std::vector<CanMessageDefinition>> CAN_MESSAGES = { * SIGNALS[MESSAGE_SET_ID][CanSignal] */ std::vector<std::vector<CanSignal>> SIGNALS = { - {{&(CAN_MESSAGES[0][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, (float)NULL}}, + { + {&(CAN_MESSAGES[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, (float)NULL}, + {&(CAN_MESSAGES[MESSAGE_SET_ID][1]), "can.driver_door.close", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, (float)NULL} + }, }; /** |