Merge pull request #47 from robamu-org/eive

SW update

CHANGELOG.md

@@ -11,4 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v1.11.0]
 
 - New API to build service/opcode dictionary
-- Applied consistent formatting with `black` tool
+
+## [v1.10.1]
+
+- Applied consistent formatting with `black` tool
+- Some bugfixes for PUS packet stack

src/tmtccmd/__init__.py

@@ -1,8 +1,8 @@
 VERSION_NAME = "tmtccmd"
 VERSION_MAJOR = 1
 VERSION_MINOR = 10
-VERSION_REVISION = 0
+VERSION_REVISION = 1
 
 # I think this needs to be in string representation to be parsed so we can't
 # use a formatted string here.
-__version__ = "1.10.0"
+__version__ = "1.10.1"

src/tmtccmd/tm/service_23_file_mgmt.py

@@ -50,8 +50,8 @@ def __init__(
         self.data_start_idx = 0
         self.file_info = FileInfo(file_name=file_name, repo_path=repo_path)
         pus_tm = PusTelemetry(
-            service_id=PusServices.SERVICE_23_FILE_MGMT,
-            subservice_id=subservice_id,
+            service=PusServices.SERVICE_23_FILE_MGMT,
+            subservice=subservice_id,
             time=time,
             ssc=ssc,
             source_data=source_data,

src/tmtccmd/tm/service_5_event.py

@@ -35,7 +35,7 @@ def __init__(
     ):
         """Create a Service 5 telemetry instance.
         Use the unpack function to create an instance from a raw bytestream instead.
-        :param subservice_id: Subservice ID
+        :param subservice: Subservice ID
         :param time: CDS Short Timecode
         :param object_id: 4 byte object ID
         :raises ValueError: Invalid input arguments
@@ -148,7 +148,7 @@ def __init_without_base(instance: Service5TM, set_attrs_from_tm_data: bool = Fal
             )
             raise ValueError
         if set_attrs_from_tm_data:
-            instance._event_id = struct.unpack(">H", tm_data[0:2])[0]
-            instance._object_id.set_from_bytes(tm_data[2:6])
-            instance._param_1 = struct.unpack(">I", tm_data[6:10])[0]
-            instance._param_2 = struct.unpack(">I", tm_data[10:14])[0]
+            instance._event_id = struct.unpack('>H', tm_data[0:2])[0]
+            instance._object_id.from_bytes(tm_data[2:6])
+            instance._param_1 = struct.unpack('>I', tm_data[6:10])[0]
+            instance._param_2 = struct.unpack('>I', tm_data[10:14])[0]

src/tmtccmd/tm/service_8_functional_cmd.py

@@ -43,8 +43,8 @@ def __init__(
         source_data.extend(struct.pack("!I", self._action_id))
         source_data.extend(self._custom_data)
         pus_tm = PusTelemetry(
-            service_id=5,
-            subservice_id=subservice_id,
+            service=5,
+            subservice=subservice_id,
             time=time,
             ssc=ssc,
             source_data=source_data,