From 80fd007ef2c89586f453c89d9f11c18f4145997a Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 3 Dec 2020 23:21:08 +0100
Subject: [PATCH] some more renaming and refactoring

---
 pus_tc/tmtcc_pus_tc_utility.py                                | 2 +-
 pus_tc/tmtcc_tc_core.py                                       | 2 +-
 pus_tc/tmtcc_tc_gps.py                                        | 2 +-
 pus_tc/tmtcc_tc_image_handler.py                              | 2 +-
 pus_tc/tmtcc_tc_packer_hook.py                                | 4 ++--
 pus_tc/tmtcc_tc_service23_sdcard.py                           | 2 +-
 ...ervice2_raw_commanding.py => tmtcc_tc_service2_raw_cmd.py} | 2 +-
 ...vice8_func_commanding.py => tmtcc_tc_service8_func_cmd.py} | 2 +-
 tmtc_core                                                     | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename pus_tc/{tmtcc_tc_service2_raw_commanding.py => tmtcc_tc_service2_raw_cmd.py} (96%)
 rename pus_tc/{tmtcc_tc_service8_func_commanding.py => tmtcc_tc_service8_func_cmd.py} (96%)

diff --git a/pus_tc/tmtcc_pus_tc_utility.py b/pus_tc/tmtcc_pus_tc_utility.py
index 2585a89..989389f 100644
--- a/pus_tc/tmtcc_pus_tc_utility.py
+++ b/pus_tc/tmtcc_pus_tc_utility.py
@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import generate_action_command
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import generate_action_command
 from config.tmtcc_config import LED_TASK_ID
 
 
diff --git a/pus_tc/tmtcc_tc_core.py b/pus_tc/tmtcc_tc_core.py
index c4d298a..e427ddf 100644
--- a/pus_tc/tmtcc_tc_core.py
+++ b/pus_tc/tmtcc_tc_core.py
@@ -1,7 +1,7 @@
 from typing import Deque
 
 from config.tmtcc_config import CORE_CONTROLLER_ID
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
 
 
diff --git a/pus_tc/tmtcc_tc_gps.py b/pus_tc/tmtcc_tc_gps.py
index ed1d3af..73a8b1d 100644
--- a/pus_tc/tmtcc_tc_gps.py
+++ b/pus_tc/tmtcc_tc_gps.py
@@ -8,7 +8,7 @@
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from pus_tc.tmtcc_tc_service2_raw_commanding import pack_mode_data
+from pus_tc.tmtcc_tc_service2_raw_cmd import pack_mode_data
 
 import config.tmtcc_config as g
 
diff --git a/pus_tc/tmtcc_tc_image_handler.py b/pus_tc/tmtcc_tc_image_handler.py
index 7b0d42d..e2dd6cf 100644
--- a/pus_tc/tmtcc_tc_image_handler.py
+++ b/pus_tc/tmtcc_tc_image_handler.py
@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from pus_tc.tmtcc_tc_service20_parameter import pack_boolean_parameter_setting
 from tmtc_core.utility.obsw_logger import get_logger
 from config.tmtcc_config import SW_IMAGE_HANDLER_ID
diff --git a/pus_tc/tmtcc_tc_packer_hook.py b/pus_tc/tmtcc_tc_packer_hook.py
index 01e8042..c78a105 100644
--- a/pus_tc/tmtcc_tc_packer_hook.py
+++ b/pus_tc/tmtcc_tc_packer_hook.py
@@ -6,9 +6,9 @@ import config.tmtcc_config as g
 from tmtc_core.utility.obsw_logger import get_logger
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT, PusTelecommand
 
-from pus_tc.tmtcc_tc_service2_raw_commanding import pack_service2_test_into
+from pus_tc.tmtcc_tc_service2_raw_cmd import pack_service2_test_into
 from pus_tc.tmtcc_tc_service3_housekeeping import pack_service3_test_into
-from pus_tc.tmtcc_tc_service8_func_commanding import pack_service8_test_into
+from pus_tc.tmtcc_tc_service8_func_cmd import pack_service8_test_into
 from pus_tc.tmtcc_tc_service9_time import pack_service9_test_into
 from pus_tc.tmtcc_tc_service23_sdcard import pack_service23_commands_into
 from pus_tc.tmtcc_tc_service20_parameter import pack_service20_test_into
diff --git a/pus_tc/tmtcc_tc_service23_sdcard.py b/pus_tc/tmtcc_tc_service23_sdcard.py
index ce88f22..1481496 100644
--- a/pus_tc/tmtcc_tc_service23_sdcard.py
+++ b/pus_tc/tmtcc_tc_service23_sdcard.py
@@ -9,7 +9,7 @@ from typing import Deque, Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/pus_tc/tmtcc_tc_service2_raw_commanding.py b/pus_tc/tmtcc_tc_service2_raw_cmd.py
similarity index 96%
rename from pus_tc/tmtcc_tc_service2_raw_commanding.py
rename to pus_tc/tmtcc_tc_service2_raw_cmd.py
index a8c24d2..deee9e6 100644
--- a/pus_tc/tmtcc_tc_service2_raw_commanding.py
+++ b/pus_tc/tmtcc_tc_service2_raw_cmd.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service2_raw_commanding.py
+@file   tmtcc_tc_service2_raw_cmd.py
 @brief  PUS Service 2: Device Access, Native low-level commanding
 @author R. Mueller
 @date   01.11.2019
diff --git a/pus_tc/tmtcc_tc_service8_func_commanding.py b/pus_tc/tmtcc_tc_service8_func_cmd.py
similarity index 96%
rename from pus_tc/tmtcc_tc_service8_func_commanding.py
rename to pus_tc/tmtcc_tc_service8_func_cmd.py
index 673a2e8..dfa5278 100644
--- a/pus_tc/tmtcc_tc_service8_func_commanding.py
+++ b/pus_tc/tmtcc_tc_service8_func_cmd.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service8_func_commanding.py
+@file   tmtcc_tc_service8_func_cmd.py
 @brief  PUS Service 8:  High-level functional commanding.
 @author R. Mueller
 @date   01.11.2019
diff --git a/tmtc_core b/tmtc_core
index 82d4050..b11f8fd 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 82d405069bdfc1733f8e2133d15f1b77a86d73eb
+Subproject commit b11f8fd92ab9a17b8f0e1db9dd8eea2b6fc16cc2
-- 
GitLab