diff --git a/config/tmtcc_com_config.py b/config/tmtcc_com_config.py
index 07bc864534f5f442daac50f0fb0e95fd2792b5e5..79ad40209c1166bcc469a4d1dc00f4584e828353 100644
--- a/config/tmtcc_com_config.py
+++ b/config/tmtcc_com_config.py
@@ -13,7 +13,7 @@ from tmtc_core.comIF.obsw_qemu_com_if import QEMUComIF
from tmtc_core.utility.obsw_logger import get_logger
from tmtc_core.utility.obsw_tmtc_printer import TmTcPrinter
-import config.obsw_config as g
+import config.tmtcc_config as g
LOGGER = get_logger()
diff --git a/config/obsw_config.py b/config/tmtcc_config.py
similarity index 84%
rename from config/obsw_config.py
rename to config/tmtcc_config.py
index c84c17ba927ee062ecadf962b66812beb4fa357b..f803da1c39c7d566d9429756f28ad3ca54f3efde 100644
--- a/config/obsw_config.py
+++ b/config/tmtcc_config.py
@@ -1,10 +1,7 @@
"""
-@file
- obsw_config.py
-@date
- 01.11.2019
-@brief
- Global settings for UDP client
+@file tmtcc_config.py
+@date 01.11.2019
+@brief Global settings for TMTC commander.
"""
import struct
@@ -17,11 +14,9 @@ from tmtc_core.tmtc_core_definitions import ComInterfaces
Mission/Device specific information.
"""
-SW_NAME = "sputnik"
-SW_VERSION = 1
-SW_SUBVERSION = 0
-
# TODO: Automate / Autofill this file with the MIB parser
+# TODO: JSON file so we can store variables which are not tracked by version control but still
+# remain the same on a machine (e.g. COM port or IP addresses)
# Object IDs
CORE_CONTROLLER_ID = bytearray([0x40, 0x00, 0x10, 0x00])
@@ -180,6 +175,30 @@ def set_globals(args):
G_RESEND_TC = args.resend_tc
G_LISTENER_AFTER_OP = args.listener
- from config.obsw_user_code import global_setup_hook
+ from config.tmtcc_user_code import global_setup_hook
global_setup_hook()
+def set_glob_apid(new_apid: int):
+ global G_APID
+ G_APID = new_apid
+
+def get_glob_apid():
+ global G_APID
+ return G_APID
+
+def set_glob_com_if(new_com_if: ComInterfaces):
+ global G_COM_IF
+ G_COM_IF = new_com_if
+
+def get_glob_com_if():
+ global G_COM_IF
+ return G_COM_IF
+
+def set_glob_mode(new_mode : ModeList):
+ global G_MODE_ID
+ G_MODE_ID = new_mode
+
+def get_glob_mode():
+ global G_MODE_ID
+ return G_MODE_ID
+
diff --git a/config/obsw_user_code.py b/config/tmtcc_user_code.py
similarity index 68%
rename from config/obsw_user_code.py
rename to config/tmtcc_user_code.py
index 4cfc48eba6b4266772ca1db8db9f2dbcb8781390..1f2f325deff87cf66d9e67f4690f46d502b9f06e 100644
--- a/config/obsw_user_code.py
+++ b/config/tmtcc_user_code.py
@@ -3,10 +3,13 @@ User defined code can be added here.
"""
from typing import Union, Tuple
from tmtc_core.tc.obsw_pus_tc_base import PusTcInfo
+from tmtc_core.tmtc_core_definitions import ComInterfaces
from enum import Enum
-# Yeah, I did not have a better idea yet..
+# TODO: We really need that JSON file which will not be tracked by version control.
+# In that JSON file, we could set the current developer, so that developers can
+# hook into the config.
class Developer(Enum):
Robin = 0
@@ -22,24 +25,24 @@ def command_preparation_hook() -> Tuple[bytearray, Union[None, PusTcInfo]]:
return prepare_robins_commands()
+def prepare_robins_commands():
+ from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
+ command = PusTelecommand(service=17, subservice=1, ssc=20)
+ return command.pack_command_tuple()
+
def global_setup_hook():
"""
Can be used to alter the global variables in a custom defined way.
For example, device specific com ports or ethernet ports can be set here.
The global variables in the config.obsw_config file can be edited here
by using the handle.
- For example: config.obsw_config.G_ETHERNET_SEND_ADDRESS = new_send_address
"""
if Developer == Developer.Robin:
global_setup_hook_robin()
-def prepare_robins_commands():
- from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
- command = PusTelecommand(service=17, subservice=1, ssc=20)
- return command.pack_command_tuple()
-
-
def global_setup_hook_robin():
- import config.obsw_config
- pass
+ from config.tmtcc_config import get_glob_com_if, set_glob_apid
+ if get_glob_com_if() == ComInterfaces.Ethernet:
+ # Configure APID for FSFW example. Set this back to 0x73 for STM32!
+ set_glob_apid(0xEF)
diff --git a/core/tmtc_backend.py b/core/tmtc_backend.py
index 56247d9ac444b2bb61c38472073f0dbd216aba2a..89fa3237d47d32fbf493fb827b0e82575b06da8d 100644
--- a/core/tmtc_backend.py
+++ b/core/tmtc_backend.py
@@ -6,9 +6,9 @@ from multiprocessing import Process
from collections import deque
from typing import Tuple, Union
-from config import obsw_config as g
+from config import tmtcc_config as g
from config.tmtcc_definitions import ModeList
-from config.obsw_user_code import command_preparation_hook
+from config.tmtcc_user_code import command_preparation_hook
from tmtc_core.tmtc_core_definitions import ComInterfaces
from tmtc_core.utility.obsw_logger import get_logger
diff --git a/core/tmtc_client_core.py b/core/tmtc_client_core.py
index ef195ff81db2d2064a9bf34c115a3a87c18a3791..534ea1b4ae7ca022a66b6fe1a1fa775ca226789c 100755
--- a/core/tmtc_client_core.py
+++ b/core/tmtc_client_core.py
@@ -10,8 +10,8 @@ import sys
from config.tmtcc_version import SW_VERSION, SW_SUBVERSION
from tmtc_core.utility.obsw_logger import set_tmtc_logger, get_logger
-from config.obsw_config import set_globals
-import config.obsw_config as g
+from config.tmtcc_config import set_globals
+import config.tmtcc_config as g
from core.tmtc_backend import TmTcHandler
from core.tmtc_frontend import TmTcFrontend
from utility.obsw_args_parser import parse_input_arguments
@@ -44,7 +44,7 @@ def run_tmtc_client(use_gui: bool, reduced_printout: bool = False):
if not use_gui:
# The global variables are set by the argument parser.
- tmtc_handler = TmTcHandler(g.G_COM_IF, g.G_MODE_ID)
+ tmtc_handler = TmTcHandler(g.get_glob_com_if(), g.get_glob_mode())
tmtc_handler.set_one_shot_or_loop_handling(g.G_LISTENER_AFTER_OP)
tmtc_handler.initialize()
tmtc_handler.start()
diff --git a/core/tmtc_frontend.py b/core/tmtc_frontend.py
index 04612093683b4262cb3a5a5f5a87f54bf13d6fc3..054b1dd64a9694b61b6a70f57e6fe931f84a1e5d 100644
--- a/core/tmtc_frontend.py
+++ b/core/tmtc_frontend.py
@@ -14,7 +14,7 @@ from PyQt5.QtWidgets import *
from PyQt5.QtGui import QPixmap, QIcon
from core.tmtc_backend import TmTcHandler
-from config import obsw_config
+from config import tmtcc_config
from tmtc_core.tmtc_core_definitions import ComInterfaces
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
@@ -29,7 +29,7 @@ TODO: Make it look nicer. Add SOURCE or KSat logo.
class TmTcFrontend(QMainWindow):
- # TODO: this list should probably be inside an enum in the obsw_config.py
+ # TODO: this list should probably be inside an enum in the tmtcc_config.py
serviceList = [2, 3, 5, 8, 9, 17, 20, 200, "Dummy", "GPS0", "GPS1"] # , "Error"]
service_test_button: QPushButton
@@ -50,14 +50,14 @@ class TmTcFrontend(QMainWindow):
# Also, when changing ComIF, ensure that old ComIF is closed (e.g. with printout)
# Lock all other elements while ComIF is invalid.
self.tmtc_handler.initialize()
- obsw_config.G_SERVICE = 17
- obsw_config.G_COM_IF = obsw_config.ComInterfaces.QEMU
+ tmtcc_config.G_SERVICE = 17
+ tmtcc_config.G_COM_IF = tmtcc_config.ComInterfaces.QEMU
def prepare_start(self, args: any) -> Process:
return Process(target=self.start_ui)
def service_index_changed(self, index: int):
- obsw_config.G_SERVICE = self.serviceList[index]
+ tmtcc_config.G_SERVICE = self.serviceList[index]
LOGGER.info("service_test_mode_selection updated: " + str(self.serviceList[index]))
def single_command_set_service(self, value):
@@ -71,8 +71,8 @@ class TmTcFrontend(QMainWindow):
def start_service_test_clicked(self):
LOGGER.info("start service test button pressed")
- LOGGER.info("start testing service: " + str(obsw_config.G_SERVICE))
- self.tmtc_handler.mode = obsw_config.ModeList.ServiceTestMode
+ LOGGER.info("start testing service: " + str(tmtcc_config.G_SERVICE))
+ self.tmtc_handler.mode = tmtcc_config.ModeList.ServiceTestMode
# start the action in a new process
p = threading.Thread(target=self.handle_tm_tc_action)
p.start()
@@ -99,7 +99,7 @@ class TmTcFrontend(QMainWindow):
ssc=self.single_command_ssc)
self.tmtc_handler.single_command_package = command.pack_command_tuple()
- self.tmtc_handler.mode = obsw_config.ModeList.SingleCommandMode
+ self.tmtc_handler.mode = tmtcc_config.ModeList.SingleCommandMode
# start the action in a new process
p = threading.Thread(target=self.handle_tm_tc_action)
p.start()
@@ -135,23 +135,23 @@ class TmTcFrontend(QMainWindow):
row += 1
checkbox_console = QCheckBox("print output to console")
- checkbox_console.setChecked(obsw_config.G_PRINT_TM)
+ checkbox_console.setChecked(tmtcc_config.G_PRINT_TM)
checkbox_console.stateChanged.connect(checkbox_console_print)
checkbox_log = QCheckBox("print output to log file")
- checkbox_log.setChecked(obsw_config.G_PRINT_TO_FILE)
+ checkbox_log.setChecked(tmtcc_config.G_PRINT_TO_FILE)
checkbox_log.stateChanged.connect(checkbox_log_print)
checkbox_raw_tm = QCheckBox("print all raw TM data directly")
- checkbox_raw_tm.setChecked(obsw_config.G_PRINT_RAW_TM)
+ checkbox_raw_tm.setChecked(tmtcc_config.G_PRINT_RAW_TM)
checkbox_raw_tm.stateChanged.connect(checkbox_print_raw_data)
checkbox_hk = QCheckBox("print hk data")
- checkbox_hk.setChecked(obsw_config.G_PRINT_HK_DATA)
+ checkbox_hk.setChecked(tmtcc_config.G_PRINT_HK_DATA)
checkbox_hk.stateChanged.connect(checkbox_print_hk_data)
checkbox_short = QCheckBox("short display mode")
- checkbox_short.setChecked(obsw_config.G_DISPLAY_MODE == "short")
+ checkbox_short.setChecked(tmtcc_config.G_DISPLAY_MODE == "short")
checkbox_short.stateChanged.connect(checkbox_short_display_mode)
grid.addWidget(checkbox_log, row, 0, 1, 1)
@@ -179,7 +179,7 @@ class TmTcFrontend(QMainWindow):
grid.addWidget(spin_timeout, row, 0, 1, 1)
spin_timeout_factor = QDoubleSpinBox()
- spin_timeout_factor.setValue(obsw_config.G_TC_SEND_TIMEOUT_FACTOR)
+ spin_timeout_factor.setValue(tmtcc_config.G_TC_SEND_TIMEOUT_FACTOR)
# TODO: set sensible min/max values
spin_timeout_factor.setSingleStep(0.1)
spin_timeout_factor.setMinimum(0.25)
@@ -211,9 +211,9 @@ class TmTcFrontend(QMainWindow):
grid.addWidget(QLabel("Communication Interface:"), row, 0, 1, 1)
com_if_comboBox = QComboBox()
# add all possible ComIFs to the comboBox
- for comIf in obsw_config.ComInterfaces:
+ for comIf in tmtcc_config.ComInterfaces:
com_if_comboBox.addItem(comIf.name)
- com_if_comboBox.setCurrentIndex(obsw_config.G_COM_IF.value)
+ com_if_comboBox.setCurrentIndex(tmtcc_config.G_COM_IF.value)
com_if_comboBox.currentIndexChanged.connect(com_if_index_changed)
grid.addWidget(com_if_comboBox, row, 1, 1, 1)
row += 1
@@ -225,7 +225,7 @@ class TmTcFrontend(QMainWindow):
comboBox = QComboBox()
for service in self.serviceList:
comboBox.addItem("Service - " + str(service))
- comboBox.setCurrentIndex(self.serviceList.index(obsw_config.G_SERVICE))
+ comboBox.setCurrentIndex(self.serviceList.index(tmtcc_config.G_SERVICE))
comboBox.currentIndexChanged.connect(self.service_index_changed)
grid.addWidget(comboBox, row, 0, 1, 1)
@@ -319,49 +319,49 @@ class SingleCommandTable(QTableWidget):
self.setItem(0, 2, QTableWidgetItem("20"))
def com_if_index_changed(index: int):
- obsw_config.G_COM_IF = ComInterfaces(index)
- LOGGER.info("com if updated: " + str(obsw_config.G_COM_IF))
+ tmtcc_config.G_COM_IF = ComInterfaces(index)
+ LOGGER.info("com if updated: " + str(tmtcc_config.G_COM_IF))
def checkbox_console_print(state: int):
LOGGER.info(["enabled", "disabled"][state == 0] + " console print")
- obsw_config.G_PRINT_TM = state == 0
+ tmtcc_config.G_PRINT_TM = state == 0
def checkbox_log_print(state: int):
LOGGER.info(["enabled", "disabled"][state == 0] + " print to log")
- obsw_config.G_PRINT_TO_FILE = state == 0
+ tmtcc_config.G_PRINT_TO_FILE = state == 0
def checkbox_print_raw_data(state: int):
LOGGER.info(["enabled", "disabled"][state == 0] + " printing of raw data")
- obsw_config.G_PRINT_RAW_TM = state == 0
+ tmtcc_config.G_PRINT_RAW_TM = state == 0
def checkbox_print_hk_data(state: int):
LOGGER.info(["enabled", "disabled"][state == 0] + " printing of hk data")
- obsw_config.G_PRINT_HK_DATA = state == 0
+ tmtcc_config.G_PRINT_HK_DATA = state == 0
def checkbox_short_display_mode(state: int):
LOGGER.info(["enabled", "disabled"][state == 0] + " short display mode")
- obsw_config.G_DISPLAY_MODE = ["short", "long"][state == 0]
+ tmtcc_config.G_DISPLAY_MODE = ["short", "long"][state == 0]
def number_timeout(value: float):
LOGGER.info("tm timeout changed to: " + str(value))
- obsw_config.G_TM_TIMEOUT = value
+ tmtcc_config.G_TM_TIMEOUT = value
def number_timeout_factor(value: float):
LOGGER.info("tm timeout factor changed to: " + str(value))
- obsw_config.G_TC_SEND_TIMEOUT_FACTOR = value
+ tmtcc_config.G_TC_SEND_TIMEOUT_FACTOR = value
def ip_change_client(value):
LOGGER.info("client ip changed: " + value)
- obsw_config.G_REC_ADDRESS = (value, 2008)
+ tmtcc_config.G_REC_ADDRESS = (value, 2008)
def ip_change_board(value):
LOGGER.info("board ip changed: " + value)
- obsw_config.G_SEND_ADDRESS = (value, 7)
\ No newline at end of file
+ tmtcc_config.G_SEND_ADDRESS = (value, 7)
\ No newline at end of file
diff --git a/tc/obsw_image_handler.py b/tc/obsw_image_handler.py
index 6f3216861781687d30e6180c43cdb21eed8379a7..57967f2dd2f3b043b8b38286e0da09a1ccb811b7 100644
--- a/tc/obsw_image_handler.py
+++ b/tc/obsw_image_handler.py
@@ -4,7 +4,7 @@ from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, Deque
from tc.obsw_tc_service8 import make_action_id
from tc.obsw_tc_service20 import pack_boolean_parameter_setting
from tmtc_core.utility.obsw_logger import get_logger
-from config.obsw_config import SW_IMAGE_HANDLER_ID
+from config.tmtcc_config import SW_IMAGE_HANDLER_ID
LOGGER = get_logger()
diff --git a/tc/obsw_pus_tc_packer.py b/tc/obsw_pus_tc_packer.py
index c4d281ed5f67cd7d483a8e84c7430df55ea3bb4f..92ff5784609d021d9b951f11e5733acb47eb6821 100644
--- a/tc/obsw_pus_tc_packer.py
+++ b/tc/obsw_pus_tc_packer.py
@@ -24,7 +24,7 @@ from tc.obsw_tc_gps import pack_gps_test_into
from tc.obsw_tc_core import pack_core_command
from tmtc_core.utility.obsw_logger import get_logger
-import config.obsw_config as g
+import config.tmtcc_config as g
from collections import deque
from typing import Union
diff --git a/tc/obsw_tc_core.py b/tc/obsw_tc_core.py
index be4a2fa3910f779bcdd995113cf4b6fff0a6287c..58ec190d84db791f1b09ed163916a3787a9c9dcd 100644
--- a/tc/obsw_tc_core.py
+++ b/tc/obsw_tc_core.py
@@ -1,6 +1,6 @@
from typing import Deque
-from config.obsw_config import CORE_CONTROLLER_ID
+from config.tmtcc_config import CORE_CONTROLLER_ID
from tc.obsw_tc_service8 import make_action_id
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
diff --git a/tc/obsw_tc_gps.py b/tc/obsw_tc_gps.py
index 1a047bf304543f8268967c814f068419fd3bfc96..f97b50f4427e274bc6284b27aa3b684a2b101e0c 100644
--- a/tc/obsw_tc_gps.py
+++ b/tc/obsw_tc_gps.py
@@ -9,7 +9,7 @@
from tc.obsw_pus_tc_packer import TcQueueT, PusTelecommand
from tc.obsw_tc_service2 import pack_mode_data
-import config.obsw_config as g
+import config.tmtcc_config as g
def pack_gps_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
diff --git a/tc/obsw_tc_service2.py b/tc/obsw_tc_service2.py
index 22906fb235d867bc2e09f352b4caf9d10e2380ee..4872fb7b9fe67d5c36ec5334ef0cd60121817b4a 100644
--- a/tc/obsw_tc_service2.py
+++ b/tc/obsw_tc_service2.py
@@ -7,7 +7,7 @@
"""
import struct
-import config.obsw_config as g
+import config.tmtcc_config as g
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, Deque
from tc.obsw_tc_service200 import pack_mode_data
diff --git a/tc/obsw_tc_service20.py b/tc/obsw_tc_service20.py
index 149fb9ccfd50af57a712961c30fad0245837041c..65b1d32e93d7f5df43c09e1c9eb6ee2b5efbbc0f 100644
--- a/tc/obsw_tc_service20.py
+++ b/tc/obsw_tc_service20.py
@@ -8,7 +8,7 @@
import struct
from typing import Deque
-import config.obsw_config as g
+import config.tmtcc_config as g
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand, TcQueueT
from tmtc_core.utility.obsw_logger import get_logger
from tc.obsw_tc_service200 import pack_mode_data
diff --git a/tc/obsw_tc_service200.py b/tc/obsw_tc_service200.py
index cf7f5a18a88d663955c87b52631c9851180fa65b..a66d66299dee49ba33f233d85fee9ee3f940c305 100644
--- a/tc/obsw_tc_service200.py
+++ b/tc/obsw_tc_service200.py
@@ -7,7 +7,7 @@
"""
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
from tc.obsw_pus_tc_packer import TcQueueT
-import config.obsw_config as g
+import config.tmtcc_config as g
import struct
diff --git a/tc/obsw_tc_service23_sdcard.py b/tc/obsw_tc_service23_sdcard.py
index b89ae1bfb3f10dc9cd95af6f9d92ed503f2e20a0..9770a4076ea29af1e0054da74918c46b8f018916 100644
--- a/tc/obsw_tc_service23_sdcard.py
+++ b/tc/obsw_tc_service23_sdcard.py
@@ -4,7 +4,7 @@ Created: 21.01.2020 07:48
@author: Jakob Meier
"""
-import config.obsw_config as g
+import config.tmtcc_config as g
from typing import Deque, Union
from tc.obsw_pus_tc_packer import PusTelecommand, TcQueueT
diff --git a/tc/obsw_tc_service3.py b/tc/obsw_tc_service3.py
index 4391b04ada020a6750c0160177db6008361f6d02..9391f07d1f3fedee6b30391d22d8870d5d24f68f 100644
--- a/tc/obsw_tc_service3.py
+++ b/tc/obsw_tc_service3.py
@@ -8,7 +8,7 @@
import struct
from typing import Deque
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
-import config.obsw_config as g
+import config.tmtcc_config as g
def make_sid(object_id: bytearray, set_id: int) -> bytearray:
diff --git a/tc/obsw_tc_service5_17.py b/tc/obsw_tc_service5_17.py
index 23dbd25701c81f31e544a658d3a617df6f281a03..b602a294224af3f3f48fb8bb9af1732644813420 100644
--- a/tc/obsw_tc_service5_17.py
+++ b/tc/obsw_tc_service5_17.py
@@ -6,7 +6,7 @@
@author R. Mueller
@date 02.05.2020
"""
-
+import config.tmtcc_config as g
from tc.obsw_pus_tc_packer import TcQueueT, PusTelecommand
diff --git a/tc/obsw_tc_service8.py b/tc/obsw_tc_service8.py
index 6449fcf45f5599368fc0b30061cc7d68ef0ce8ea..ec14574ceb2390392599569c9779648d3d665eae 100644
--- a/tc/obsw_tc_service8.py
+++ b/tc/obsw_tc_service8.py
@@ -8,7 +8,7 @@
import struct
from typing import Deque
-import config.obsw_config as g
+import config.tmtcc_config as g
from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
from tc.obsw_tc_service200 import pack_mode_data
diff --git a/tc/obsw_tc_utility.py b/tc/obsw_tc_utility.py
index 9f21283dc0bdfdc34194b3e135432540233b7d13..7d0dc5414bae196727d34d30757a9417f88e324c 100644
--- a/tc/obsw_tc_utility.py
+++ b/tc/obsw_tc_utility.py
@@ -2,7 +2,7 @@ from typing import Union
from tmtc_core.tc.obsw_pus_tc_base import TcQueueT
from tc.obsw_tc_service8 import generate_action_command
-from config.obsw_config import LED_TASK_ID
+from config.tmtcc_config import LED_TASK_ID
def pack_utility_command(service_queue: TcQueueT, op_code: Union[str, int]):
diff --git a/test/obsw_module_test.py b/test/obsw_module_test.py
index fbdd1b609b3beed2f19d34c24108f6909c7bf47c..6cc58c6854fe24678ffc1347e39d6b762aecc080 100644
--- a/test/obsw_module_test.py
+++ b/test/obsw_module_test.py
@@ -44,7 +44,7 @@ from abc import abstractmethod
from collections import deque
from typing import Deque
-from config import obsw_config as g
+from config import tmtcc_config as g
from tc.obsw_pus_tc_packer import pack_dummy_device_test_into
from tmtc_core.tc.obsw_pus_tc_base import PusTcInfoQueueT, TcDictionaryKeys
from tm.obsw_tm_service_1 import PusPacketInfoService1T
diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py
index 16137a669cb53a9f0cfc0076a1c349c2ab771bcf..080ef2f285d56a7ad20ae10f0683bc20980ee1e4 100644
--- a/test/obsw_pus_service_test.py
+++ b/test/obsw_pus_service_test.py
@@ -12,7 +12,7 @@ from test.obsw_module_test import TestService, PusTmInfoQueueT, TmDictionaryKeys
from tmtc_core.tc.obsw_pus_tc_base import PusTcInfoQueueT
from tc.obsw_pus_tc_packer import pack_service17_test_into, pack_service5_test_into, \
pack_service2_test_into, pack_service8_test_into, pack_service200_test_into, pack_service20_test_into
-import config.obsw_config as g
+import config.tmtcc_config as g
from tmtc_core.utility.obsw_logger import get_logger
LOGGER = get_logger()
diff --git a/tm/obsw_tm_service_3.py b/tm/obsw_tm_service_3.py
index ddb4376333700671b40b2f244a48a4a14f8b691a..732cadf02362b0c8c3cb568b43e28479e1c281b0 100644
--- a/tm/obsw_tm_service_3.py
+++ b/tm/obsw_tm_service_3.py
@@ -10,7 +10,7 @@ from tmtc_core.tm.obsw_pus_tm_base import PusTelemetry
from typing import Type
from tmtc_core.utility.obsw_logger import get_logger
import struct
-import config.obsw_config as g
+import config.tmtcc_config as g
LOGGER = get_logger()
diff --git a/utility/obsw_binary_uploader.py b/utility/obsw_binary_uploader.py
index 5520006212a7e45deb7bf41bc196abb524652528..f27ded9bcfb06e5984b07957cf21c5dadadd1c76 100644
--- a/utility/obsw_binary_uploader.py
+++ b/utility/obsw_binary_uploader.py
@@ -16,7 +16,7 @@ from typing import Deque
from tmtc_core.comIF.obsw_com_interface import CommunicationInterface
from utility.obsw_file_transfer_helper import FileTransferHelper
-import config.obsw_config as g
+import config.tmtcc_config as g
from tmtc_core.utility.obsw_tmtc_printer import TmTcPrinter, DisplayMode
from tmtc_core.utility.obsw_logger import get_logger
from tmtc_core.sendreceive.obsw_tm_listener import TmListener
diff --git a/utility/obsw_file_transfer_helper.py b/utility/obsw_file_transfer_helper.py
index 52743acdacc40c1534f428ca29321a3938ccf45e..69d9e82cc0d1aa459581cdba1e84db4165c7caa6 100644
--- a/utility/obsw_file_transfer_helper.py
+++ b/utility/obsw_file_transfer_helper.py
@@ -1,7 +1,7 @@
from enum import Enum
import math
-from config.obsw_config import SD_CARD_HANDLER_ID
+from config.tmtcc_config import SD_CARD_HANDLER_ID
from tmtc_core.tc.obsw_pus_tc_base import TcQueueT, PusTelecommand
from tc.obsw_tc_service23_sdcard import \
calculate_allowed_file_data_size, generate_rm_file_srv23_2_packet, \