From 05dd17386070b9f333977f1f2b9f5651f9053b65 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 15:43:29 +0200
Subject: [PATCH] fix for reboot commands

---
 ...{Reboot_0_0.run.xml => Reboot 0 0.run.xml} |  4 +--
 ...{Reboot_0_1.run.xml => Reboot 0 1.run.xml} |  2 +-
 ...{Reboot_1_0.run.xml => Reboot 1 0.run.xml} |  2 +-
 ...{Reboot_1_1.run.xml => Reboot 1 1.run.xml} |  2 +-
 pus_tc/system/core.py                         | 32 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename .run/{Reboot_0_0.run.xml => Reboot 0 0.run.xml} (86%)
 rename .run/{Reboot_0_1.run.xml => Reboot 0 1.run.xml} (92%)
 rename .run/{Reboot_1_0.run.xml => Reboot 1 0.run.xml} (92%)
 rename .run/{Reboot_1_1.run.xml => Reboot 1 1.run.xml} (92%)

diff --git a/.run/Reboot_0_0.run.xml b/.run/Reboot 0 0.run.xml
similarity index 86%
rename from .run/Reboot_0_0.run.xml
rename to .run/Reboot 0 0.run.xml
index 0d694a6..7dcb8c9 100644
--- a/.run/Reboot_0_0.run.xml
+++ b/.run/Reboot 0 0.run.xml	
@@ -12,8 +12,8 @@
     <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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s core -o reboot_0_0 -d 4" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_00 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_0_1.run.xml b/.run/Reboot 0 1.run.xml
similarity index 92%
rename from .run/Reboot_0_1.run.xml
rename to .run/Reboot 0 1.run.xml
index 4caf0e3..9e981a2 100644
--- a/.run/Reboot_0_1.run.xml
+++ b/.run/Reboot 0 1.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="-s core -o reboot_0_1 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_01 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_1_0.run.xml b/.run/Reboot 1 0.run.xml
similarity index 92%
rename from .run/Reboot_1_0.run.xml
rename to .run/Reboot 1 0.run.xml
index a187704..6fb49d8 100644
--- a/.run/Reboot_1_0.run.xml
+++ b/.run/Reboot 1 0.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="-s core -o reboot_1_0 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_10 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_1_1.run.xml b/.run/Reboot 1 1.run.xml
similarity index 92%
rename from .run/Reboot_1_1.run.xml
rename to .run/Reboot 1 1.run.xml
index 1d1cbfa..f796895 100644
--- a/.run/Reboot_1_1.run.xml
+++ b/.run/Reboot 1 1.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="-s core -o reboot_1_1 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_11 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 565f7e0..a7a2e92 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -32,22 +32,22 @@ class SetIds(enum.IntEnum):
 
 
 class OpCodes:
-    REBOOT_XSC = ["0", "reboot-xsc"]
-    XSC_REBOOT_SELF = ["1", "reboot-self"]
-    XSC_REBOOT_0_0 = ["2", "reboot-00"]
-    XSC_REBOOT_0_1 = ["3", "reboot-01"]
-    XSC_REBOOT_1_0 = ["4", "reboot-10"]
-    XSC_REBOOT_1_1 = ["5", "reboot-11"]
-    REBOOT_FULL = ["6", "reboot-regular"]
-    GET_HK = ["7", "get-hk"]
-    ENABLE_REBOOT_FILE_HANDLING = ["32", "rbh-off"]
-    DISABLE_REBOOT_FILE_HANDLING = ["33", "rbh-on"]
-    RESET_ALL_REBOOT_COUNTERS = ["34", "rbh-reset-a"]
-    RESET_REBOOT_COUNTER_00 = ["35", "rbh-reset-00"]
-    RESET_REBOOT_COUNTER_01 = ["36", "rbh-reset-01"]
-    RESET_REBOOT_COUNTER_10 = ["37", "rbh-reset-10"]
-    RESET_REBOOT_COUNTER_11 = ["38", "rbh-reset-11"]
-    SET_MAX_REBOOT_CNT = ["39", "rbh-max-cnt"]
+    REBOOT_XSC = ["0", "reboot_xsc"]
+    XSC_REBOOT_SELF = ["1", "reboot_self"]
+    XSC_REBOOT_0_0 = ["2", "reboot_00"]
+    XSC_REBOOT_0_1 = ["3", "reboot_01"]
+    XSC_REBOOT_1_0 = ["4", "reboot_10"]
+    XSC_REBOOT_1_1 = ["5", "reboot_11"]
+    REBOOT_FULL = ["6", "reboot_regular"]
+    GET_HK = ["7", "get_hk"]
+    ENABLE_REBOOT_FILE_HANDLING = ["32", "rbh_off"]
+    DISABLE_REBOOT_FILE_HANDLING = ["33", "rbh_on"]
+    RESET_ALL_REBOOT_COUNTERS = ["34", "rbh_reset_a"]
+    RESET_REBOOT_COUNTER_00 = ["35", "rbh_reset_00"]
+    RESET_REBOOT_COUNTER_01 = ["36", "rbh_reset_01"]
+    RESET_REBOOT_COUNTER_10 = ["37", "rbh_reset_10"]
+    RESET_REBOOT_COUNTER_11 = ["38", "rbh_reset_11"]
+    SET_MAX_REBOOT_CNT = ["39", "rbh_max_cnt"]
 
 
 class Info: