Implement GPS start mode ( vshymanskyy#642 )

jorisvervuurt · Feb 9, 2024 · 1a9ec8e · 1a9ec8e
1 parent 36a25d1
commit 1a9ec8e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 9 deletions.
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
@@ -326,7 +326,7 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
    */
  protected:
   // enable GPS
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
     sendAT(GF("+QGPS=1"));
     if (waitResponse() != 1) { return false; }
     return true;

diff --git a/src/TinyGsmClientSIM70xx.h b/src/TinyGsmClientSIM70xx.h
@@ -278,7 +278,7 @@ class TinyGsmSim70xx : public TinyGsmModem<TinyGsmSim70xx<modemType>>,
    */
  protected:
   // enable GPS
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
     thisModem().sendAT(GF("+CGNSPWR=1"));
     if (thisModem().waitResponse() != 1) { return false; }
     return true;

diff --git a/src/TinyGsmClientSIM7600.h b/src/TinyGsmClientSIM7600.h
@@ -432,7 +432,13 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
    */
  protected:
   // enable GPS
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
+    switch (startMode) {
+      case GPS_START_COLD: sendAT(GF("+CGPSCOLD")); break;
+      case GPS_START_HOT: sendAT(GF("+CGPSHOT")); break;
+      default: sendAT(); break;
+    }
+    if (waitResponse() != 1) { return false; }
     sendAT(GF("+CGPS=1"));
     if (waitResponse() != 1) { return false; }
     return true;

diff --git a/src/TinyGsmClientSIM808.h b/src/TinyGsmClientSIM808.h
@@ -27,9 +27,16 @@ class TinyGsmSim808 : public TinyGsmSim800, public TinyGsmGPS<TinyGsmSim808>, pu
    */
  protected:
   // enable GPS
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
     sendAT(GF("+CGNSPWR=1"));
     if (waitResponse() != 1) { return false; }
+    switch (startMode) {
+      case GPS_START_COLD: sendAT(GF("+CGPSRST="), 0); break;
+      case GPS_START_HOT: sendAT(GF("+CGPSRST="), 1); break;
+      case GPS_START_WARM: sendAT(GF("+CGPSRST="), 2); break;
+      default: return true;
+    }
+    if (waitResponse() != 1) { return false; }
     return true;
   }
 

diff --git a/src/TinyGsmClientSaraR4.h b/src/TinyGsmClientSaraR4.h
@@ -434,7 +434,7 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
    * I2C port, the GSM-based "Cell Locate" location will be returned instead.
    */
  protected:
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
     // AT+UGPS=<mode>[,<aid_mode>[,<GNSS_systems>]]
     // <mode> - 0: GNSS receiver powered off, 1: on
     // <aid_mode> - 0: no aiding (default)

diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
@@ -434,7 +434,7 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
    * I2C port, the GSM-based "Cell Locate" location will be returned instead.
    */
  protected:
-  bool enableGPSImpl() {
+  bool enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) {
     // AT+UGPS=<mode>[,<aid_mode>[,<GNSS_systems>]]
     // <mode> - 0: GNSS receiver powered off, 1: on
     // <aid_mode> - 0: no aiding (default)

diff --git a/src/TinyGsmGPS.tpp b/src/TinyGsmGPS.tpp
@@ -13,14 +13,21 @@
 
 #define TINY_GSM_MODEM_HAS_GPS
 
+enum GpsStartMode {
+  GPS_START_AUTO = 0,
+  GPS_START_COLD = 1,
+  GPS_START_WARM = 2,
+  GPS_START_HOT  = 3,
+};
+
 template <class modemType>
 class TinyGsmGPS {
  public:
   /*
    * GPS/GNSS/GLONASS location functions
    */
-  bool enableGPS() {
-    return thisModem().enableGPSImpl();
+  bool enableGPS(GpsStartMode startMode = GPS_START_AUTO) {
+    return thisModem().enableGPSImpl(startMode);
   }
   bool disableGPS() {
     return thisModem().disableGPSImpl();
@@ -66,7 +73,7 @@ class TinyGsmGPS {
    * GPS/GNSS/GLONASS location functions
    */
 
-  bool    enableGPSImpl() TINY_GSM_ATTR_NOT_IMPLEMENTED;
+  bool    enableGPSImpl(GpsStartMode startMode = GPS_START_AUTO) TINY_GSM_ATTR_NOT_IMPLEMENTED;
   bool    disableGPSImpl() TINY_GSM_ATTR_NOT_IMPLEMENTED;
   String  getGPSrawImpl() TINY_GSM_ATTR_NOT_IMPLEMENTED;
   bool    getGPSImpl(float* lat, float* lon, float* speed = 0, float* alt = 0,