update subsystem mode IDs

CHANGELOG.md

@@ -17,6 +17,10 @@ change warranting a new major release:
 
 # [unreleased]
 
+## Changed
+
+- Updated Subsystem mode IDs to avoid clashes with regular device handler modes.
+
 ## Fixed
 
 - `GpsHyperionLinuxController`: Fix `gpsd` polling by continuously calling `gps_read` in one cycle

mission/acsDefs.h

@@ -8,13 +8,13 @@ namespace acs {
 
 enum CtrlSubmode {
   OFF = HasModesIF::MODE_OFF,
-  SAFE = 2,
-  DETUMBLE = 3,
-  IDLE = 4,
-  PTG_TARGET_NADIR = 5,
-  PTG_TARGET = 6,
-  PTG_TARGET_GS = 7,
-  PTG_TARGET_INERTIAL = 8,
+  SAFE = 10,
+  DETUMBLE = 11,
+  IDLE = 12,
+  PTG_TARGET_NADIR = 13,
+  PTG_TARGET = 14,
+  PTG_TARGET_GS = 15,
+  PTG_TARGET_INERTIAL = 16,
 };
 
 static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM;

mission/comDefs.h

@@ -10,11 +10,11 @@ enum class Datarate : uint8_t {
 };
 
 enum Submode : uint8_t {
-  RX_ONLY,
-  RX_AND_TX_DEFAULT_DATARATE,
-  RX_AND_TX_LOW_DATARATE,
-  RX_AND_TX_HIGH_DATARATE,
-  RX_AND_TX_CW,
+  RX_ONLY = 10,
+  RX_AND_TX_DEFAULT_DATARATE = 11,
+  RX_AND_TX_LOW_DATARATE = 12,
+  RX_AND_TX_HIGH_DATARATE = 13,
+  RX_AND_TX_CW = 14,
   NUM_SUBMODES
 };
 

mission/system/objects/definitions.h

@@ -18,7 +18,14 @@ enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };
 
 namespace payload {
 
-enum Mode { OFF = 0, SUPV_ONLY = 1, MPSOC_STREAM = 2, CAM_STREAM = 3, EARTH_OBSV = 4, SCEX = 5 };
+enum Mode {
+  OFF = 0,
+  SUPV_ONLY = 10,
+  MPSOC_STREAM = 11,
+  CAM_STREAM = 12,
+  EARTH_OBSV = 13,
+  SCEX = 14
+};
 
 namespace ploc {
 

mission/system/tree/payloadModeTree.cpp

@@ -27,7 +27,7 @@ static const auto OFF = HasModesIF::MODE_OFF;
 static const auto ON = HasModesIF::MODE_ON;
 static const auto NML = DeviceHandlerIF::MODE_NORMAL;
 
-auto PL_SEQUENCE_OFF = std::make_pair(payload::Mode::OFF << 24, FixedArrayList<ModeListEntry, 3>());
+auto PL_SEQUENCE_OFF = std::make_pair(payload::Mode::OFF, FixedArrayList<ModeListEntry, 3>());
 auto PL_TABLE_OFF_TGT =
     std::make_pair((payload::Mode::OFF << 24) | 1, FixedArrayList<ModeListEntry, 1>());
 auto PL_TABLE_OFF_TRANS_0 =
@@ -36,7 +36,7 @@ auto PL_TABLE_OFF_TRANS_1 =
     std::make_pair((payload::Mode::OFF << 24) | 3, FixedArrayList<ModeListEntry, 1>());
 
 auto PL_SEQUENCE_MPSOC_STREAM =
-    std::make_pair(payload::Mode::MPSOC_STREAM << 24, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(payload::Mode::MPSOC_STREAM, FixedArrayList<ModeListEntry, 3>());
 auto PL_TABLE_MPSOC_STREAM_TGT =
     std::make_pair((payload::Mode::MPSOC_STREAM << 24) | 1, FixedArrayList<ModeListEntry, 5>());
 auto PL_TABLE_MPSOC_STREAM_TRANS_0 =
@@ -45,7 +45,7 @@ auto PL_TABLE_MPSOC_STREAM_TRANS_1 =
     std::make_pair((payload::Mode::MPSOC_STREAM << 24) | 3, FixedArrayList<ModeListEntry, 2>());
 
 auto PL_SEQUENCE_CAM_STREAM =
-    std::make_pair(payload::Mode::CAM_STREAM << 24, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(payload::Mode::CAM_STREAM, FixedArrayList<ModeListEntry, 3>());
 auto PL_TABLE_CAM_STREAM_TGT =
     std::make_pair((payload::Mode::CAM_STREAM << 24) | 1, FixedArrayList<ModeListEntry, 2>());
 auto PL_TABLE_CAM_STREAM_TRANS_0 =
@@ -54,7 +54,7 @@ auto PL_TABLE_CAM_STREAM_TRANS_1 =
     std::make_pair((payload::Mode::CAM_STREAM << 24) | 3, FixedArrayList<ModeListEntry, 2>());
 
 auto PL_SEQUENCE_SUPV_ONLY =
-    std::make_pair(payload::Mode::SUPV_ONLY << 24, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(payload::Mode::SUPV_ONLY, FixedArrayList<ModeListEntry, 3>());
 auto PL_TABLE_SUPV_ONLY_TGT =
     std::make_pair((payload::Mode::SUPV_ONLY << 24) | 1, FixedArrayList<ModeListEntry, 5>());
 auto PL_TABLE_SUPV_ONLY_TRANS_0 =
@@ -63,7 +63,7 @@ auto PL_TABLE_SUPV_ONLY_TRANS_1 =
     std::make_pair((payload::Mode::SUPV_ONLY << 24) | 3, FixedArrayList<ModeListEntry, 5>());
 
 auto PL_SEQUENCE_EARTH_OBSV =
-    std::make_pair(payload::Mode::EARTH_OBSV << 24, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(payload::Mode::EARTH_OBSV, FixedArrayList<ModeListEntry, 3>());
 auto PL_TABLE_EARTH_OBSV_TGT =
     std::make_pair((payload::Mode::EARTH_OBSV << 24) | 1, FixedArrayList<ModeListEntry, 5>());
 auto PL_TABLE_EARTH_OBSV_TRANS_0 =
@@ -71,8 +71,7 @@ auto PL_TABLE_EARTH_OBSV_TRANS_0 =
 auto PL_TABLE_EARTH_OBSV_TRANS_1 =
     std::make_pair((payload::Mode::EARTH_OBSV << 24) | 3, FixedArrayList<ModeListEntry, 2>());
 
-auto PL_SEQUENCE_SCEX =
-    std::make_pair(payload::Mode::SCEX << 24, FixedArrayList<ModeListEntry, 2>());
+auto PL_SEQUENCE_SCEX = std::make_pair(payload::Mode::SCEX, FixedArrayList<ModeListEntry, 2>());
 auto PL_TABLE_SCEX_TGT =
     std::make_pair((payload::Mode::SCEX << 24) | 1, FixedArrayList<ModeListEntry, 1>());
 auto PL_TABLE_SCEX_TRANS_0 =

tmtc

@@ -1 +1 @@
-Subproject commit 66867ad9d2fc9cb622e7d2baccba95689cc445c3
+Subproject commit cab0aa027ab3169bc2f224fa9cd9ccd524e42ae4