eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-03 10:16:17 +01:00
commit 9f829f1c50
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
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

2
CMakeLists.txt
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

@ -1 +1 @@
Subproject commit 01cc619e67b84cef514b045377771ff1e11caf80 Subproject commit 3250bbf269b3326683222bb87ce7faecae63ad97

3
mission/core/GenericFactory.cpp
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

2
mission/tmtc/CcsdsIpCoreHandler.cpp
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

@ -1 +1 @@
Subproject commit c633893df43030bb26b8422604b569bf8419d454 Subproject commit 28c367c6fb959b180fa5ead858e508178454891e