MTQ Commanding from ACS Ctrl fixes #363

Merged
muellerr merged 7 commits from eggert/mtq-cmd-fixes into develop 2023-02-03 16:12:34 +01:00
23 changed files with 211 additions and 447 deletions
Showing only changes of commit 9f829f1c50 - Show all commits

View File

@@ -17,12 +17,19 @@ change warranting a new major release:
# [unreleased] # [unreleased]
# [v1.23.1] 2023-02-02
TMTC rev: 15adb9bf2ec68304a4f87b8dd418c1a8353283a3
## Fixed ## Fixed
- Bugfix in FSFW where the sequence flags of the PUS packets were set to continuation segment (0b00) - Bugfix in FSFW where the sequence flags of the PUS packets were set to continuation segment (0b00)
instead of unsegmented (0b11). instead of unsegmented (0b11).
- Fixed usage of uint instead of int for commanding MTQ. Also fixed the range in which the ACS Ctrl - Fixed usage of uint instead of int for commanding MTQ. Also fixed the range in which the ACS Ctrl
commands the MTQ to match the actual commanding range. commands the MTQ to match the actual commanding range.
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/363
- Bugfix in FSFW where the MGM RM3100 value Z axis data was parse incorrectly.
PR: https://egit.irs.uni-stuttgart.de/eive/fsfw/pulls/123
# [v1.23.0] 2023-02-01 # [v1.23.0] 2023-02-01

View File

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1) set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1)
set(OBSW_VERSION_MINOR_IF_GIT_FAILS 23) set(OBSW_VERSION_MINOR_IF_GIT_FAILS 23)
set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0) set(OBSW_VERSION_REVISION_IF_GIT_FAILS 1)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)

2
fsfw

Submodule fsfw updated: 01cc619e67...3250bbf269

View File

@@ -162,7 +162,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
pus::PUS_SERVICE_20); pus::PUS_SERVICE_20);
new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID, new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
pus::PUS_SERVICE_200, 8); pus::PUS_SERVICE_200, 8);
HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable, 20); HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable,
20);
new CServiceHealthCommanding(healthCfg); new CServiceHealthCommanding(healthCfg);
#if OBSW_ADD_CFDP_COMPONENTS == 1 #if OBSW_ADD_CFDP_COMPONENTS == 1

View File

@@ -361,7 +361,7 @@ void CcsdsIpCoreHandler::checkTxTimer() {
} }
if (transmitterCountdown.hasTimedOut()) { if (transmitterCountdown.hasTimedOut()) {
disableTransmit(); disableTransmit();
//TODO: set mode to off (move timer to subsystem) // TODO: set mode to off (move timer to subsystem)
} }
} }

2
tmtc

Submodule tmtc updated: c633893df4...28c367c6fb