tmtccmd update

config/definitions.py

@@ -15,4 +15,3 @@ class CustomServiceList(enum.Enum):
     TMP1075_1 = "tmp1075_1"
     TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
-    PLOC = "ploc"

config/object_ids.py

@@ -18,7 +18,6 @@ TMP_1075_2_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x6])
 HEATER_ID = bytearray([0x54, 0x00, 0x00, 0x1])
 PCDU_HANDLER_ID = bytearray([0x44, 0x00, 0x10, 0x00])
 SOLAR_ARRAY_DEPLOYMENT_ID = bytearray([0x44, 0x00, 0x10, 0x01])
-PLOC_ID = bytearray([0x44, 0x00, 0x00, 0x15])
 
 
 class ObjIdIds(enum.IntEnum):
@@ -33,7 +32,6 @@ class ObjIdIds(enum.IntEnum):
     TMP1075_2_HANDLER_ID = 8
     HEATER_ID = 9
     SOLAR_ARRAY_DEPLOYMENT_ID = 10
-    PLOC_ID = 11
 
 
 def set_object_ids() -> Dict[int, bytearray]:
@@ -49,6 +47,5 @@ def set_object_ids() -> Dict[int, bytearray]:
          ObjIdIds.HEATER_ID: HEATER_ID,
          ObjIdIds.PCDU_HANDLER_ID: PCDU_HANDLER_ID,
          ObjIdIds.SOLAR_ARRAY_DEPLOYMENT_ID: SOLAR_ARRAY_DEPLOYMENT_ID,
-         ObjIdIds.PLOC_ID: PLOC_ID,
     })
     return object_id_dict

config/version.py

@@ -1,4 +1,4 @@
 SW_NAME = "eive"
 VERSION_MAJOR = 1
-VERSION_MINOR = 3
+VERSION_MINOR = 4
 VERSION_SUBMINOR = 0

pus_tc/ploc.py

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   ploc.py
-@brief  TMP1075 tests
-@author J. Meier
-@date   06.01.2021
-"""
-import struct
-
-from tmtccmd.core.definitions import QueueCommands
-
-from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
-
-
-class PlocTestProcedure:
-    """
-    @brief  Use this class to define the tests to perform for the PLOC.
-    @details    Setting all to True will run all tests.
-                Setting all to False will only run the tests set to True.
-    """
-    all = False
-    test_tc_mem_write = False
-    test_tc_mem_read = True
-
-
-class PlocActionIds:
-    tc_mem_write = bytearray([0x0, 0x0, 0x0, 0x1])
-    tc_mem_read = bytearray([0x0, 0x0, 0x0, 0x2])
-
-
-class PlocReplyIds:
-    tm_mem_read_report = 6
-
-
-def pack_ploc_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
-    tc_queue.appendleft(
-        (QueueCommands.PRINT,
-         "Testing PLOC Handler with object id: 0x" + object_id.hex())
-    )
-
-    if PlocTestProcedure.all or PlocTestProcedure.test_tc_mem_write:
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC: TC Mem Write Test"))
-        memory_address = int(input("Type memory address: 0x"), 16)
-        memory_data = int(input("Type memory data: 0x"), 16)
-        command = generateWriteMemCommand(object_id, struct.pack('!I', memory_address), memory_data)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
-
-    if PlocTestProcedure.all or PlocTestProcedure.test_tc_mem_read:
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC: TC Mem Read Test"))
-        memory_address = int(input("Type memory address: 0x"), 16)
-        command = object_id + PlocActionIds.tc_mem_read + struct.pack('!I', memory_address)
-        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
-
-    return tc_queue
-
-
-def generateWriteMemCommand(object_id: bytearray, memory_address: bytearray, memory_data: int) -> bytearray:
-    """ This function generates the command to write to a memory address within the PLOC
-    @param object_id    The object id of the PlocHandler
-    @param memory_address   The PLOC memory address where to write to.
-    @param memory_data    The data to write to the memory address specified by the bytearray memory_address.
-    """
-    command = object_id + PlocActionIds.tc_mem_write + memory_address + struct.pack('!I', memory_data)
-    return command

pus_tc/tc_packer_hook.py

@@ -20,7 +20,6 @@ from pus_tc.pdu2 import pack_pdu2_test_into
 from pus_tc.pdu1 import pack_pdu1_test_into
 from pus_tc.acu import pack_acu_test_into
 from pus_tc.tmp1075 import pack_tmp1075_test_into
-from pus_tc.ploc import pack_ploc_test_into
 from pus_tc.heater import pack_heater_test_into
 from config.definitions import CustomServiceList
 from config.object_ids import ObjIdIds
@@ -57,9 +56,6 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
     if service == CustomServiceList.HEATER.value:
         object_id = get_object_id(ObjIdIds.HEATER)
         return pack_heater_test_into(object_id, service_queue)
-    if service == CustomServiceList.PLOC.value:
-        object_id = get_object_id(ObjIdIds.PLOC_ID)
-        return pack_ploc_test_into(object_id, service_queue)
     LOGGER.warning("Invalid Service !")
 
 

pus_tc/tmp1075.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmp1075.py
+@file   tmtcc_tc_tmp1075.py
 @brief  TMP1075 tests
 @author J. Meier
 @date   06.01.2021

pus_tm/service_8_hook.py

@@ -1,7 +1,5 @@
-import struct
 from typing import Tuple
 from config.object_ids import ObjIdIds
-from pus_tc.ploc import PlocReplyIds
 
 
 def user_analyze_service_8_data(
@@ -27,18 +25,7 @@ def user_analyze_service_8_data(
         data_string = data_string.rstrip(',')
         data_string = data_string.rstrip()
         content_list = [data_string]
-    elif object_id == ObjIdIds.PLOC_ID:
-        return handle_ploc_replies(action_id, custom_data)
     else:
         header_list = []
         content_list = []
     return header_list, content_list
-
-
-def handle_ploc_replies(action_id: int, custom_data: bytearray) -> Tuple[list, list]:
-    header_list = []
-    content_list = []
-    if action_id == PlocReplyIds.tm_mem_read_report:
-        header_list = ['PLOC Memory Address', 'PLOC Mem Len', 'PLOC Read Memory Data']
-        content_list = [custom_data[:4], custom_data[4:6], custom_data[6:10]]
-    return header_list, content_list

tmtc_client_cli.py

@@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+   https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

tmtc_client_gui.py

@@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+   https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,