Merge remote-tracking branch 'origin/main' into relax-sus-fdir

mission/acs/archive/GPSDefinitions.h

@@ -20,32 +20,47 @@ static constexpr Event CANT_GET_FIX = event::makeEvent(SUBSYSTEM_ID, 1, severity
 static constexpr DeviceCommandId_t GPS_REPLY = 0;
 static constexpr DeviceCommandId_t TRIGGER_RESET_PIN_GNSS = 5;
 
-static constexpr uint32_t DATASET_ID = 0;
+enum SetIds : uint32_t {
+  CORE_DATASET,
+  SKYVIEW_DATASET,
+};
 
 enum GpsPoolIds : lp_id_t {
-  LATITUDE = 0,
-  LONGITUDE = 1,
-  ALTITUDE = 2,
-  SPEED = 3,
-  FIX_MODE = 4,
-  SATS_IN_USE = 5,
-  SATS_IN_VIEW = 6,
-  UNIX_SECONDS = 7,
-  YEAR = 8,
-  MONTH = 9,
-  DAY = 10,
-  HOURS = 11,
-  MINUTES = 12,
-  SECONDS = 13
+  LATITUDE,
+  LONGITUDE,
+  ALTITUDE,
+  SPEED,
+  FIX_MODE,
+  SATS_IN_USE,
+  SATS_IN_VIEW,
+  UNIX_SECONDS,
+  YEAR,
+  MONTH,
+  DAY,
+  HOURS,
+  MINUTES,
+  SECONDS,
+  SKYVIEW_UNIX_SECONDS,
+  PRN_ID,
+  AZIMUTH,
+  ELEVATION,
+  SIGNAL2NOISE,
+  USED,
 };
 
+static constexpr uint8_t CORE_DATASET_ENTRIES = 14;
+static constexpr uint8_t SKYVIEW_ENTRIES = 6;
+
+static constexpr uint8_t MAX_SATELLITES = 30;
+
 enum GpsFixModes : uint8_t { INVALID = 0, NO_FIX = 1, FIX_2D = 2, FIX_3D = 3 };
 
 }  // namespace GpsHyperion
 
-class GpsPrimaryDataset : public StaticLocalDataSet<18> {
+class GpsPrimaryDataset : public StaticLocalDataSet<GpsHyperion::CORE_DATASET_ENTRIES> {
  public:
-  GpsPrimaryDataset(object_id_t gpsId) : StaticLocalDataSet(sid_t(gpsId, GpsHyperion::DATASET_ID)) {
+  GpsPrimaryDataset(object_id_t gpsId)
+      : StaticLocalDataSet(sid_t(gpsId, GpsHyperion::CORE_DATASET)) {
     setAllVariablesReadOnly();
   }
 
@@ -69,7 +84,34 @@ class GpsPrimaryDataset : public StaticLocalDataSet<18> {
   friend class GpsHyperionLinuxController;
   friend class GpsCtrlDummy;
   GpsPrimaryDataset(HasLocalDataPoolIF* hkOwner)
-      : StaticLocalDataSet(hkOwner, GpsHyperion::DATASET_ID) {}
+      : StaticLocalDataSet(hkOwner, GpsHyperion::CORE_DATASET) {}
+};
+
+class SkyviewDataset : public StaticLocalDataSet<GpsHyperion::SKYVIEW_ENTRIES> {
+ public:
+  SkyviewDataset(object_id_t gpsId)
+      : StaticLocalDataSet(sid_t(gpsId, GpsHyperion::SKYVIEW_DATASET)) {
+    setAllVariablesReadOnly();
+  }
+
+  lp_var_t<double> unixSeconds =
+      lp_var_t<double>(sid.objectId, GpsHyperion::SKYVIEW_UNIX_SECONDS, this);
+  lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES> prn_id =
+      lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES>(sid.objectId, GpsHyperion::PRN_ID, this);
+  lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES> azimuth =
+      lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES>(sid.objectId, GpsHyperion::AZIMUTH, this);
+  lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES> elevation =
+      lp_vec_t<int16_t, GpsHyperion::MAX_SATELLITES>(sid.objectId, GpsHyperion::ELEVATION, this);
+  lp_vec_t<double, GpsHyperion::MAX_SATELLITES> signal2noise =
+      lp_vec_t<double, GpsHyperion::MAX_SATELLITES>(sid.objectId, GpsHyperion::SIGNAL2NOISE, this);
+  lp_vec_t<uint8_t, GpsHyperion::MAX_SATELLITES> used =
+      lp_vec_t<uint8_t, GpsHyperion::MAX_SATELLITES>(sid.objectId, GpsHyperion::USED, this);
+
+ private:
+  friend class GpsHyperionLinuxController;
+  friend class GpsCtrlDummy;
+  SkyviewDataset(HasLocalDataPoolIF* hkOwner)
+      : StaticLocalDataSet(hkOwner, GpsHyperion::SKYVIEW_DATASET) {}
 };
 
 #endif /* MISSION_ACS_ARCHIVE_GPSDEFINITIONS_H_ */

mission/acs/defs.h

@@ -42,6 +42,13 @@ enum SafeModeStrategy : uint8_t {
   SAFECTRL_DETUMBLE_DETERIORATED = 21,
 };
 
+enum GpsSource : uint8_t {
+  NONE,
+  GPS,
+  GPS_EXTRAPOLATED,
+  SPG4,
+};
+
 static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM;
 //! [EXPORT] : [COMMENT] The limits for the rotation in safe mode were violated.
 static constexpr Event SAFE_RATE_VIOLATION = MAKE_EVENT(0, severity::MEDIUM);
@@ -64,6 +71,8 @@ static constexpr Event MEKF_INVALID_MODE_VIOLATION = MAKE_EVENT(6, severity::HIG
 //! failed.
 //! P1: Missing information about magnetic field, P2: Missing information about rotational rate
 static constexpr Event SAFE_MODE_CONTROLLER_FAILURE = MAKE_EVENT(7, severity::HIGH);
+//! [EXPORT] : [COMMENT] The TLE for the SGP4 Propagator has become too old.
+static constexpr Event TLE_TOO_OLD = MAKE_EVENT(8, severity::INFO);
 
 extern const char* getModeStr(AcsMode mode);