Improve support for generating config telemetry dictionary

Author: johnbellardo

poly-xdrgen

@@ -9,7 +9,7 @@ from polyxdr.parser import *
 def main():
     parser = argparse.ArgumentParser(description='XDR compiler')
     parser.add_argument("input", metavar="FILE", type=argparse.FileType('r'), help="Input file")
-    parser.add_argument("--target", "-t", required=True, choices=["python", "xp","libproc", "telem-dict"], help="Target language")
+    parser.add_argument("--target", "-t", required=True, choices=["python", "xp","libproc", "telem-dict", "datalogger"], help="Target language")
     parser.add_argument("--output", "-o", metavar="PATH", help="Output directory")
 
     args = parser.parse_args()

polyxdr/backends/telem-dict/templates/struct

@@ -1,6 +1,10 @@
 <SENSOR>
    KEY=${key}
-   UNIT=${unit}
-   NAME=${name}
+   UNITS=${doc.unit}
+   NAME=${doc.name}
    DESCRIPTION=${doc.description}
+   LOCATION=${doc.location}
+   SUBSYSTEM=${doc.subsystem}
+   DIVISOR=${doc.divisor}
+   OFFSET=${doc.offset}
 </SENSOR>

polyxdr/ir.py

@@ -16,7 +16,7 @@
 XDRUnion = namedtuple("XDRUnion", ["name", "discriminant", "members"])
 XDRUnionMember = namedtuple("XDRUnionMember", ["case", "declaration"])
 XDRNamespace = namedtuple("XDRNamespace", ["name"])
-XDRFieldDocumentation = namedtuple("XDRFieldDocs", ["key", "name", "description", "offset", "divisor", "conversion", "inverse", "unit", "computed_by", "true_label", "false_label"])
+XDRFieldDocumentation = namedtuple("XDRFieldDocs", ["key", "name", "description", "offset", "divisor", "conversion", "inverse", "unit", "computed_by", "true_label", "false_label", "location", "subsystem", "group"])
 XDRCommand = namedtuple("XDRCommand", ["name", "id", "summary", "param", "response", "types", "autoname"])
 XDRError = namedtuple("XDRError", ["id", "name", "description"])
 

polyxdr/parser.py

@@ -185,6 +185,9 @@ def __init__(self, filename, parentParser):
              P.Optional(g(kw("divisor") + decimal_literal + s(";"))) & \
              P.Optional(g(kw("offset") + decimal_literal + s(";"))) & \
              P.Optional(g(kw("description") + P.QuotedString('"') + s(";"))) & \
+             P.Optional(g(kw("location") + P.QuotedString('"') + s(";"))) & \
+             P.Optional(g(kw("subsystem") + P.QuotedString('"') + s(";"))) & \
+             P.Optional(g(kw("group") + P.QuotedString('"') + s(";"))) & \
              P.Optional(g(kw("true_label") + P.QuotedString('"') + s(";"))) & \
              P.Optional(g(kw("false_label") + P.QuotedString('"') + s(";"))) \
           ) + s("}")
@@ -282,6 +285,9 @@ def xdr_parse_fielddoc(self, x):
       offset = 0
       true_label = ''
       false_label = ''
+      location = ''
+      subsystem = ''
+      group = ''
       for field in x:
          if field[0] == 'key':
             key = field[1]
@@ -303,15 +309,23 @@ def xdr_parse_fielddoc(self, x):
             inv = self.stringify_conversion(field[1])
          if field[0] == 'computed_by':
             computed = self.stringify_conversion(field[1])
+         if field[0] == 'location':
+            location = field[1]
+         if field[0] == 'subsystem':
+            subsystem = field[1]
          if field[0] == 'true_label':
             true_label = field[1]
          if field[0] == 'false_label':
             false_label = field[1]
-      return XDRFieldDocumentation(key, name, desc, offset, divisor, conv, inv, unit, computed, true_label, false_label)
+         if subsystem == '' and group != '':
+            subsystem = group
+         if group == '' and subsystem != '':
+            group = subsystem
+      return XDRFieldDocumentation(key, name, desc, offset, divisor, conv, inv, unit, computed, true_label, false_label, location, subsystem, group)
 
    def xdr_parse_declaration(self, x):
       if x[0] == 'void':
-         return XDRDeclaration(None, 'basic', 'void', None, None, True, XDRFieldDocumentation('', '', '', 0, 1, '', '', '', '', '', ''), 0, 'void')
+         return XDRDeclaration(None, 'basic', 'void', None, None, True, XDRFieldDocumentation('', '', '', 0, 1, '', '', '', '', '', '', '', '', ''), 0, 'void')
       elif x[0] == 'opaque' or x[0] == 'string':
          type = x[0]
          name = x[1]

tests/xp_schema.xp

@@ -89,6 +89,8 @@ struct Status {
       key mag_y;
       unit "rad/s";
       description "y value of mag reading";
+      location "systemboard";
+      subsystem "adcs";
    };
    int mag_z {
       name "Magnetometer Z value";