Merge branch 'development' into add_health_service_announce_all

Merge pull request 'Mode Service: Add allowed subservice' (#739 ) from eive/fsfw:small_mode_service_fix into development
Reviewed-on: #739
2023-02-23 12:56:12 +01:00 · 2023-02-20 13:40:53 +01:00 · 2023-02-09 18:30:08 +01:00
2 changed files with 1 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,26 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 # [unreleased]

 # [v6.0.0] 2023-02-10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

 ## Fixes

--- a/src/fsfw/pus/CService200ModeCommanding.cpp
+++ b/src/fsfw/pus/CService200ModeCommanding.cpp
@ -20,6 +20,7 @@ ReturnValue_t CService200ModeCommanding::isValidSubservice(uint8_t subservice) {
    case (Subservice::COMMAND_MODE_COMMAND):
    case (Subservice::COMMAND_MODE_READ):
    case (Subservice::COMMAND_MODE_ANNOUNCE):
+    case (Subservice::COMMAND_MODE_ANNOUNCE_RECURSIVELY):
      return returnvalue::OK;
    default:
      return AcceptsTelecommandsIF::INVALID_SUBSERVICE;
Author	SHA1	Message	Date
Ulrich Mohr	61562b18ab	Merge branch 'development' into add_health_service_announce_all fsfw/fsfw/pipeline/pr-development This commit looks good Details	2023-02-23 12:56:12 +01:00
Ulrich Mohr	76b377c4c0	Merge pull request 'Mode Service: Add allowed subservice' (#739 ) from eive/fsfw:small_mode_service_fix into development fsfw/fsfw/pipeline/pr-master This commit looks good Details Reviewed-on: #739	2023-02-20 13:40:53 +01:00
Robin Müller	94e5f62331	add allowed subservice fsfw/fsfw/pipeline/pr-development This commit looks good Details	2023-02-09 18:30:08 +01:00