Fix: Generator compilation warnings.

Change-Id: Ib9267901da5f0cddd191b5736e47b43c696a85e6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/CAN-config-generator/src/openxc/can_message.cpp b/CAN-config-generator/src/openxc/can_message.cpp
index fab5a85..40e897b 100755 (executable)
--- a/CAN-config-generator/src/openxc/can_message.cpp
+++ b/CAN-config-generator/src/openxc/can_message.cpp
@@ -69,8 +69,8 @@ namespace openxc
                name_ = j.count("name") ? j["name"].get<std::string>() : "";\r
                handlers_ = j.count("handlers") ? j["handlers"].get<std::vector<std::string>>() : std::vector<std::string>();\r
                enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;\r
                name_ = j.count("name") ? j["name"].get<std::string>() : "";\r
                handlers_ = j.count("handlers") ? j["handlers"].get<std::vector<std::string>>() : std::vector<std::string>();\r
                enabled_ = j.count("enabled") ? j["enabled"].get<bool>() : true;\r

-               max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get<float>() : 0;\r
-               max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get<float>() : 0;\r
+               max_frequency_ = (float)j.count("max_frequency") ? j["max_frequency"].get<float>() : 5;\r
+               max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get<float>() : 5;\r

                force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : true;\r
                force_send_changed_signals_ = j.count("force_send_changed_signals") ? j["force_send_changed_signals"].get<bool>() : false;\r
                \r
                force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get<bool>() : true;\r
                force_send_changed_signals_ = j.count("force_send_changed_signals") ? j["force_send_changed_signals"].get<bool>() : false;\r
                \r


@@ -89,7 +89,7 @@ namespace openxc
        \r
        std::uint32_t can_message::get_signals_count() const\r
        {\r
        \r
        std::uint32_t can_message::get_signals_count() const\r
        {\r

-               return signals_.size();\r
+               return (uint32_t)signals_.size();\r

        }\r
 \r
        nlohmann::json can_message::to_json() const\r
        }\r
 \r
        nlohmann::json can_message::to_json() const\r

diff --git a/CAN-config-generator/src/openxc/message_set.cpp b/CAN-config-generator/src/openxc/message_set.cpp
index c47c45f..d6745bf 100755 (executable)
--- a/CAN-config-generator/src/openxc/message_set.cpp
+++ b/CAN-config-generator/src/openxc/message_set.cpp
@@ -89,7 +89,7 @@ namespace openxc
        {\r
                name_ = j["name"].get<std::string>();\r
                bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false; // TODO: should be true by default if database-backed.\r
        {\r
                name_ = j["name"].get<std::string>();\r
                bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false; // TODO: should be true by default if database-backed.\r

-               max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<std::uint32_t>() : 0;\r
+               max_message_frequency_ = j.count("max_message_frequency") ? j["max_message_frequency"].get<float>() : 0.0f;\r

                raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;\r
                parents_ = j.count("parents") ? j["parents"].get<std::vector<std::string>>() : std::vector<std::string>();\r
                initializers_ = j.count("initializers") ? j["initializers"].get<std::vector<std::string>>() : std::vector<std::string>();\r
                raw_can_mode_ = j.count("raw_can_mode") ? j["raw_can_mode"].get<can_bus_mode>() : can_bus_mode::off;\r
                parents_ = j.count("parents") ? j["parents"].get<std::vector<std::string>>() : std::vector<std::string>();\r
                initializers_ = j.count("initializers") ? j["initializers"].get<std::vector<std::string>>() : std::vector<std::string>();\r

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
                return factor_;\r
        }\r
        \r

-       std::uint32_t signal::offset() const\r
+       float signal::offset() const\r

        {\r
                return offset_;\r
        }\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
                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
                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
                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

diff --git a/CAN-config-generator/src/openxc/signal.hpp b/CAN-config-generator/src/openxc/signal.hpp
index 64dba75..e0124c3 100755 (executable)
--- a/CAN-config-generator/src/openxc/signal.hpp
+++ b/CAN-config-generator/src/openxc/signal.hpp
@@ -16,7 +16,7 @@ namespace openxc
                std::uint32_t                                                                           bit_position_;\r
                std::uint32_t                                                                           bit_size_;\r
                float                                                                                           factor_;\r
                std::uint32_t                                                                           bit_position_;\r
                std::uint32_t                                                                           bit_size_;\r
                float                                                                                           factor_;\r

-               std::uint32_t                                                                           offset_;\r
+               float                                                                                           offset_;\r

                std::string                                                                                     decoder_;\r
                bool                                                                                            ignore_;\r
                bool                                                                                            enabled_;\r
                std::string                                                                                     decoder_;\r
                bool                                                                                            ignore_;\r
                bool                                                                                            enabled_;\r


@@ -33,7 +33,7 @@ namespace openxc
                std::uint32_t bit_position() const;\r
                std::uint32_t bit_size() const;\r
                float factor() const;\r
                std::uint32_t bit_position() const;\r
                std::uint32_t bit_size() const;\r
                float factor() const;\r

-               std::uint32_t offset() const;\r
+               float offset() const;\r

                std::string decoder() const;\r
                bool ignore() const;\r
                bool enabled() const;\r
                std::string decoder() const;\r
                bool ignore() const;\r
                bool enabled() const;\r