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
\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
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
return factor_;\r
}\r
\r
- std::uint32_t signal::offset() const\r
+ float signal::offset() const\r
{\r
return offset_;\r
}\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
- 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
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::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