{\r
return encoder_;\r
}\r
+\r
+ std::pair<bool,int> signal::multiplex() const{\r
+ return multiplex_;\r
+ }\r
+\r
+ sign_t signal::sign() const\r
+ {\r
+ return sign_;\r
+ }\r
+\r
+ std::int32_t signal::bit_sign_position() const\r
+ {\r
+ return bit_sign_position_;\r
+ }\r
+\r
+ std::string signal::unit() const{\r
+ return unit_;\r
+ }\r
+\r
\r
void signal::from_json(const nlohmann::json& j)\r
{\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
encoder_ = j.count("encoder") ? j["encoder"].get<std::string>() : "";\r
+ if(j.count("multiplex"))\r
+ {\r
+ std::string mult = j["multiplex"].get<std::string>();\r
+ bool first = false;\r
+ int second = 0 ;\r
+ if(mult.compare("Multiplexor") == 0){\r
+ first = true;\r
+ }\r
+ else if (mult.compare("") != 0)\r
+ {\r
+ second = std::stoi(mult);\r
+ }\r
+ multiplex_ = std::make_pair(first,second);\r
+ }\r
+ else\r
+ {\r
+ multiplex_ = std::make_pair(false,0);\r
+ }\r
+\r
+ bit_sign_position_ = j.count("bit_sign_position") ? j["bit_sign_position"].get<std::int32_t>() : -1;\r
+ sign_ = j.count("signed") ? (sign_t) j["signed"].get<std::uint32_t>() : sign_t::UNSIGNED;\r
+ unit_ = j.count("unit") ? j["unit"].get<std::string>() : "";\r
\r
if (j.count("states"))\r
{\r
j["force_send_changed"] = force_send_changed_;\r
j["writable"] = writable_;\r
j["encoder"] = encoder_;\r
+\r
+ std::string multi = "";\r
+\r
+ if(multiplex_.first)\r
+ {\r
+ multi = "Multiplexor";\r
+ }\r
+ else if(multiplex_.second != 0)\r
+ {\r
+ multi = std::to_string(multiplex_.second);\r
+ }\r
+ else\r
+ {\r
+ multi = "";\r
+ }\r
+\r
+ j["multiplex"] = multi;\r
+\r
+ j["bit_sign_position"] = bit_sign_position_;\r
+ j["signed"] = static_cast<std::uint32_t>(sign_);\r
+ j["unit"] = unit_;\r
return j;\r
}\r
\r