gps satellites signals to dataset

linux/acs/GpsHyperionLinuxController.cpp

@@ -21,6 +21,7 @@ GpsHyperionLinuxController::GpsHyperionLinuxController(object_id_t objectId, obj
                                                        bool enableHkSets, bool debugHyperionGps)
     : ExtendedControllerBase(objectId),
       gpsSet(this),
+      skyviewSet(this),
       enableHkSets(enableHkSets),
       debugHyperionGps(debugHyperionGps) {}
 
@@ -90,6 +91,13 @@ ReturnValue_t GpsHyperionLinuxController::initializeLocalDataPool(
   localDataPoolMap.emplace(GpsHyperion::SATS_IN_VIEW, new PoolEntry<uint8_t>());
   localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>());
   poolManager.subscribeForRegularPeriodicPacket({gpsSet.getSid(), enableHkSets, 30.0});
+  localDataPoolMap.emplace(GpsHyperion::SKYVIEW_UNIX_SECONDS, new PoolEntry<double>());
+  localDataPoolMap.emplace(GpsHyperion::PRN_ID, new PoolEntry<int16_t>());
+  localDataPoolMap.emplace(GpsHyperion::AZIMUTH, new PoolEntry<int16_t>());
+  localDataPoolMap.emplace(GpsHyperion::ELEVATION, new PoolEntry<int16_t>());
+  localDataPoolMap.emplace(GpsHyperion::SIGNAL2NOISE, new PoolEntry<double>());
+  localDataPoolMap.emplace(GpsHyperion::USED, new PoolEntry<uint8_t>());
+  poolManager.subscribeForRegularPeriodicPacket({skyviewSet.getSid(), false, 120.0});
   return returnvalue::OK;
 }
 
@@ -208,7 +216,15 @@ ReturnValue_t GpsHyperionLinuxController::handleGpsReadData() {
       return returnvalue::FAILED;
     }
   }
+  ReturnValue_t result = handleCoreTelemetry(modeIsSet);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  result = handleSkyviewTelemetry();
+  return result;
+}
 
+ReturnValue_t GpsHyperionLinuxController::handleCoreTelemetry(bool modeIsSet) {
   PoolReadGuard pg(&gpsSet);
   if (pg.getReadResult() != returnvalue::OK) {
 #if FSFW_VERBOSE_LEVEL >= 1
@@ -217,14 +233,6 @@ ReturnValue_t GpsHyperionLinuxController::handleGpsReadData() {
     return returnvalue::FAILED;
   }
 
-  for (int idx = 0; idx < 12; idx++) {
-    sif::debug << "PRN:" << gps.skyview[idx].PRN << std::endl;
-    sif::debug << "Az:" << gps.skyview[idx].azimuth << std::endl;
-    sif::debug << "El:" << gps.skyview[idx].elevation << std::endl;
-    sif::debug << "SS:" << gps.skyview[idx].ss << std::endl;
-    sif::debug << "used:" << gps.skyview[idx].used << std::endl;
-  }
-
   bool validFix = false;
   uint8_t newFix = 0;
   if (modeIsSet) {
@@ -377,6 +385,23 @@ ReturnValue_t GpsHyperionLinuxController::handleGpsReadData() {
   return returnvalue::OK;
 }
 
+ReturnValue_t GpsHyperionLinuxController::handleSkyviewTelemetry() {
+  PoolReadGuard pg(&skyviewSet);
+  sif::debug << sizeof(gps.skyview[0].PRN) << std::endl;
+  if (pg.getReadResult() != returnvalue::OK) {
+    return returnvalue::FAILED;
+  }
+  skyviewSet.unixSeconds.value = gps.skyview_time;
+  for (int sat = 0; sat < GpsHyperion::MAX_SATELLITES; sat++) {
+    skyviewSet.prn_id.value[sat] = gps.skyview[sat].PRN;
+    skyviewSet.azimuth.value[sat] = gps.skyview[sat].azimuth;
+    skyviewSet.elevation.value[sat] = gps.skyview[sat].elevation;
+    skyviewSet.signal2noise.value[sat] = gps.skyview[sat].ss;
+    skyviewSet.used.value[sat] = gps.skyview[sat].used;
+  }
+  return returnvalue::OK;
+}
+
 void GpsHyperionLinuxController::overwriteTimeIfNotSane(timeval time, bool validFix) {
   if (not timeInit and validFix) {
     if (not utility::timeSanityCheck()) {

linux/acs/GpsHyperionLinuxController.h

@@ -54,9 +54,12 @@ class GpsHyperionLinuxController : public ExtendedControllerBase {
                                         LocalDataPoolManager& poolManager) override;
 
   ReturnValue_t handleGpsReadData();
+  ReturnValue_t handleCoreTelemetry(bool modeIsSet);
+  ReturnValue_t handleSkyviewTelemetry();
 
  private:
   GpsPrimaryDataset gpsSet;
+  SkyviewDataset skyviewSet;
   gps_data_t gps = {};
   bool enableHkSets = false;
   const char* currentClientBuf = nullptr;