Fix: Generator compilation warnings.

[apps/low-level-can-service.git] / CAN-config-generator / src / openxc / signal.cpp

diff --git a/CAN-config-generator/src/openxc/signal.cpp b/CAN-config-generator/src/openxc/signal.cpp
index 6c3ff82..e9c1088 100755 (executable)
--- a/CAN-config-generator/src/openxc/signal.cpp
+++ b/CAN-config-generator/src/openxc/signal.cpp
@@ -34,7 +34,7 @@ namespace openxc
                return factor_;\r
        }\r
        \r
-       std::uint32_t signal::offset() const\r
+       float signal::offset() const\r
        {\r
                return offset_;\r
        }\r
@@ -90,11 +90,11 @@ namespace openxc
                bit_position_ = j.count("bit_position") ? j["bit_position"].get<std::uint32_t>() : 0;\r
                bit_size_ = j.count("bit_size") ? j["bit_size"].get<std::uint32_t>() : 0;\r
                factor_ = j.count("factor") ? j["factor"].get<float>() : 1.0f;\r
-               offset_ = j.count("offset") ? j["offset"].get<std::uint32_t>() : 0;\r
+               offset_ = j.count("offset") ? j["offset"].get<float>() : 0.0f;\r
                decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";\r
                ignore_ = j.count("ignore") ? j["ignore"].get<bool>() : false;\r
                enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;\r
-               max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get<std::uint32_t>() : 0;\r
+               max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get<float>() : 0.0f;\r
                send_same_ = j.count("send_same") ? j["send_same"].get<bool>() : true;\r
                force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : false;\r
                writable_ = j.count("writable") ? j["writable"].get<bool>() : false;\r