Add some options for J1939 support

[src/low-level-can-generator.git] / src / openxc / can_message.cpp

diff --git a/src/openxc/can_message.cpp b/src/openxc/can_message.cpp
index 77418d8..70b98a7 100755 (executable)
--- a/src/openxc/can_message.cpp
+++ b/src/openxc/can_message.cpp
@@ -6,17 +6,17 @@ namespace openxc
        {\r
                return id_;\r
        }\r
-       \r
+\r
        void can_message::id(const std::string& id)\r
        {\r
                id_ = id;\r
        }\r
-       \r
+\r
        std::string can_message::bus() const\r
        {\r
                return bus_;\r
        }\r
-       \r
+\r
        void can_message::is_fd(const bool is_fd)\r
        {\r
                is_fd_ = is_fd;\r
@@ -26,56 +26,82 @@ namespace openxc
        {\r
                return is_fd_;\r
        }\r
+       void can_message::is_extended(const bool is_extended)\r
+       {\r
+               is_extended_ = is_extended;\r
+       }\r
+\r
+       bool can_message::is_extended() const\r
+       {\r
+               return is_extended_;\r
+       }\r
+\r
+       void can_message::is_j1939(const bool is_j1939)\r
+       {\r
+               is_j1939_ = is_j1939;\r
+       }\r
+\r
+       bool can_message::is_j1939() const\r
+       {\r
+               return is_j1939_;\r
+       }\r
 \r
        bool can_message::bit_numbering_inverted() const\r
        {\r
                return bit_numbering_inverted_;\r
        }\r
-       \r
+\r
        const std::vector<signal>& can_message::signals() const\r
        {\r
                return signals_;\r
        }\r
-       \r
+\r
        std::string can_message::name() const\r
        {\r
                return name_;\r
        }\r
-       \r
+\r
        std::vector<std::string> can_message::handlers() const\r
        {\r
                return handlers_;\r
        }\r
-       \r
+\r
        bool can_message::enabled() const\r
        {\r
                return enabled_;\r
        }\r
-       \r
+\r
        float can_message::max_frequency() const\r
        {\r
                return max_frequency_;\r
        }\r
-       \r
+\r
        float can_message::max_signal_frequency() const\r
        {\r
                return max_signal_frequency_;\r
        }\r
-       \r
+\r
        bool can_message::force_send_changed() const\r
        {\r
                return force_send_changed_;\r
        }\r
-       \r
+\r
        bool can_message::force_send_changed_signals() const\r
        {\r
                return force_send_changed_;\r
        }\r
-       \r
+\r
+       uint32_t can_message::length() const\r
+       {\r
+               return length_;\r
+       }\r
+\r
        void can_message::from_json(const nlohmann::json& j)\r
        {\r
                bus_ = j.count("bus") ? j["bus"].get<std::string>() : "";\r
                is_fd_ = j.count("is_fd") ? j["is_fd"].get<bool>() : false;\r
+               is_extended_ = j.count("is_extended") ? j["is_extended"].get<bool>() : false;\r
+               is_j1939_ = j.count("is_j1939") ? j["is_j1939"].get<bool>() : false;\r
                bit_numbering_inverted_ = j.count("bit_numbering_inverted") ? j["bit_numbering_inverted"].get<bool>() : false;\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
@@ -84,7 +110,8 @@ namespace openxc
                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
+               length_ = j.count("length") ? j["length"].get<uint32_t>() : 0;\r
+\r
                if(j.count("signals"))\r
                {\r
                        std::map<std::string, nlohmann::json> signals = j["signals"];\r
@@ -95,9 +122,9 @@ namespace openxc
                                signals_.push_back(sig);\r
                        }\r
                }\r
-               \r
+\r
        }\r
-       \r
+\r
        std::uint32_t can_message::get_signals_count() const\r
        {\r
                return (uint32_t)signals_.size();\r
@@ -108,6 +135,10 @@ namespace openxc
                nlohmann::json j;\r
                j["bus"] = bus_;\r
                j["is_fd"] = is_fd_;\r
+\r
+               j["is_extended"] = is_extended_;\r
+\r
+               j["is_j1939"] = is_j1939_;\r
                j["bit_numbering_inverted"] = bit_numbering_inverted_;\r
                j["signals"] = signals_;\r
                j["name"] = name_;\r
@@ -117,6 +148,7 @@ namespace openxc
                j["max_signal_frequency"] = max_signal_frequency_;\r
                j["force_send_changed"] = force_send_changed_;\r
                j["force_send_changed_signals"] = force_send_changed_signals_;\r
+               j["length"] = length_;\r
                return j;\r
        }\r
 \r
@@ -124,7 +156,7 @@ namespace openxc
        {\r
                j = p.to_json();\r
        }\r
-       \r
+\r
        void from_json(const nlohmann::json& j, can_message& p)\r
        {\r
                p.from_json(j);\r