Merge branch 'master' into v_master

2019-03-18 12:04:58 -04:00
parent fdd0279f70 c89af3019e
commit 5858a83706
2 changed files with 6 additions and 3 deletions
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -329,12 +329,15 @@ public:

  bool factoryDefault() {
    if (!isCatM) {
-      sendAT(GF("+UFACTORY=0,1"));  // Factory + Reset + Echo Off
+      sendAT(GF("+UFACTORY=0,1"));  // No factory restore, erase NVM
      waitResponse();
-      sendAT(GF("+CFUN=16"));   // Auto-baud
+      sendAT(GF("+CFUN=16"));   // Reset
+      return waitResponse() == 1;
+    }
+    else {
+      sendAT(GF("&F"));  // Resets the current profile, other NVM not affected
      return waitResponse() == 1;
    }
-    else return false;
  }

  String getModemInfo() {