Testing updates for BG95SSL

Signed-off-by: Sara Damiano <[email protected]>
vshymanskyy · May 17, 2024 · 74734ef · 74734ef
1 parent 4858785
commit 74734ef
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/build_examples_platformio.yaml b/.github/workflows/build_examples_platformio.yaml
@@ -40,6 +40,13 @@ jobs:
             TINY_GSM_MODEM_XBEE,
             TINY_GSM_MODEM_SEQUANS_MONARCH,
           ]
+        exclude:
+          - modem: TINY_GSM_MODEM_BG95SSL
+            example: examples/BlynkClient
+          - modem: TINY_GSM_MODEM_BG95SSL
+            example: examples/FileDownload
+          - modem: TINY_GSM_MODEM_BG95SSL
+            example: examples/MqttClient
 
     steps:
       - uses: actions/checkout@v3

diff --git a/examples/AllFunctions/AllFunctions.ino b/examples/AllFunctions/AllFunctions.ino
@@ -225,7 +225,8 @@ void loop() {
   DBG("Phone number (USSD):", ussd_phone_num);
 #endif
 
-#if TINY_GSM_TEST_TCP && defined TINY_GSM_MODEM_HAS_TCP
+#if TINY_GSM_TEST_TCP && defined TINY_GSM_MODEM_HAS_TCP && \
+    not defined(TINY_GSM_MODEM_BG95SSL)
   TinyGsmClient client(modem, 0);
   const int     port = 80;
   DBG("Connecting to", server);

diff --git a/examples/WebClient/WebClient.ino b/examples/WebClient/WebClient.ino
@@ -117,6 +117,10 @@ TinyGsm        modem(debugger);
 TinyGsm        modem(SerialAT);
 #endif
 
+#if defined(TINY_GSM_MODEM_HAS_SSL)
+#define USE_SSL
+#endif
+
 #ifdef USE_SSL
 TinyGsmClientSecure client(modem);
 const int           port = 443;

diff --git a/src/TinyGsmClientBG95SSL.h b/src/TinyGsmClientBG95SSL.h
@@ -26,6 +26,7 @@
 #include "TinyGsmModem.tpp"
 #include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
 #include "TinyGsmTemperature.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"

diff --git a/tools/Diagnostics/Diagnostics.ino b/tools/Diagnostics/Diagnostics.ino
@@ -115,9 +115,13 @@ TinyGsm        modem(debugger);
 TinyGsm        modem(SerialAT);
 #endif
 
-#ifdef USE_SSL&& defined TINY_GSM_MODEM_HAS_SSL
-TinyGsmClientSecure      client(modem);
-const int                port = 443;
+#if defined(TINY_GSM_MODEM_HAS_SSL)
+#define USE_SSL
+#endif
+
+#ifdef USE_SSL
+TinyGsmClientSecure client(modem);
+const int           port = 443;
 #else
 TinyGsmClient  client(modem);
 const int      port = 80;

diff --git a/tools/test_build/test_build.ino b/tools/test_build/test_build.ino
@@ -63,6 +63,7 @@ void loop() {
   modem.networkDisconnect();
 #endif
 
+#if not defined(TINY_GSM_MODEM_BG95SSL)  // no insecure client
   // Test TCP functions
   modem.maintain();
   TinyGsmClient client;
@@ -90,6 +91,7 @@ void loop() {
   }
 
   client.stop();
+#endif
 
 #if defined(TINY_GSM_MODEM_HAS_SSL)
   // modem.addCertificate();  // not yet impemented