object: add Vtable, Inst descriptions and msgid's

robEllenberg · Mar 22, 2015 · 0a01fd2 · 0a01fd2
1 parent 8ae9f49
commit 0a01fd2
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/proto/object.proto b/proto/object.proto
@@ -230,7 +230,24 @@ message Group {
     repeated Member       member        = 7;  // list of signals or group names
 }
 
+
+// ProtocolParameters tells a peer entity about key
+// constants pertaining to the protocol, for instance
+// scan timer, keepalive timer etc
+
+message ProtocolParameters  {
+
+    option (nanopb_msgopt).msgid = 713;
+
+    optional sfixed32     keepalive_timer  = 1; // group and rcomp ping interval sent by haltalk
+    optional sfixed32     group_timer  = 2;     // group default scan timer
+    optional sfixed32     rcomp_timer  = 3;     // rcomp default scan timer
+}
+
 message Vtable {
+
+    option (nanopb_msgopt).msgid = 714;
+
     optional string       name          = 1; //  [(nanopb).max_size = 41];
     optional fixed32      context       = 2;
     optional sfixed32     comp_id       = 4;
@@ -242,23 +259,13 @@ message Vtable {
 }
 
 message Inst {
+
+    option (nanopb_msgopt).msgid = 715;
+
     optional string       name          = 1; //  [(nanopb).max_size = 41];
     optional sfixed32     comp_id       = 2;
     optional fixed32      inst_id       = 3;
     optional fixed32      inst_size     = 4;
     optional fixed64      vtable        = 5;
 }
 
-
-// ProtocolParameters tells a peer entity about key
-// constants pertaining to the protocol, for instance
-// scan timer, keepalive timer etc
-
-message ProtocolParameters  {
-
-    option (nanopb_msgopt).msgid = 713;
-
-    optional sfixed32     keepalive_timer  = 1; // group and rcomp ping interval sent by haltalk
-    optional sfixed32     group_timer  = 2;     // group default scan timer
-    optional sfixed32     rcomp_timer  = 3;     // rcomp default scan timer
-}