From 9ea8fd358c0055dbf1e77e41d812a08309ce4896 Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Wed, 28 Aug 2019 16:15:09 -0400
Subject: [PATCH] Not always resetting socket timeout on XBee

---
 README.md               | 4 ++--
 src/TinyGsmClientXBee.h | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 867fdf8..5739b95 100644
--- a/README.md
+++ b/README.md
@@ -79,9 +79,9 @@ Watch this repo for new updates! And of course, contributions are welcome ;)
 - UDP
     - Not yet supported on any module, though it may be some day
 - SSL/TLS (HTTPS)
-    - Supported on¹:
+    - Supported on:
         - SIM800, u-Blox, XBee _cellular_, ESP8266, and Sequans Monarch
-        ¹ - only some device models or firmware revisions have this feature (SIM8xx R14.18, A7, etc.)
+        - Note:  only some device models or firmware revisions have this feature (SIM8xx R14.18, A7, etc.)
     - Not yet supported on:
         - Quectel modems, SIM7000, SIM5360/5320/7100/7500/7600
     - Not possible on:
diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index 4d4eaa9..3e767b9 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -131,7 +131,9 @@ public:
     // For cellular models, per documentation: If you change the TM (socket
     // timeout) value while in Transparent Mode, the current connection is
     // immediately closed.
-    at->sendAT(GF("TM64"));  // Set socket timeout (using Digi default of 10 seconds)
+    at->sendAT(GF("TM"));  // Get socket timeout
+    String timeoutUsed = at->readResponseString(5000L);
+    at->sendAT(GF("TM"), timeoutUsed);  // Re-set socket timeout
     at->waitResponse(maxWaitMs);  // This response can be slow
     at->writeChanges();
     at->exitCommand();