summaryrefslogtreecommitdiffstats
path: root/CAN-config-generator/src/openxc/message_set.cpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-17 14:32:14 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-19 11:36:43 +0200
commitaab3313042e28f4cbf85b36564bfc3e5e39ffac4 (patch)
treecc330ef5b21256f98121e3cfcf5d0bbd1fefb7a0 /CAN-config-generator/src/openxc/message_set.cpp
parent8c1f3c953e5e66e421b0a75ce26853ac848d6b54 (diff)
Fix: Generator compilation warnings.
Change-Id: Ib9267901da5f0cddd191b5736e47b43c696a85e6 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-config-generator/src/openxc/message_set.cpp')
-rwxr-xr-xCAN-config-generator/src/openxc/message_set.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/CAN-config-generator/src/openxc/message_set.cpp b/CAN-config-generator/src/openxc/message_set.cpp
index c47c45f8..d6745bfc 100755
--- a/CAN-config-generator/src/openxc/message_set.cpp
+++ b/CAN-config-generator/src/openxc/message_set.cpp
@@ -89,7 +89,7 @@ namespace openxc
{
name_ = j["name"].get<std::string>();
bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false; // TODO: should be true by default if database-backed.
- max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<std::uint32_t>() : 0;
+ max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0.0f;
raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;
parents_ = j.count("parents") ? j["parents"].get<std::vector<std::string>>() : std::vector<std::string>();
initializers_ = j.count("initializers") ? j["initializers"].get<std::vector<std::string>>() : std::vector<std::string>();