Use correct enum size when generating tlm packet structures (#4333)

* Use correct enum size when generating tlm packet structures (#4261)

Instead of hardcoding enums as 4 bytes, the enum size should be parsed from the topology XML.

* Override CI configuration to use appropriate settings and target refs for v3.6 builds

Author: nathancheek

.github/workflows/build-test-rpi.yml

@@ -58,6 +58,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         sparse-checkout: 'requirements.txt'
+        sparse-checkout-cone-mode: false
     - name: "Setup environment"
       run: |
         python -m venv venv

.github/workflows/cookiecutters-test.yml

@@ -26,12 +26,14 @@ jobs:
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: nasa/fprime-tools
+      default_target_ref: v3.6.1
 
   get-bootstrap-branch:
     name: "Get fprime-bootstrap target branch"
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: nasa/fprime-bootstrap
+      default_target_ref: v1.4.0
 
   # -------- Install target versions of the cookiecutter templates and validate -------
   Validate:

.github/workflows/ext-build-hello-world.yml

@@ -20,6 +20,7 @@ jobs:
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: fprime-community/fprime-tutorial-hello-world
+      default_target_ref: v3.6.0
 
   run:
     needs: get-branch

.github/workflows/ext-build-led-blinker.yml

@@ -20,6 +20,7 @@ jobs:
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: fprime-community/fprime-workshop-led-blinker
+      default_target_ref: v3.6.0
 
   run:
     needs: get-branch

.github/workflows/ext-build-math-comp.yml

@@ -20,6 +20,7 @@ jobs:
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: fprime-community/fprime-tutorial-math-component
+      default_target_ref: v3.6.0
 
   run:
     needs: get-branch

.github/workflows/ext-raspberry-led-blinker.yml

@@ -24,6 +24,7 @@ jobs:
     uses: ./.github/workflows/reusable-get-pr-branch.yml
     with:
       target_repository: fprime-community/fprime-workshop-led-blinker
+      default_target_ref: v3.6.0
 
   cross-compilation:
     name: "Cross Compilation"
@@ -74,6 +75,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           sparse-checkout: 'requirements.txt'
+          sparse-checkout-cone-mode: false
       - name: "Setup environment"
         run: |
           python -m venv venv

Autocoders/Python/bin/tlm_packet_gen.py

@@ -224,14 +224,11 @@ def generate_channel_size_dict(self, the_parsed_topology_xml, xml_filename):
                     if self.verbose:
                         print("Processing Channel %s" % channel_name)
                     chan_type = chan.get_type()
-                    # if channel is enum
-                    if type(chan_type) == type(tuple()):
-                        chan_size = 4
                     # if channel type is string
                     #                    elif chan_type == "string":
                     #                        chan_size = int(chan.get_size()) + 2 # FIXME: buffer size storage size magic number - needs to be turned into a constant
                     # if channel is serializable
-                    elif chan_type in self.size_dict:
+                    if chan_type in self.size_dict:
                         chan_size = self.size_dict[chan_type]
                     else:
                         chan_size = self.get_type_size(chan_type, chan.get_size())
@@ -506,10 +503,7 @@ def process_serializable_files(self, serializable_file_list):
                 member_comment,
                 _,
             ) in serializable_model.get_members():
-                # if enumeration
-                if type(member_type) == type(tuple()):
-                    type_size = 4  # Fixme: can we put this in a constant somewhere?
-                elif (
+                if (
                     member_type in self.size_dict.keys()
                 ):  # See if it is a registered type
                     type_size = self.size_dict[member_type]
@@ -536,9 +530,9 @@ def process_enum_files(self, enum_file_list):
             enum_file = search_for_file("Enumeration", enum_file)
             enum_model = XmlEnumParser.XmlEnumParser(enum_file)
             enum_type = enum_model.get_namespace() + "::" + enum_model.get_name()
-            self.add_type_size(
-                enum_type, 4
-            )  # Fixme: can we put this in a constant somewhere?
+            serialize_type = enum_model.get_serialize_type()
+            enum_size = self.get_type_size(serialize_type, None)
+            self.add_type_size(enum_type, enum_size)
 
     def process_array_files(self, array_file_list):
         for array_file in array_file_list:
@@ -552,9 +546,7 @@ def process_array_files(self, array_file_list):
             array_size = int(array_model.get_size())
             elem_type = array_model.get_type()
             elem_type_size = None
-            if type(elem_type) == type(tuple()):
-                elem_type_size = 4  # Fixme: can we put this in a constant somewhere?
-            elif elem_type in self.size_dict.keys():  # See if it is a registered type
+            if elem_type in self.size_dict.keys():  # See if it is a registered type
                 elem_type_size = self.size_dict[elem_type]
             else:
                 elem_type_size = self.get_type_size(elem_type, 1)  # Fixme: strings?