Change enum type to flag and add iso tp protocol

[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 70b98a7..700896a 100755 (executable)
--- a/src/openxc/can_message.cpp
+++ b/src/openxc/can_message.cpp
@@ -46,6 +46,16 @@ namespace openxc
                return is_j1939_;\r
        }\r
 \r
+       void can_message::is_isotp(const bool is_isotp)\r
+       {\r
+               is_isotp_ = is_isotp;\r
+       }\r
+\r
+       bool can_message::is_isotp() const\r
+       {\r
+               return is_isotp_;\r
+       }\r
+\r
        bool can_message::bit_numbering_inverted() const\r
        {\r
                return bit_numbering_inverted_;\r
@@ -102,6 +112,7 @@ namespace openxc
                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
+               is_isotp_ = j.count("is_isotp") ? j["is_isotp"].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
@@ -135,10 +146,9 @@ 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["is_isotp"] = is_isotp_;\r
                j["bit_numbering_inverted"] = bit_numbering_inverted_;\r
                j["signals"] = signals_;\r
                j["name"] = name_;\r