From 3f2910c3a72632e939056587843ff447b2f1111d Mon Sep 17 00:00:00 2001
From: Marius Eggert <eggertm@irs.uni-stuttgart.de>
Date: Wed, 14 Dec 2022 11:50:29 +0100
Subject: [PATCH] changed order of submodes and their naming

---
 mission/controller/AcsController.cpp | 6 +++---
 mission/controller/AcsController.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
index 9057f5e4..fa106d4c 100644
--- a/mission/controller/AcsController.cpp
+++ b/mission/controller/AcsController.cpp
@@ -51,7 +51,7 @@ void AcsController::performControlOperation() {
           case SUBMODE_DETUMBLE:
             performDetumble();
             break;
-          case SUBMODE_PTG_SUN:
+          case SUBMODE_IDLE:
           case SUBMODE_PTG_TARGET:
           case SUBMODE_PTG_NADIR:
           case SUBMODE_PTG_INERTIAL:
@@ -249,7 +249,7 @@ void AcsController::performPointingCtrl() {
 
   double targetQuat[4] = {0, 0, 0, 0}, refSatRate[3] = {0, 0, 0};
   switch (submode) {
-    case SUBMODE_PTG_SUN:
+    case SUBMODE_IDLE:
       guidance.sunQuatPtg(&sensorValues, &mekfData, &susDataProcessed, &gpsDataProcessed, now,
                           targetQuat, refSatRate);
       break;
@@ -452,7 +452,7 @@ ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
       return INVALID_SUBMODE;
     }
   } else if ((mode == MODE_ON) || (mode == MODE_NORMAL)) {
-    if ((submode > 6) || (submode < 2)) {
+    if ((submode > 7) || (submode < 2)) {
       return INVALID_SUBMODE;
     } else {
       return returnvalue::OK;
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
index ec1749b3..de7cb23f 100644
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@@ -26,9 +26,9 @@ class AcsController : public ExtendedControllerBase {
 
   static const Submode_t SUBMODE_SAFE = 2;
   static const Submode_t SUBMODE_DETUMBLE = 3;
-  static const Submode_t SUBMODE_PTG_TARGET = 4;
+  static const Submode_t SUBMODE_IDLE = 4;
   static const Submode_t SUBMODE_PTG_NADIR = 5;
-  static const Submode_t SUBMODE_PTG_SUN = 6;
+  static const Submode_t SUBMODE_PTG_TARGET = 6;
   static const Submode_t SUBMODE_PTG_INERTIAL = 7;
 
   static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM;