From bfd6055c4670dc17b3a069f257697437d30b9460 Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Thu, 26 Sep 2019 16:38:15 -0400
Subject: [PATCH] NOT factory resetting in init

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 library.json              | 2 +-
 library.properties        | 2 +-
 src/TinyGsmClientA6.h     | 5 ++++-
 src/TinyGsmClientBG96.h   | 5 ++++-
 src/TinyGsmClientM590.h   | 5 ++++-
 src/TinyGsmClientM95.h    | 5 ++++-
 src/TinyGsmClientMC60.h   | 4 ++--
 src/TinyGsmClientSIM800.h | 6 ++++--
 src/TinyGsmCommon.h       | 2 +-
 10 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6870263..72063f1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -22,7 +22,7 @@ with your board before submitting any issues.
 
 Main processor board: <!-- Uno, Zero, ESP32, Particle, etc -->
 Modem: <!-- Brand, model, variant, firmware version -->
-TinyGSM version: <!-- always try to use the latest (0.9.18) -->
+TinyGSM version: <!-- always try to use the latest (0.9.19) -->
 Code: <!-- Example name or paste in your code -->
 
 ### Scenario, steps to reproduce
diff --git a/library.json b/library.json
index abead61..d16cda6 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "TinyGSM",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM, LTE, and WiFi modules with AT command interfaces.",
   "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM7000, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox, Quectel, SIMCOM, AI Thinker, LTE, LTE-M",
   "authors":
diff --git a/library.properties b/library.properties
index c076660..aa8f193 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=TinyGSM
-version=0.9.18
+version=0.9.19
 author=Volodymyr Shymanskyy
 maintainer=Volodymyr Shymanskyy
 sentence=A small Arduino library for GPRS modules, that just works.
diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h
index 449d330..ad09572 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -140,7 +140,10 @@ public:
       return false;
     }
 
-    sendAT(GF("&FZE0"));  // Factory + Reset + Echo Off
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
+
+    sendAT(GF("E0"));  // Echo Off
     if (waitResponse() != 1) {
       return false;
     }
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index c9f4510..2a0bfa1 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -163,7 +163,10 @@ public:
       return false;
     }
 
-    sendAT(GF("&FZE0"));  // Factory + Reset + Echo Off
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
+
+    sendAT(GF("E0"));  // Echo Off
     if (waitResponse() != 1) {
       return false;
     }
diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h
index f312e59..3add9fe 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -138,7 +138,10 @@ public:
       return false;
     }
 
-    sendAT(GF("&FZE0"));  // Factory + Reset + Echo Off
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
+
+    sendAT(GF("E0"));  // Echo Off
     if (waitResponse() != 1) {
       return false;
     }
diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h
index 3e108d0..290b575 100644
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -160,7 +160,10 @@ public:
       return false;
     }
 
-    sendAT(GF("&FZE0"));  // Factory + Reset + Echo Off
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
+
+    sendAT(GF("E0"));  // Echo Off
     if (waitResponse() != 1) {
       return false;
     }
diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h
index 6036e9c..ff28d81 100644
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -164,8 +164,8 @@ public:
       return false;
     }
 
-    sendAT(GF("&FZ"));  // Factory + Reset
-    waitResponse();
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
 
     sendAT(GF("E0"));   // Echo Off
     if (waitResponse() != 1) {
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index c505eca..229e986 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -169,8 +169,10 @@ public:
     if (!testAT()) {
       return false;
     }
-    sendAT(GF("&FZ"));  // Factory + Reset
-    waitResponse();
+
+    // sendAT(GF("&FZ"));  // Factory + Reset
+    // waitResponse();
+
     sendAT(GF("E0"));   // Echo Off
     if (waitResponse() != 1) {
       return false;
diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h
index 8893088..6e8bf37 100644
--- a/src/TinyGsmCommon.h
+++ b/src/TinyGsmCommon.h
@@ -10,7 +10,7 @@
 #define TinyGsmCommon_h
 
 // The current library version number
-#define TINYGSM_VERSION "0.9.18"
+#define TINYGSM_VERSION "0.9.19"
 
 #if defined(SPARK) || defined(PARTICLE)
   #include "Particle.h"