Merge branch 'mueller_branch' into gerhards-servie20Test

.idea/runConfigurations/tmtcclient_Module_Test_Serial.xml

@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
-    <option name="PARAMETERS" value="-m 5 -c 1 --hk --np" />
+    <option name="PARAMETERS" value="-m 5 -c 1 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />

.idea/runConfigurations/tmtcclient_Service_5_QEMU_.xml

+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcclient Service 5 QEMU " type="PythonConfigurationType" factoryName="Python" folderName="QEMU Communication">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -s 5 -c 2 -t 2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

.idea/runConfigurations/tmtcclient_Service_8_QEMU__.xml

+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcclient Service 8 QEMU  " type="PythonConfigurationType" factoryName="Python" folderName="QEMU Communication">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 3 -s 8 -c 2 -t 2.5" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

.idea/runConfigurations/tmtcclient_Software_QEMU_.xml

+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcclient Software QEMU " type="PythonConfigurationType" factoryName="Python" folderName="QEMU Communication">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
+    <option name="PARAMETERS" value="-m 4 -c 2 -t 3" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file

tc/obsw_pus_tc_base.py

@@ -53,7 +53,7 @@ class PusTelecommand:
         self.packet_id = (self.packet_id_bytes[0] << 8) | self.packet_id_bytes[1]
         self.ssc = ssc
         self.psc = (ssc & 0x3FFF) | (0xC0 << 8)
-        self.pus_version_and_ack_byte = 0b00011111
+        self.pus_version_and_ack_byte = 0b0001_1111
         self.service = service
         self.subservice = subservice
         self.source_id = source_id

test/obsw_pus_service_test.py

@@ -27,8 +27,8 @@ class TestService2(TestService):
         super().setUpClass()
         print("Testing Service 2")
         # all commands must be sent sequentially, not as a burst
-        cls.wait_intervals = [1, 2, 3, 4]
-        cls.wait_time = [2.5, 2.5, 2.5, 2.5]
+        cls.wait_intervals = [1, 2, 3, 4, 5]
+        cls.wait_time = [2.0, 2.0, 2.0, 2.0, 2.0]
         pack_service2_test_into(cls.test_queue)
 
     def test_service2(self):