X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-config-generator%2Fsrc%2Fopenxc%2Fcan_message.cpp;h=40e897b22d2976b1e5447a7f2a3f67edaa2b9d06;hb=76c43dec62b2e21cd6446360c00d4fe6b437533f;hp=fab5a85fe56184a68eb5260f4378e83cd32052e2;hpb=0242c26c2f5dc96387bca7efb118364c800f4ee7;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-config-generator/src/openxc/can_message.cpp b/CAN-config-generator/src/openxc/can_message.cpp index fab5a85f..40e897b2 100755 --- 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() : ""; handlers_ = j.count("handlers") ? j["handlers"].get>() : std::vector(); enabled_ = j.count("enabled") ? j["enabled"].get() : true; - max_frequency_ = j.count("max_frequency") ? j["max_frequency"].get() : 0; - max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get() : 0; + max_frequency_ = (float)j.count("max_frequency") ? j["max_frequency"].get() : 5; + max_signal_frequency_ = j.count("max_signal_frequency") ? j["max_signal_frequency"].get() : 5; force_send_changed_ = j.count("force_send_changed") ? j["force_send_changed"].get() : true; force_send_changed_signals_ = j.count("force_send_changed_signals") ? j["force_send_changed_signals"].get() : false; @@ -89,7 +89,7 @@ namespace openxc std::uint32_t can_message::get_signals_count() const { - return signals_.size(); + return (uint32_t)signals_.size(); } nlohmann::json can_message::to_json() const