Example enums

Author: rovo89

codegen/templates/ServiceInterfaceTemplate.hpp

@@ -22,6 +22,20 @@ cog.outl(f"#define {service['interface_class_name'].upper()}_HPP")
 /*[[[cog
 xbot_codegen.generateEnums(service)
 ]]]*/
+enum class ExampleEnumClass : uint8_t {
+  VALUE1 = 0,
+  VALUE2 = 1,
+  VALUE3 = 2,
+};
+
+namespace ExampleBitmaskEnum {
+  enum Value : uint8_t {
+    VALUE1 = 1 << 0,
+    VALUE2 = 1 << 1,
+    VALUE3 = 1 << 2,
+  };
+};
+
 //[[[end]]]
 /*[[[cog
 cog.outl(f"class {service['interface_class_name']} : public xbot::serviceif::ServiceInterfaceBase {{")
@@ -126,6 +140,27 @@ cog.outl(f"\u002f*\n{service['service_json']}\n*\u002f")
       "name": "Register3",
       "type": "blob"
     }
+  ],
+  "enums": [
+    {
+      "id": "ExampleEnumClass",
+      "base_type": "uint8_t",
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    },
+    {
+      "id": "ExampleBitmaskEnum",
+      "base_type": "uint8_t",
+      "bitmask": true,
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    }
   ]
 }
 */

codegen/templates/ServiceTemplate.hpp

@@ -21,6 +21,20 @@ cog.outl(f"#define {service['class_name'].upper()}_HPP")
 /*[[[cog
 xbot_codegen.generateEnums(service)
 ]]]*/
+enum class ExampleEnumClass : uint8_t {
+  VALUE1 = 0,
+  VALUE2 = 1,
+  VALUE3 = 2,
+};
+
+namespace ExampleBitmaskEnum {
+  enum Value : uint8_t {
+    VALUE1 = 1 << 0,
+    VALUE2 = 1 << 1,
+    VALUE3 = 1 << 2,
+  };
+};
+
 //[[[end]]]
 /*[[[cog
 cog.outl(f"class {service['class_name']} : public xbot::service::Service {{")
@@ -60,7 +74,7 @@ class ServiceTemplateBase : public xbot::service::Service {
     cog.outl(xbot_codegen.binary2c_array(service["service_cbor"]));
     ]]]*/
     static constexpr unsigned char SERVICE_DESCRIPTION_CBOR[] = {
-      0xA5, 0x64, 0x74, 0x79, 0x70, 0x65, 0x6F, 0x53,
+      0xA6, 0x64, 0x74, 0x79, 0x70, 0x65, 0x6F, 0x53,
       0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x65,
       0x6D, 0x70, 0x6C, 0x61, 0x74, 0x65, 0x67, 0x76,
       0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x01, 0x66,
@@ -99,7 +113,27 @@ class ServiceTemplateBase : public xbot::service::Service {
       0x64, 0x6E, 0x61, 0x6D, 0x65, 0x69, 0x52, 0x65,
       0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x33, 0x64,
       0x74, 0x79, 0x70, 0x65, 0x64, 0x62, 0x6C, 0x6F,
-      0x62
+      0x62, 0x65, 0x65, 0x6E, 0x75, 0x6D, 0x73, 0x82,
+      0xA3, 0x62, 0x69, 0x64, 0x70, 0x45, 0x78, 0x61,
+      0x6D, 0x70, 0x6C, 0x65, 0x45, 0x6E, 0x75, 0x6D,
+      0x43, 0x6C, 0x61, 0x73, 0x73, 0x69, 0x62, 0x61,
+      0x73, 0x65, 0x5F, 0x74, 0x79, 0x70, 0x65, 0x67,
+      0x75, 0x69, 0x6E, 0x74, 0x38, 0x5F, 0x74, 0x66,
+      0x76, 0x61, 0x6C, 0x75, 0x65, 0x73, 0xA3, 0x66,
+      0x56, 0x41, 0x4C, 0x55, 0x45, 0x31, 0x00, 0x66,
+      0x56, 0x41, 0x4C, 0x55, 0x45, 0x32, 0x01, 0x66,
+      0x56, 0x41, 0x4C, 0x55, 0x45, 0x33, 0x02, 0xA4,
+      0x62, 0x69, 0x64, 0x72, 0x45, 0x78, 0x61, 0x6D,
+      0x70, 0x6C, 0x65, 0x42, 0x69, 0x74, 0x6D, 0x61,
+      0x73, 0x6B, 0x45, 0x6E, 0x75, 0x6D, 0x69, 0x62,
+      0x61, 0x73, 0x65, 0x5F, 0x74, 0x79, 0x70, 0x65,
+      0x67, 0x75, 0x69, 0x6E, 0x74, 0x38, 0x5F, 0x74,
+      0x67, 0x62, 0x69, 0x74, 0x6D, 0x61, 0x73, 0x6B,
+      0xF5, 0x66, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x73,
+      0xA3, 0x66, 0x56, 0x41, 0x4C, 0x55, 0x45, 0x31,
+      0x00, 0x66, 0x56, 0x41, 0x4C, 0x55, 0x45, 0x32,
+      0x01, 0x66, 0x56, 0x41, 0x4C, 0x55, 0x45, 0x33,
+      0x02
     };
     //[[[end]]]
 
@@ -239,6 +273,27 @@ cog.outl(f"\u002f*\n{service['service_json']}\n*\u002f")
       "name": "Register3",
       "type": "blob"
     }
+  ],
+  "enums": [
+    {
+      "id": "ExampleEnumClass",
+      "base_type": "uint8_t",
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    },
+    {
+      "id": "ExampleBitmaskEnum",
+      "base_type": "uint8_t",
+      "bitmask": true,
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    }
   ]
 }
 */

codegen/templates/service.json

@@ -41,5 +41,26 @@
       "name": "Register3",
       "type": "blob"
     }
+  ],
+  "enums": [
+    {
+      "id": "ExampleEnumClass",
+      "base_type": "uint8_t",
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    },
+    {
+      "id": "ExampleBitmaskEnum",
+      "base_type": "uint8_t",
+      "bitmask": true,
+      "values": {
+        "VALUE1": 0,
+        "VALUE2": 1,
+        "VALUE3": 2
+      }
+    }
   ]
 }