More tidying...

Author: mikalhart

src/LG290P_structs.h

@@ -34,30 +34,6 @@ struct PvtDomain
     double heading = 0;
 
     void clear() { *this = PvtDomain(); }
-
-#if false
-    uint8_t timeStatus = 3; // 0 = valid, 3 = invalid
-    uint8_t dateStatus = 0; // 0 = Invalid, 1 = valid, 2 = leap second warning
-    double verticalSpeed = 0;
-    double trackGround = 0;
-
-    float latitudeDeviation = 0;
-    float longitudeDeviation = 0;
-    float heightDeviation = 0;
-    float horizontalSpeedDeviation = 0;
-    float verticalSpeedDeviation = 0;
-
-    uint8_t positionType = 0; // 0 = None, 1 = FixedPos, 8 = DopplerVelocity, 16 = Single, ...
-    uint8_t velocityType = 0; // 0 = None, 1 = FixedPos, 8 = DopplerVelocity, 16 = Single, ...
-
-    uint8_t
-        solutionStatus = 0; // 0 = Solution computed, 1 = Insufficient observation, 3 = No convergence, 4 = Covariance trace
-
-    uint8_t satellitesTracked = 0;
-
-    uint8_t rtkSolution = 0;
-    uint8_t pseudorangeCorrection = 0;
-#endif
 };
 
 struct RtcmDomain
@@ -293,100 +269,5 @@ struct RtcmPacket
     static bool FromBuffer(uint8_t *buffer, size_t bufferLen, RtcmPacket &result);
 };
 
-#if false
-typedef struct
-{
-    double latitude;
-    double longitude;
-    double altitude;
-    double horizontalSpeed;
-    double verticalSpeed;
-    double trackGround;
-
-    float latitudeDeviation;
-    float longitudeDeviation;
-    float heightDeviation;
-    float horizontalSpeedDeviation;
-    float verticalSpeedDeviation;
-
-    uint8_t positionType; // 0 = None, 1 = FixedPos, 8 = DopplerVelocity, 16 = Single, ...
-    uint8_t velocityType; // 0 = None, 1 = FixedPos, 8 = DopplerVelocity, 16 = Single, ...
-
-    uint8_t
-        solutionStatus; // 0 = Solution computed, 1 = Insufficient observation, 3 = No convergence, 4 = Covariance trace
-
-    uint8_t satellitesTracked;
-    uint8_t satellitesUsed;
-
-    uint8_t rtkSolution = 0;
-    uint8_t pseudorangeCorrection = 0;
-} UNICORE_BESTNAV_data_t;
-
-typedef struct
-{
-    // ubxAutomaticFlags automaticFlags;
-    UNICORE_BESTNAV_data_t data;
-    void (*callbackPointerPtr)(UNICORE_BESTNAV_data_t *);
-    UNICORE_BESTNAV_data_t *callbackData;
-} UNICORE_BESTNAV_t;
-
-typedef struct
-{
-    double ecefX = 0;
-    double ecefY = 0;
-    double ecefZ = 0;
-    float ecefXDeviation = 0;
-    float ecefYDeviation = 0;
-    float ecefZDeviation = 0;
-} UNICORE_BESTNAVXYZ_data_t;
-
-typedef struct
-{
-    // ubxAutomaticFlags automaticFlags;
-    UNICORE_BESTNAVXYZ_data_t data;
-    void (*callbackPointerPtr)(UNICORE_BESTNAVXYZ_data_t *);
-    UNICORE_BESTNAVXYZ_data_t *callbackData;
-} UNICORE_BESTNAVXYZ_t;
-
-typedef struct
-{
-    uint16_t year = 0;
-    uint8_t month = 0;
-    uint8_t day = 0;
-    uint8_t hour = 0;
-    uint8_t minute = 0;
-    uint8_t second = 0;
-    uint16_t millisecond = 0;
-    uint8_t timeStatus = 3; // 0 = valid, 3 = invalid
-    uint8_t dateStatus = 0; // 0 = Invalid, 1 = valid, 2 = leap second warning
-    double timeOffset = 0;
-    double timeDeviation = 0;
-} UNICORE_RECTIME_data_t;
-
-typedef struct
-{
-    // ubxAutomaticFlags automaticFlags;
-    UNICORE_RECTIME_data_t data;
-    void (*callbackPointerPtr)(UNICORE_RECTIME_data_t *);
-    UNICORE_RECTIME_data_t *callbackData;
-} UNICORE_RECTIME_t;
-
-// #VERSION,98,GPS,UNKNOWN,1,711000,0,0,18,144;UM980,R4.10Build7923,HRPT00-S10C-P,2310415000001-MD22B1224961040,ff3bd496fd7ca68b,2022/09/28*55f61e51
-typedef struct
-{
-    uint8_t modelType = 0;
-    char swVersion[33 + 1] = {0}; // Add terminator
-    char efuseID[33 + 1] = {0};   // Add terminator
-    char compileTime[43 + 1] = {0};   // Add terminator
-} UNICORE_VERSION_data_t;
-
-typedef struct
-{
-    // ubxAutomaticFlags automaticFlags;
-    UNICORE_VERSION_data_t data;
-    void (*callbackPointerPtr)(UNICORE_VERSION_data_t *);
-    UNICORE_VERSION_data_t *callbackData;
-} UNICORE_VERSION_t;
-#endif
 
 #endif // _SPARKFUN_LG290P_STRUCTS_H

src/SparkFun_LG290P_GNSS.cpp

@@ -1261,45 +1261,6 @@ bool LG290P::isNewSatelliteInfoAvailable()
     return r;
 }
 
-double LG290P::getLatitude()
-{
-    ensurePvtEnabled();
-    return pvtDomain.latitude;
-}
-
-double LG290P::getLongitude()
-{
-    ensurePvtEnabled();
-    return pvtDomain.longitude;
-}
-
-double LG290P::getAltitude()
-{
-    ensurePvtEnabled();
-    return pvtDomain.altitude;
-}
-
-double LG290P::getHorizontalSpeed()
-{
-    ensurePvtEnabled();
-    return pvtDomain.groundSpeed;
-}
-
-double LG290P::getEcefX()
-{
-    return rtcmDomain.ecefX;
-}
-
-double LG290P::getEcefY()
-{
-    return rtcmDomain.ecefY;
-}
-
-double LG290P::getEcefZ()
-{
-    return rtcmDomain.ecefZ;
-}
-
 uint16_t LG290P::getSatellitesInViewCount()
 {
     uint16_t count = 0;
@@ -1308,36 +1269,8 @@ uint16_t LG290P::getSatellitesInViewCount()
     return count;
 }
 
-uint16_t LG290P::getSatellitesUsedCount()
-{
-    ensurePvtEnabled();
-    return pvtDomain.satellitesUsed;
-}
-
-// 0 = Fix not available or invalid.
-// 1 = GPS SPS Mode, fix valid.
-// 2 = Differential GPS, SPS Mode, or Satellite Based Augmentation. System (SBAS), fix valid.
-// 3 = GPS PPS Mode, fix valid.
-// 4 = Real Time Kinematic (RTK) System used in RTK mode with fixed integers.
-// 5 = Float RTK. Satellite system used in RTK mode, floating integers.
-// Note: this function is unique in using the "quality" field from GGA rather than PQTMPVT.
-// PQTMPVT has a more limited response: only 0-3.
-uint8_t LG290P::getFixQuality()
-{
-    ensureGgaEnabled();
-    return pvtDomain.quality - '0'; // Convert ASCII to uint8_t
-}
-
-// 'V' = Fix not available or invalid (void).
-// 'A' = Fix available
-char LG290P::getFixStatus()
-{
-    ensureRmcEnabled();
-    return pvtDomain.fixStatus;
-}
-
 // Return the number of millis since last update
-uint32_t LG290P::getGeodeticAgeMs()
+uint32_t LG290P::getPVTDomainAgeMs()
 {
     return millis() - lastUpdatePvtDomain;
 }
@@ -1422,72 +1355,6 @@ void LG290P::ecefToGeodetic(double x, double y, double z, double &latOut, double
     lonOut *= RAD_TO_DEG;
 }
 
-uint16_t LG290P::getYear()
-{
-    ensurePvtEnabled();
-    return pvtDomain.year;
-}
-
-uint8_t LG290P::getMonth()
-{
-    ensurePvtEnabled();
-    return pvtDomain.month;
-}
-
-uint8_t LG290P::getDay()
-{
-    ensurePvtEnabled();
-    return pvtDomain.day;
-}
-
-uint8_t LG290P::getHour()
-{
-    ensurePvtEnabled();
-    return pvtDomain.hour;
-}
-
-uint8_t LG290P::getMinute()
-{
-    ensurePvtEnabled();
-    return pvtDomain.minute;
-}
-
-uint8_t LG290P::getSecond()
-{
-    ensurePvtEnabled();
-    return pvtDomain.second;
-}
-
-uint16_t LG290P::getMillisecond()
-{
-    ensurePvtEnabled();
-    return (uint16_t)(pvtDomain.nanosecond / 1000000);
-}
-
-uint16_t LG290P::getLeapSeconds()
-{
-    ensurePvtEnabled();
-    return pvtDomain.leapSeconds;
-}
-
-double LG290P::getCourse()
-{
-    ensurePvtEnabled();
-    return pvtDomain.course;
-}
-
-double LG290P::getHdop()
-{
-    ensurePvtEnabled();
-    return pvtDomain.hdop;
-}
-
-double LG290P::getPdop()
-{
-    ensurePvtEnabled();
-    return pvtDomain.pdop;
-}
-
 NmeaPacket NmeaPacket::FromString(const std::string &str)
 {
     NmeaPacket s;