From 986459988955ab49f46c051b42e2b48032f5247f Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 3 Dec 2020 23:18:05 +0100
Subject: [PATCH] renaming effort
---
pus_tc/tmtcc_pus_tc_utility.py | 2 +-
...s_service17.py => tmtcc_service17_test.py} | 2 +-
pus_tc/tmtcc_tc_core.py | 2 +-
pus_tc/{obsw_tc_gps.py => tmtcc_tc_gps.py} | 4 ++--
...e_handler.py => tmtcc_tc_image_handler.py} | 4 ++--
pus_tc/tmtcc_tc_packer_hook.py | 20 +++++++++----------
...vice200.py => tmtcc_tc_service200_mode.py} | 2 +-
...e20.py => tmtcc_tc_service20_parameter.py} | 4 ++--
pus_tc/tmtcc_tc_service23_sdcard.py | 2 +-
...py => tmtcc_tc_service2_raw_commanding.py} | 4 ++--
...3.py => tmtcc_tc_service3_housekeeping.py} | 2 +-
...service5.py => tmtcc_tc_service5_event.py} | 4 ++--
...y => tmtcc_tc_service8_func_commanding.py} | 4 ++--
..._service9.py => tmtcc_tc_service9_time.py} | 2 +-
tmtc_core | 2 +-
15 files changed, 30 insertions(+), 30 deletions(-)
rename pus_tc/{tmtcc_pus_service17.py => tmtcc_service17_test.py} (96%)
rename pus_tc/{obsw_tc_gps.py => tmtcc_tc_gps.py} (96%)
rename pus_tc/{tmtcc_image_handler.py => tmtcc_tc_image_handler.py} (94%)
rename pus_tc/{tmtcc_tc_mode_service200.py => tmtcc_tc_service200_mode.py} (95%)
rename pus_tc/{tmtcc_tc_service20.py => tmtcc_tc_service20_parameter.py} (98%)
rename pus_tc/{obsw_tc_service2.py => tmtcc_tc_service2_raw_commanding.py} (94%)
rename pus_tc/{obsw_tc_service3.py => tmtcc_tc_service3_housekeeping.py} (96%)
rename pus_tc/{tmtcc_tc_service5.py => tmtcc_tc_service5_event.py} (92%)
rename pus_tc/{obsw_tc_service8.py => tmtcc_tc_service8_func_commanding.py} (94%)
rename pus_tc/{obsw_tc_service9.py => tmtcc_tc_service9_time.py} (98%)
diff --git a/pus_tc/tmtcc_pus_tc_utility.py b/pus_tc/tmtcc_pus_tc_utility.py
index 9f41096..2585a89 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_pus_tc_service8 import generate_action_command
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import generate_action_command
from config.tmtcc_config import LED_TASK_ID
diff --git a/pus_tc/tmtcc_pus_service17.py b/pus_tc/tmtcc_service17_test.py
similarity index 96%
rename from pus_tc/tmtcc_pus_service17.py
rename to pus_tc/tmtcc_service17_test.py
index 1b174c3..17171c6 100644
--- a/pus_tc/tmtcc_pus_service17.py
+++ b/pus_tc/tmtcc_service17_test.py
@@ -1,5 +1,5 @@
from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT, PusTelecommand
-from tmtc_core.pus_tc.tmtcc_pus_tc_service17 import pack_service17_ping_command
+from tmtc_core.pus_tc.tmtcc_tc_service17_test import pack_service17_ping_command
def pack_service17_test_into(tc_queue: TcQueueT, op_code: int = 0):
diff --git a/pus_tc/tmtcc_tc_core.py b/pus_tc/tmtcc_tc_core.py
index dc41837..c4d298a 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_pus_tc_service8 import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
diff --git a/pus_tc/obsw_tc_gps.py b/pus_tc/tmtcc_tc_gps.py
similarity index 96%
rename from pus_tc/obsw_tc_gps.py
rename to pus_tc/tmtcc_tc_gps.py
index cb98a13..ed1d3af 100644
--- a/pus_tc/obsw_tc_gps.py
+++ b/pus_tc/tmtcc_tc_gps.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file obsw_tc_gps.py
+@file tmtcc_tc_gps.py
@brief GPS Device: GPS device testing
@author R. Mueller
@date 02.05.2020
@@ -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.obsw_tc_service2 import pack_mode_data
+from pus_tc.tmtcc_tc_service2_raw_commanding import pack_mode_data
import config.tmtcc_config as g
diff --git a/pus_tc/tmtcc_image_handler.py b/pus_tc/tmtcc_tc_image_handler.py
similarity index 94%
rename from pus_tc/tmtcc_image_handler.py
rename to pus_tc/tmtcc_tc_image_handler.py
index 9c22ffe..7b0d42d 100644
--- a/pus_tc/tmtcc_image_handler.py
+++ b/pus_tc/tmtcc_tc_image_handler.py
@@ -1,8 +1,8 @@
from typing import Union
from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from tmtc_core.pus_tc.tmtcc_pus_tc_service8 import make_action_id
-from pus_tc.tmtcc_tc_service20 import pack_boolean_parameter_setting
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional 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 3baa62a..01e8042 100644
--- a/pus_tc/tmtcc_tc_packer_hook.py
+++ b/pus_tc/tmtcc_tc_packer_hook.py
@@ -6,18 +6,18 @@ 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.obsw_tc_service2 import pack_service2_test_into
-from pus_tc.obsw_tc_service3 import pack_service3_test_into
-from pus_tc.obsw_tc_service8 import pack_service8_test_into
-from pus_tc.obsw_tc_service9 import pack_service9_test_into
+from pus_tc.tmtcc_tc_service2_raw_commanding 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_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 import pack_service20_test_into
+from pus_tc.tmtcc_tc_service20_parameter import pack_service20_test_into
from pus_tc.tmtcc_pus_tc_utility import pack_utility_command
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data, pack_service200_test_into
-from pus_tc.tmtcc_tc_service5 import pack_service5_test_into
-from pus_tc.tmtcc_pus_service17 import pack_service17_test_into
-from pus_tc.tmtcc_image_handler import generate_img_handler_packet
-from pus_tc.obsw_tc_gps import pack_gps_test_into
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data, pack_service200_test_into
+from pus_tc.tmtcc_tc_service5_event import pack_service5_test_into
+from pus_tc.tmtcc_service17_test import pack_service17_test_into
+from pus_tc.tmtcc_tc_image_handler import generate_img_handler_packet
+from pus_tc.tmtcc_tc_gps import pack_gps_test_into
from pus_tc.tmtcc_tc_core import pack_core_command
diff --git a/pus_tc/tmtcc_tc_mode_service200.py b/pus_tc/tmtcc_tc_service200_mode.py
similarity index 95%
rename from pus_tc/tmtcc_tc_mode_service200.py
rename to pus_tc/tmtcc_tc_service200_mode.py
index 88cc582..0e70d8f 100644
--- a/pus_tc/tmtcc_tc_mode_service200.py
+++ b/pus_tc/tmtcc_tc_service200_mode.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file tmtcc_tc_mode_service200.py
+@file tmtcc_tc_service200_mode.py
@brief PUS Service 200: PUS custom service 200: Mode commanding
@author R. Mueller
@date 02.05.2020
diff --git a/pus_tc/tmtcc_tc_service20.py b/pus_tc/tmtcc_tc_service20_parameter.py
similarity index 98%
rename from pus_tc/tmtcc_tc_service20.py
rename to pus_tc/tmtcc_tc_service20_parameter.py
index 58c7af3..75b028a 100644
--- a/pus_tc/tmtcc_tc_service20.py
+++ b/pus_tc/tmtcc_tc_service20_parameter.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file tmtcc_tc_service20.py
+@file tmtcc_tc_service20_parameter.py
@brief PUS Service 20: Parameter management.
@author J. Gerhards
@date 30.06.2020
@@ -11,7 +11,7 @@ from typing import Deque
import config.tmtcc_config as g
from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, TcQueueT
from tmtc_core.utility.obsw_logger import get_logger
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
LOGGER = get_logger()
diff --git a/pus_tc/tmtcc_tc_service23_sdcard.py b/pus_tc/tmtcc_tc_service23_sdcard.py
index 25ac7f6..ce88f22 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_pus_tc_service8 import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
from tmtc_core.utility.obsw_logger import get_logger
LOGGER = get_logger()
diff --git a/pus_tc/obsw_tc_service2.py b/pus_tc/tmtcc_tc_service2_raw_commanding.py
similarity index 94%
rename from pus_tc/obsw_tc_service2.py
rename to pus_tc/tmtcc_tc_service2_raw_commanding.py
index 761d701..a8c24d2 100644
--- a/pus_tc/obsw_tc_service2.py
+++ b/pus_tc/tmtcc_tc_service2_raw_commanding.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file obsw_tc_service2.py
+@file tmtcc_tc_service2_raw_commanding.py
@brief PUS Service 2: Device Access, Native low-level commanding
@author R. Mueller
@date 01.11.2019
@@ -9,7 +9,7 @@ import struct
import config.tmtcc_config as g
from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
def pack_service2_test_into(tc_queue: Deque, called_externally: bool = False) -> Deque:
diff --git a/pus_tc/obsw_tc_service3.py b/pus_tc/tmtcc_tc_service3_housekeeping.py
similarity index 96%
rename from pus_tc/obsw_tc_service3.py
rename to pus_tc/tmtcc_tc_service3_housekeeping.py
index 5a8906a..1dd9f83 100644
--- a/pus_tc/obsw_tc_service3.py
+++ b/pus_tc/tmtcc_tc_service3_housekeeping.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file obsw_tc_service3.py
+@file tmtcc_tc_service3_housekeeping.py
@brief PUS Service 3: Housekeeping Service.
@author R. Mueller
@date 02.05.2020
diff --git a/pus_tc/tmtcc_tc_service5.py b/pus_tc/tmtcc_tc_service5_event.py
similarity index 92%
rename from pus_tc/tmtcc_tc_service5.py
rename to pus_tc/tmtcc_tc_service5_event.py
index 9f04908..4d8bb4d 100644
--- a/pus_tc/tmtcc_tc_service5.py
+++ b/pus_tc/tmtcc_tc_service5_event.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file tmtcc_tc_service5.py
+@file tmtcc_tc_service5_event.py
@brief PUS Service 5: Event Service
PUS Service 17: Test Service
@author R. Mueller
@@ -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 tmtc_core.pus_tc.tmtcc_pus_tc_service17 import pack_service17_ping_command
+from tmtc_core.pus_tc.tmtcc_tc_service17_test import pack_service17_ping_command
def pack_service5_test_into(tc_queue: TcQueueT):
diff --git a/pus_tc/obsw_tc_service8.py b/pus_tc/tmtcc_tc_service8_func_commanding.py
similarity index 94%
rename from pus_tc/obsw_tc_service8.py
rename to pus_tc/tmtcc_tc_service8_func_commanding.py
index 62193ce..673a2e8 100644
--- a/pus_tc/obsw_tc_service8.py
+++ b/pus_tc/tmtcc_tc_service8_func_commanding.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file obsw_tc_service8.py
+@file tmtcc_tc_service8_func_commanding.py
@brief PUS Service 8: High-level functional commanding.
@author R. Mueller
@date 01.11.2019
@@ -9,7 +9,7 @@ from typing import Deque
import config.tmtcc_config as g
from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
def pack_service8_test_into(tc_queue: Deque, called_externally: bool = False) -> Deque:
diff --git a/pus_tc/obsw_tc_service9.py b/pus_tc/tmtcc_tc_service9_time.py
similarity index 98%
rename from pus_tc/obsw_tc_service9.py
rename to pus_tc/tmtcc_tc_service9_time.py
index 03c3104..63456e6 100644
--- a/pus_tc/obsw_tc_service9.py
+++ b/pus_tc/tmtcc_tc_service9_time.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-@file obsw_tc_service9.py
+@file tmtcc_tc_service9_time.py
@brief PUS Service 9: Time management.
@author R. Mueller
@date 01.11.2019
diff --git a/tmtc_core b/tmtc_core
index 5e48f63..82d4050 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 5e48f63eceb7a44ad9f9cf82fff238f862a707f1
+Subproject commit 82d405069bdfc1733f8e2133d15f1b77a86d73eb
--
GitLab