summaryrefslogtreecommitdiffstats
path: root/src/openxc/can_bus.cpp
diff options
context:
space:
mode:
authorLoïc Collignon <loic.collignon@iot.bzh>2017-03-16 09:54:02 +0100
committerLoïc Collignon <loic.collignon@iot.bzh>2017-03-16 09:54:02 +0100
commitfbd0fb6d5f38f7a12f3bebb4a7fb14bd3e6bfb7c (patch)
treef03dc9d234c145aadc55d3aad4ca7e867000b3a6 /src/openxc/can_bus.cpp
parentfa8c58708fe0fa8a0f4a88293e0eed196494f020 (diff)
wip: generation of a configuration for can_signaling.
Change-Id: I35b31a98e87943a4e2fcad06561fec7a347b8483 Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
Diffstat (limited to 'src/openxc/can_bus.cpp')
-rwxr-xr-xsrc/openxc/can_bus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openxc/can_bus.cpp b/src/openxc/can_bus.cpp
index 545a6c5c..0a968a9e 100755
--- a/src/openxc/can_bus.cpp
+++ b/src/openxc/can_bus.cpp
@@ -22,7 +22,7 @@ namespace openxc
return raw_writable_;
}
- std::uint32_t can_bus::max_message_frequency() const
+ float can_bus::max_message_frequency() const
{
return max_message_frequency_;
}
@@ -38,7 +38,7 @@ namespace openxc
speed_ = j.count("speed") ? j["speed"].get<std::uint32_t>() : 0;
raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;
raw_writable_ = j.count("raw_writable") ? j["raw_writable"].get<bool>() : false;
- 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;
force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;
}