From a3a3aaa8836b425c923eb97e49ed29b452377bf6 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 2 Feb 2023 16:01:56 +0100 Subject: [PATCH 1/4] parameter command to change transmitter timeout --- eive_tmtc/tmtc/com/subsystem.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index f602532..461826d 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -19,6 +19,7 @@ from tmtccmd.tc.pus_20_fsfw_param import ( class ParameterId(enum.IntEnum): DATARATE = 0 + TRANSMITTER_TIMEOUT = 1 class Submode(enum.IntEnum): @@ -37,6 +38,7 @@ class OpCode: TX_AND_RX_CARRIER_WAVE = "rx_and_tx_carrier_wave" UPDATE_DEFAULT_DATARATE_LOW = "update_default_rate_low" UPDATE_DEFAULT_DATARATE_HIGH = "update_default_rate_high" + CHANGE_TRANSMITTER_TIMEOUT = "change_transmitter_timeout" class Info: @@ -47,6 +49,7 @@ class Info: TX_AND_RX_CARRIER_WAVE = "Syrlinks with TX carrier wave" UPDATE_DEFAULT_DATARATE_LOW = "Configure default low datarate (BPSK modulation)" UPDATE_DEFAULT_DATARATE_HIGH = "Configure default high datarate (0QPSK modulation)" + CHANGE_TRANSMITTER_TIMEOUT = "Changes the transmitter timeout" @service_provider(CustomServiceList.COM_SS) @@ -101,6 +104,19 @@ def build_com_subsystem_cmd(p: ServiceProviderParams): q.add_pus_tc( create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0) ) + elif o == OpCode.CHANGE_TRANSMITTER_TIMEOUT: + timeout = int(input("Specify timeout to set: ")) + q.add_log_cmd(Info.CHANGE_TRANSMITTER_TIMEOUT) + q.add_pus_tc( + create_load_param_cmd( + pack_scalar_u8_parameter_app_data( + COM_SUBSYSTEM_ID, + 0, + ParameterId.TRANSMITTER_TIMEOUT, + timeout, + ) + ) + ) @tmtc_definitions_provider From 62281813573ec388c712ae7a713b0a019ce82607 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 22 Feb 2023 12:56:57 +0100 Subject: [PATCH 2/4] parameter command to change transmitter timeout --- eive_tmtc/tmtc/com/subsystem.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index 94eb194..a889ba1 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -21,6 +21,11 @@ from tmtccmd.tc.pus_20_fsfw_param import ( pack_scalar_u8_parameter_app_data, ) +from tmtccmd.pus.s20_fsfw_param_defs import ( + create_scalar_u32_parameter, + create_scalar_u8_parameter +) + class ParameterId(enum.IntEnum): DATARATE = 0 @@ -116,16 +121,16 @@ def build_com_subsystem_cmd(p: ServiceProviderParams): create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0) ) elif o == OpCode.CHANGE_TRANSMITTER_TIMEOUT: - timeout = int(input("Specify timeout to set: ")) + timeout = int(input("Specify timeout to set [ms]: ")) q.add_log_cmd(Info.CHANGE_TRANSMITTER_TIMEOUT) q.add_pus_tc( create_load_param_cmd( - pack_scalar_u8_parameter_app_data( + create_scalar_u32_parameter( COM_SUBSYSTEM_ID, 0, ParameterId.TRANSMITTER_TIMEOUT, timeout, - ) + ).pack() ) ) elif o == OpCode.READ_MODE: From 679df9ebe101ff93e36d8b58b5e0be04c5cc4cb2 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 22 Feb 2023 12:59:56 +0100 Subject: [PATCH 3/4] removed unused import --- eive_tmtc/tmtc/com/subsystem.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index a889ba1..d73a6e3 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -22,8 +22,7 @@ from tmtccmd.tc.pus_20_fsfw_param import ( ) from tmtccmd.pus.s20_fsfw_param_defs import ( - create_scalar_u32_parameter, - create_scalar_u8_parameter + create_scalar_u32_parameter ) From be032ab925cab58bc443dd877b8260d291894802 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 22 Feb 2023 15:01:48 +0100 Subject: [PATCH 4/4] prep v2.14.0 --- eive_tmtc/__init__.py | 4 ++-- eive_tmtc/config/events.csv | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eive_tmtc/__init__.py b/eive_tmtc/__init__.py index 66deb69..b6e6626 100644 --- a/eive_tmtc/__init__.py +++ b/eive_tmtc/__init__.py @@ -1,11 +1,11 @@ -__version__ = "2.13.0" +__version__ = "2.14.0" import logging from pathlib import Path SW_NAME = "eive-tmtc" VERSION_MAJOR = 2 -VERSION_MINOR = 13 +VERSION_MINOR = 14 VERSION_REVISION = 0 EIVE_TMTC_ROOT = Path(__file__).parent diff --git a/eive_tmtc/config/events.csv b/eive_tmtc/config/events.csv index 09afd86..f1188b4 100644 --- a/eive_tmtc/config/events.csv +++ b/eive_tmtc/config/events.csv @@ -145,8 +145,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/ipcore/PdecHandler.h 12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/ipcore/PdecHandler.h 12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/PdecHandler.h -12407;0x3077;POLL_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h -12408;0x3078;WRITE_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h +12407;0x3077;TOO_MANY_IRQS;MEDIUM;Too many IRQs over the time window of one second. P1: Allowed TCs;linux/ipcore/PdecHandler.h +12408;0x3078;POLL_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h +12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h 12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h 12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h 12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h