fprime-gds 4.0.2a4__tar.gz → 4.0.2a5__tar.gz

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.2a4
+Version: 4.0.2a5
 Summary: F Prime Flight Software Ground Data System layer
 Author-email: Michael Starch <Michael.D.Starch@jpl.nasa.gov>, Thomas Boyer-Chammard <Thomas.Boyer.Chammard@jpl.nasa.gov>
 License: 

fprime_gds-4.0.2a5/src/fprime_gds/common/communication/ccsds/apid.py

@@ -0,0 +1,21 @@
+"""ccsds.apid: APID mapping functions for F´ data"""
+
+from fprime_gds.common.utils.data_desc_type import DataDescType
+from fprime.common.models.serialize.numerical_types import NumericalType
+
+
+class APID(object):
+    """APID implementations"""
+
+    # TODO: use the DataDescType configured by loading the dictionary
+
+    @classmethod
+    def from_type(cls, data_type: DataDescType):
+        """Map from data description type to APID"""
+        return data_type.value
+
+    @classmethod
+    def from_data(cls, data, packet_descriptor_type: NumericalType):
+        """Map from data bytes to APID"""
+        packet_descriptor_type.deserialize(data, offset=0)
+        return cls.from_type(DataDescType(packet_descriptor_type.val))

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/communication/ccsds/space_packet.py

@@ -10,6 +10,7 @@ from spacepackets.ccsds.spacepacket import SpacePacketHeader, PacketType, SpaceP
 from fprime_gds.common.communication.framing import FramerDeframer
 from fprime_gds.plugin.definitions import gds_plugin_implementation, gds_plugin
 from fprime_gds.common.utils.data_desc_type import DataDescType
+from fprime_gds.common.utils.config_manager import ConfigManager
 
 from .apid import APID
 import logging
@@ -29,17 +30,21 @@ class SpacePacketFramerDeframer(FramerDeframer):
     IDLE_APID = 0x7FF  # max 11 bit value per protocol specification
 
     def __init__(self):
-        # self.sequence_number = 0
         # Map APID to sequence counts
         self.apid_to_sequence_count_map = dict()
         for key in DataDescType:
             self.apid_to_sequence_count_map[key.value] = 0
+        self.packet_descriptor_type = ConfigManager.get_instance().get_type(
+            "FwPacketDescriptorType"
+        )
 
     def frame(self, data):
         """Frame the supplied data in Space Packet"""
         # The protocol defines length token to be number of bytes minus 1
         data_length_token = len(data) - 1
-        apid = APID.from_data(data)
+        # Extract the APID from the data
+        # F' has the packet descriptor (= APID currently) as first n bytes of the data
+        apid = APID.from_data(data, self.packet_descriptor_type)
         space_header = SpacePacketHeader(
             packet_type=PacketType.TC,
             apid=apid,

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/communication/framing.py

@@ -47,7 +47,7 @@ class FramerDeframer(abc.ABC):
         self, data: bytes, no_copy=False
     ) -> tuple[(bytes | None), bytes, bytes]:
         """
-        Deframes the incoming data from the specified format. 
+        Deframes the incoming data from the specified format.
         Produces:
         - One packet, or None if no packet found
         - leftover bytes (not consumed yet)
@@ -80,7 +80,7 @@ class FramerDeframer(abc.ABC):
             # Deframe and return only on None
             (deframed, data, discarded) = self.deframe(data, no_copy=True)
             discarded_aggregate += discarded
-            if deframed is None: # No more packets available, return aggregate
+            if deframed is None:  # No more packets available, return aggregate
                 return packets, data, discarded_aggregate
             packets.append(deframed)
 

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/encoders/encoder.py

@@ -20,6 +20,7 @@ purpose is to define the interface for an encoder.
 
 @bug No known bugs
 """
+
 import abc
 import logging
 

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/pipeline/standard.py

@@ -61,7 +61,7 @@ class StandardPipeline:
         dictionaries,
         file_store,
         logging_prefix=None,
-        data_logging_enabled=True
+        data_logging_enabled=True,
     ):
         """
         Setup the standard pipeline for moving data from the middleware layer through the GDS layers using the standard

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/testing_fw/pytest_integration.py

@@ -56,7 +56,8 @@ def pytest_addoption(parser):
     parser.addoption(
         "--deployment-config",
         action="store",
-        help="Path to JSON configuration file for mapping deployment components"
+        type=Path,
+        help="Path to JSON configuration file for mapping deployment components",
     )
 
 def pytest_configure(config):

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/common/utils/data_desc_type.py

@@ -3,6 +3,7 @@ DataDescType:
 
 Defines an enumeration that represents each type of data packet that can be downlinked.
 """
+
 from enum import Enum
 
 

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/executables/cli.py

@@ -318,7 +318,6 @@ class ConfigDrivenParser(ParserBase):
 
     DEFAULT_CONFIGURATION_PATH = Path("fprime-gds.yml")
 
-
     @classmethod
     def set_default_configuration(cls, path: Path):
         """Set path for (global) default configuration file
@@ -417,7 +416,7 @@ class ConfigDrivenParser(ParserBase):
                     relative_base = args.config.parent.absolute()
 
                     def path_constructor(loader, node):
-                        """ Processes !PATH annotations as relative to current file """
+                        """Processes !PATH annotations as relative to current file"""
                         calculated_path = relative_base / loader.construct_scalar(node)
                         return calculated_path
 
@@ -1028,7 +1027,7 @@ class DictionaryParser(DetectionParser):
         elif args.dictionary is None:
             args = super().handle_arguments(args, **kwargs)
             args.dictionary = find_dict(args.deployment)
-        
+
         # Setup dictionaries encoders and decoders
         dictionaries = Dictionaries()
 
@@ -1108,7 +1107,7 @@ class StandardPipelineParser(CompositeParser):
             "dictionaries": args_ns.dictionaries,
             "file_store": args_ns.files_storage_directory,
             "logging_prefix": args_ns.logs,
-            "data_logging_enabled": not args_ns.disable_data_logging
+            "data_logging_enabled": not args_ns.disable_data_logging,
         }
         pipeline = pipeline if pipeline else StandardPipeline()
         pipeline.transport_implementation = args_ns.connection_transport
@@ -1131,6 +1130,7 @@ class CommParser(CompositeParser):
         CommExtraParser,
         MiddleWareParser,
         LogDeployParser,
+        DictionaryParser,  # needed to get types from dictionary for framing
     ]
 
     def __init__(self):

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds/executables/comm.py

@@ -51,8 +51,6 @@ def main():
     Plugins.system(["communication", "framing"])
     args, _ = fprime_gds.executables.cli.ParserBase.parse_args(
         [
-            fprime_gds.executables.cli.LogDeployParser,
-            fprime_gds.executables.cli.MiddleWareParser,
             fprime_gds.executables.cli.CommParser,
             fprime_gds.executables.cli.PluginArgumentParser,
         ],

{fprime_gds-4.0.2a4 → fprime_gds-4.0.2a5}/src/fprime_gds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.2a4
+Version: 4.0.2a5
 Summary: F Prime Flight Software Ground Data System layer
 Author-email: Michael Starch <Michael.D.Starch@jpl.nasa.gov>, Thomas Boyer-Chammard <Thomas.Boyer.Chammard@jpl.nasa.gov>
 License: 

fprime_gds-4.0.2a4/src/fprime_gds/common/communication/ccsds/apid.py

@@ -1,19 +0,0 @@
-""" ccsds.apid: APID mapping functions for F´ data """
-from fprime_gds.common.utils.data_desc_type import DataDescType
-from fprime.common.models.serialize.numerical_types import U32Type
-
-class APID(object):
-    """ APID implementations """
-    #TODO: use the DataDescType configured by loading the dictionary
-
-    @classmethod
-    def from_type(cls, data_type: DataDescType):
-        """ Map from data description type to APID """
-        return data_type.value
-
-    @classmethod
-    def from_data(cls, data):
-        """ Map from data bytes to APID """
-        u32_type = U32Type()
-        u32_type.deserialize(data, offset=0)
-        return cls.from_type(DataDescType(u32_type.val))