From 38a712500ed862128c5f88e8761a88f4066771dc Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
Date: Wed, 28 Apr 2021 21:21:08 +0200
Subject: [PATCH] TinyGsmClientSequansMonarch.h: use data mode

Use data mode instead of text mode to be able to send any content such
as raw binary. This will allow us to use TinyGSM with ArduinoBearSSL and
ArduinoMqtt.

It should be noted that for an unclear reason GSM_NL must be set to '\n'
instead of '\r\n' to avoid "CME ERROR: operation not supported" in this
mode with the Monarch GMS01Q.

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
 src/TinyGsmClientSequansMonarch.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h
index dc782ee..c243554 100644
--- a/src/TinyGsmClientSequansMonarch.h
+++ b/src/TinyGsmClientSequansMonarch.h
@@ -467,8 +467,8 @@ class TinyGsmSequansMonarch
     // <recvDataMode1> = Receive data mode = 0  - data as text (1 for hex)
     // <keepalive1> = unused = 0
     // <listenAutoRsp1> = Listen auto-response mode = 0 - deactivated
-    // <sendDataMode1> = Send data mode = 0  - data as text (1 for hex)
-    sendAT(GF("+SQNSCFGEXT="), mux, GF(",1,0,0,0,0"));
+    // <sendDataMode1> = Send data mode = 1  - data as hex (0 for text)
+    sendAT(GF("+SQNSCFGEXT="), mux, GF(",1,0,0,0,1"));
     waitResponse(5000L);
 
     // Socket dial
@@ -508,7 +508,13 @@ class TinyGsmSequansMonarch
 
     sendAT(GF("+SQNSSENDEXT="), mux, ',', (uint16_t)len);
     waitResponse(10000L, GF(GSM_NL "> "));
-    stream.write(reinterpret_cast<const uint8_t*>(buff), len);
+    // Translate bytes into char to be able to send them as an hex string
+    char char_command[2];
+    for (int i=0; i<len; i++) {
+      memset(&char_command, 0, sizeof(char_command));
+      sprintf(&char_command[0], "%02X", reinterpret_cast<const uint8_t*>(buff)[i]);
+      stream.write(char_command, sizeof(char_command));
+    }
     stream.flush();
     if (waitResponse() != 1) {
       DBG("### no OK after send");
@@ -720,7 +726,8 @@ class TinyGsmSequansMonarch
 
  protected:
   GsmClientSequansMonarch* sockets[TINY_GSM_MUX_COUNT];
-  const char*              gsmNL = GSM_NL;
+  // GSM_NL (\r\n) is not accepted with SQNSSENDEXT in data mode so use \n
+  const char*              gsmNL = "\n";
 };
 
 #endif  // SRC_TINYGSMCLIENTSEQUANSMONARCH_H_