Change enum type to flag and add iso tp protocol

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

diff --git a/src/main.cpp b/src/main.cpp
index 9f7969f..b35f9e3 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,6 +33,20 @@
 #define EXIT_COMMAND_LINE_ERROR                2\r
 #define EXIT_PROGRAM_ERROR                     3\r
 \r
+\r
+/**\r
+ * FLAGS\r
+ */\r
+\r
+#define INVALID_FLAG 0x0001\r
+#define STANDARD_ID 0x0002\r
+#define EXTENDED_ID 0x0004\r
+#define BCM_PROTOCOL 0x0008\r
+#define J1939_PROTOCOL 0x0010\r
+#define J1939_ADDR_CLAIM_PROTOCOL 0x0020\r
+#define ISOTP_PROTOCOL 0x0040\r
+#define FD_FRAME 0x0800\r
+\r
 template <typename T>\r
 struct generator\r
 {\r
@@ -170,8 +184,8 @@ std::ostream& operator<<(std::ostream& o, const generator<openxc::signal>& v)
                }\r
                std::string multi = "std::make_pair<bool, int>(" + multi_first + ", " + std::to_string(v.v_.multiplex().second) + ")";\r
        o       << v.line_prefix_ << '\t' << multi << ",// multiplex\n"\r
-               << v.line_prefix_ << '\t' << v.v_.is_big_endian() << ",// is_big_endian\n"\r
-               << v.line_prefix_ << '\t' << v.v_.is_signed() << ",// is_signed\n"\r
+               << v.line_prefix_ << '\t' << gen(v.v_.is_big_endian()) << ",// is_big_endian\n"\r
+               << v.line_prefix_ << '\t' << gen(v.v_.is_signed()) << ",// is_signed\n"\r
                << v.line_prefix_ << "\t" << gen(v.v_.unit()) << "// unit\n"\r
                << v.line_prefix_ << "})}";\r
        return o;\r
@@ -185,18 +199,40 @@ std::ostream& operator<<(std::ostream& o, const generator<openxc::can_message>&
                << gen(v.v_.bus()) << ","\r
                << v.v_.id() << ","\r
                << "\"" << v.v_.name() << "\","\r
-               << v.v_.length() << ","\r
-               << gen(v.v_.is_fd()) << ",";\r
-               if(v.v_.is_j1939()){\r
-                       o << "message_format_t::J1939,";\r
+               << v.v_.length() << ",";\r
+               uint32_t flags = 0;\r
+               if(v.v_.is_fd())\r
+               {\r
+                       flags = flags|FD_FRAME;\r
                }\r
-               else if(v.v_.is_extended())\r
+\r
+               if(v.v_.is_j1939())\r
                {\r
-                       o << "message_format_t::EXTENDED,";\r
+                       flags = flags|J1939_PROTOCOL;\r
                }\r
-               else{\r
-                       o << "message_format_t::STANDARD,";\r
+\r
+               if(v.v_.is_isotp())\r
+               {\r
+                       flags = flags|ISOTP_PROTOCOL;\r
                }\r
+\r
+               if(v.v_.is_extended())\r
+               {\r
+                       flags = flags|EXTENDED_ID;\r
+               }\r
+               else\r
+               {\r
+                       flags = flags|STANDARD_ID;\r
+               }\r
+\r
+\r
+               if(v.v_.is_fd())\r
+               {\r
+                       flags = flags|FD_FRAME;\r
+               }\r
+\r
+               o << gen(flags) << ",";\r
+\r
        o       << "frequency_clock_t(" << gen(v.v_.max_frequency()) << "),"\r
                << gen(v.v_.force_send_changed()) << ",";\r
                std::uint32_t index = 0;\r