From 9eedbe3810bd03d3181c86a6f7c117f919d997dc Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 Oct 2022 12:26:18 +0200
Subject: [PATCH] start implementing closure support for CFDP

---
 fsfw                                          |  2 +-
 .../CFDP_Test_NAK_No_Closure.xml              | 24 +++++++++++++++++++
 ...est.xml => CFDP_Test_NAK_With_Closure.xml} |  2 +-
 tmtc/common_tmtc                              |  2 +-
 tmtc/deps/spacepackets                        |  2 +-
 tmtc/deps/tmtccmd                             |  2 +-
 tmtc/tmtcc.py                                 |  3 ++-
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 tmtc/.idea/runConfigurations/CFDP_Test_NAK_No_Closure.xml
 rename tmtc/.idea/runConfigurations/{CFDP_Test.xml => CFDP_Test_NAK_With_Closure.xml} (87%)

diff --git a/fsfw b/fsfw
index bdbe0cc..9f81926 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit bdbe0cc9da5edcaa8b01af4f6462a2f46d4628bd
+Subproject commit 9f81926aeccf65149db02bf58d67326e7ca10c63
diff --git a/tmtc/.idea/runConfigurations/CFDP_Test_NAK_No_Closure.xml b/tmtc/.idea/runConfigurations/CFDP_Test_NAK_No_Closure.xml
new file mode 100644
index 0000000..6a339d9
--- /dev/null
+++ b/tmtc/.idea/runConfigurations/CFDP_Test_NAK_No_Closure.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Test NAK No Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp filetest/cfdp_test.txt /tmp/hello-cpy.txt --no-closure -d 0.2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <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
diff --git a/tmtc/.idea/runConfigurations/CFDP_Test.xml b/tmtc/.idea/runConfigurations/CFDP_Test_NAK_With_Closure.xml
similarity index 87%
rename from tmtc/.idea/runConfigurations/CFDP_Test.xml
rename to tmtc/.idea/runConfigurations/CFDP_Test_NAK_With_Closure.xml
index f5732da..c6f318d 100644
--- a/tmtc/.idea/runConfigurations/CFDP_Test.xml
+++ b/tmtc/.idea/runConfigurations/CFDP_Test_NAK_With_Closure.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CFDP Test" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+  <configuration default="false" name="CFDP Test NAK With Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 73ba9f5..3420346 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 73ba9f5d90a91badc765c2ae980a50b0fdc49b74
+Subproject commit 34203461faa9cfa48b097329c14c2ffc7aadad9c
diff --git a/tmtc/deps/spacepackets b/tmtc/deps/spacepackets
index 66fa442..8362245 160000
--- a/tmtc/deps/spacepackets
+++ b/tmtc/deps/spacepackets
@@ -1 +1 @@
-Subproject commit 66fa442c837f00ce16412d5b730b9f5d7f375a16
+Subproject commit 83622451c3e025bf8e5995344f3adf4044a69301
diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd
index 95fd481..25b9943 160000
--- a/tmtc/deps/tmtccmd
+++ b/tmtc/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 95fd4813c8ac1b15ff859f28d1a64c0e7b04cc1f
+Subproject commit 25b994369661e8d6b7d52e3180634fcab230e3f8
diff --git a/tmtc/tmtcc.py b/tmtc/tmtcc.py
index a10658c..de0ec13 100755
--- a/tmtc/tmtcc.py
+++ b/tmtc/tmtcc.py
@@ -48,7 +48,8 @@ def main():
                 LOGGER.info("TMTC Client in IDLE mode")
                 time.sleep(3.0)
             elif state.request == BackendRequest.DELAY_LISTENER:
-                if tc_handler.cfdp_done:
+                if tc_handler.cfdp_done():
+                    LOGGER.info("CFDP transaction done, closing client")
                     sys.exit(0)
                 time.sleep(0.8)
             elif state.request == BackendRequest.DELAY_CUSTOM: