diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-04-14 13:24:07 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-04-14 13:24:07 +0200 |
| commit | 49fe0eec8f17698fc5f86d0abe01777af1fb2b23 (patch) | |
| tree | 356cd3e3261934a3fb90786e1789ee4ad001cbe5 /CAN-config-generator/src/openxc/diagnostic_message.cpp | |
| parent | 044ef27d3667a114964549f89c63ab1ea6655877 (diff) | |
Change directory architecture to use 2 separated projects.
Each projects, binder and generator, has to be compiled separatly.
CAN-binder will host high and low level binding
CAN-config-generator only the generator used for low level binding.
build.sh script just launch both build in their respective dir.
Change-Id: Ic77932660fcca507b23a631d4e4e790f608880ae
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-config-generator/src/openxc/diagnostic_message.cpp')
| -rwxr-xr-x | CAN-config-generator/src/openxc/diagnostic_message.cpp | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/CAN-config-generator/src/openxc/diagnostic_message.cpp b/CAN-config-generator/src/openxc/diagnostic_message.cpp new file mode 100755 index 00000000..3881abef --- /dev/null +++ b/CAN-config-generator/src/openxc/diagnostic_message.cpp @@ -0,0 +1,80 @@ +#include "diagnostic_message.hpp"
+
+namespace openxc
+{
+ std::string diagnostic_message::bus() const
+ {
+ return bus_;
+ }
+
+ std::uint32_t diagnostic_message::id() const
+ {
+ return id_;
+ }
+
+ std::uint32_t diagnostic_message::mode() const
+ {
+ return mode_;
+ }
+
+ float diagnostic_message::frequency() const
+ {
+ return frequency_;
+ }
+
+ std::uint32_t diagnostic_message::pid() const
+ {
+ return pid_;
+ }
+
+ std::string diagnostic_message::name() const
+ {
+ return name_;
+ }
+
+ std::string diagnostic_message::decoder() const
+ {
+ return decoder_;
+ }
+
+ std::string diagnostic_message::callback() const
+ {
+ return callback_;
+ }
+
+ void diagnostic_message::from_json(const nlohmann::json& j)
+ {
+ bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";
+ id_ = j.count("id") ? j["id"].get<std::uint32_t>() : 0;
+ mode_ = j.count("mode") ? j["mode"].get<std::uint32_t>() : 1;
+ frequency_ = j.count("frequency") ? j["frequency"].get<float>() : 0;
+ pid_ = j.count("pid") ? j["pid"].get<std::uint32_t>() : 0;
+ name_ = j.count("name") ? j["name"].get<std::string>() : "";
+ decoder_ = j.count("decoder") ? j["decoder"].get<std::string>() : "";
+ callback_ = j.count("callback") ? j["callback"].get<std::string>() : "";
+ }
+
+ nlohmann::json diagnostic_message::to_json() const
+ {
+ nlohmann::json j;
+ j["bus"] = bus_;
+ j["id"] = id_;
+ j["mode"] = mode_;
+ j["frequency"] = frequency_;
+ j["pid"] = pid_;
+ j["name"] = name_;
+ j["decoder"] = decoder_;
+ j["callback"] = callback_;
+ return j;
+ }
+
+ void to_json(nlohmann::json& j, const diagnostic_message& p)
+ {
+ j = p.to_json();
+ }
+
+ void from_json(const nlohmann::json& j, diagnostic_message& p)
+ {
+ p.from_json(j);
+ }
+}
|