bump generated csvs

.run/Subsystem OFF.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem OFF" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o safe -l" />
+    <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>

.run/tmtc listener.run.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$/tmtcc.py" />
-    <option name="PARAMETERS" value="-l" />
+    <option name="PARAMETERS" value="tmtc -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

config/events.csv

@@ -132,12 +132,13 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
 12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
 12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
-12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/obc/PdecHandler.h
-12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/obc/PdecHandler.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/ipcore/PdecHandler.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/PdecHandler.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/PdecHandler.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/ipcore/PdecHandler.h
+12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/ipcore/PdecHandler.h
+12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/PdecHandler.h
+12407;0x3077;POLL_ERROR_PDEC;MEDIUM;;linux/ipcore/PdecHandler.h
 12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
 12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
 12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h

config/returnvalues.csv

@@ -1,7 +1,7 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
 0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h

pus_tc/cmd_definitions.py

@@ -21,13 +21,6 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
         info="PUS Service 5 Event",
         op_code_entry=srv_5,
     )
-    srv_17 = OpCodeEntry()
-    srv_17.add("0", "Ping Test")
-    def_wrapper.add_service(
-        name=CoreServiceList.SERVICE_17_ALT,
-        info="PUS Service 17 Test",
-        op_code_entry=srv_17,
-    )
     call_all_definitions_providers(def_wrapper)
     return def_wrapper
 

pus_tc/procedure_packer.py

@@ -84,11 +84,6 @@ def handle_default_procedure(
     obj_id_man = get_object_ids()
     if service == CoreServiceList.SERVICE_5.value:
         return pack_generic_service_5_test_into(q=queue_helper)
-    if (
-        service == CoreServiceList.SERVICE_17
-        or service == CoreServiceList.SERVICE_17_ALT
-    ):
-        return queue_helper.add_pus_tc(pack_service_17_ping_command())
     if service == CoreServiceList.SERVICE_200.value:
         return pack_service_200_test_into(q=queue_helper)
     if service == CustomServiceList.P60DOCK.value:
@@ -105,8 +100,6 @@ def handle_default_procedure(
     if service == CustomServiceList.ACU.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(ACU_HANDLER_ID))
         return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
-    # if service == CustomServiceList.BPX_BATTERY.value:
-    #    return pack_bpx_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TMP1075_1.value:

tmtc/__init__.py

@@ -1 +1,2 @@
 from .acs_subsystem import add_acs_subsystem_cmds
+from .test import add_test_defs

tmtc/test.py

@@ -0,0 +1,65 @@
+from spacepackets.ecss import PusTelecommand, PusServices
+from tmtccmd.config import CoreServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCodes:
+    PING = "ping"
+    TRIGGER_EVENT = "trig_event"
+    PING_WITH_DATA = "ping_with_data"
+
+
+class Info:
+    PING = "Simple Ping and Connection Test"
+    TRIGGER_EVENT = "Trigger an event"
+    PING_WITH_DATA = "Ping with data. Size of sent data is sent back"
+
+
+@tmtc_definitions_provider
+def add_test_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCodes.PING, info=Info.PING)
+    oce.add(keys=OpCodes.TRIGGER_EVENT, info=Info.TRIGGER_EVENT)
+    oce.add(keys=OpCodes.PING_WITH_DATA, info=Info.PING_WITH_DATA)
+
+    defs.add_service(
+        name=CoreServiceList.SERVICE_17_ALT,
+        info="PUS 17 Test Service",
+        op_code_entry=oce,
+    )
+
+
+@service_provider(CoreServiceList.SERVICE_17_ALT)
+def pack_test_command(p: ServiceProviderParams):
+    info = p.info
+    q = p.queue_helper
+    if info.op_code == OpCodes.PING:
+        q.add_log_cmd("Sending PUS TC [17,1]")
+        q.add_pus_tc(pack_service_17_ping_command())
+    if info.op_code == OpCodes.TRIGGER_EVENT:
+        q.add_log_cmd("Sending PUS TC Event Trigger [17, 128]")
+        q.add_pus_tc(PusTelecommand(service=PusServices.S17_TEST, subservice=128))
+    if info.op_code == OpCodes.PING_WITH_DATA:
+        q.add_log_cmd("Sending Ping With Data, Size Reported Back [17, 129]")
+        while True:
+            data_size = int(input("Please specify data size [0-1024]: "))
+            if data_size < 0 or data_size > 1024:
+                print("Invalid data size")
+            break
+        dummy_data = bytearray()
+        next_byte = True
+        for i in range(data_size):
+            dummy_data.append(int(next_byte))
+            next_byte = not next_byte
+        q.add_pus_tc(
+            PusTelecommand(
+                service=PusServices.S17_TEST, subservice=130, app_data=dummy_data
+            )
+        )

tmtcc.py

@@ -227,10 +227,13 @@ class TcHandler(TcHandlerBase):
             pus_verificator=pus_verificator,
         )
         self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper
-        # self.cfdp_counter = 0
 
     def cfdp_done(self) -> bool:
-        return not self.cfdp_in_ccsds_wrapper.handler.put_request_pending()
+        if self.cfdp_handler_started:
+            if not self.cfdp_in_ccsds_wrapper.handler.put_request_pending():
+                self.cfdp_handler_started = False
+                return True
+        return False
 
     def feed_cb(self, info: ProcedureWrapper, wrapper: FeedWrapper):
         self.queue_helper.queue_wrapper = wrapper.queue_wrapper