Fix STM32 and Teensy compilation errors of missing _gettimeofday and …

…IP to string conversion.
mobizt · Sep 11, 2023 · 806930e · 806930e
1 parent c6ce44f
commit 806930e
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 19 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP Mail Client",
-  "version": "3.4.10",
+  "version": "3.4.11",
   "keywords": "communication, email, imap, smtp, esp32, esp8266, samd, arduino",
   "description": "Arduino E-Mail Client Library to send, read and get incoming email notification for ESP32, ESP8266 and SAMD21 devices. The library also supported other Arduino Devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP Mail Client
 
-version=3.4.10
+version=3.4.11
 
 author=Mobizt
 

diff --git a/src/ESP_Mail_Client.cpp b/src/ESP_Mail_Client.cpp
@@ -4,7 +4,7 @@
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Client.h b/src/ESP_Mail_Client.h
@@ -2,7 +2,7 @@
 #define ESP_MAIL_CLIENT_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Client_Version.h b/src/ESP_Mail_Client_Version.h
@@ -3,8 +3,8 @@
 
 #ifndef ESP_MAIL_VERSION
 
-#define ESP_MAIL_VERSION "3.4.10"
-#define ESP_MAIL_VERSION_NUM 30410
+#define ESP_MAIL_VERSION "3.4.11"
+#define ESP_MAIL_VERSION_NUM 30411
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define VALID_VERSION_CHECK(ver) (ver == ESP_MAIL_VERSION_NUM)

diff --git a/src/ESP_Mail_Const.h b/src/ESP_Mail_Const.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONST_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Error.h b/src/ESP_Mail_Error.h
@@ -7,7 +7,7 @@
 #define ESP_MAIL_ERROR_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_FS.h b/src/ESP_Mail_FS.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONFIG_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_IMAP.h b/src/ESP_Mail_IMAP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_IMAP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_SMTP.h b/src/ESP_Mail_SMTP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_SMTP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_TCPClient.h b/src/ESP_Mail_TCPClient.h
@@ -30,7 +30,7 @@
 #define ESP_MAIL_TCPCLIENT_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 
@@ -1068,9 +1068,8 @@ class ESP_Mail_TCPClient
         {
             if (ret)
             {
-                MB_String s = MBSTRING_FLASH_MCR("Connected with IP ");
-                s += Ethernet.localIP().toString();
-                esp_mail_debug_print_tag(s.c_str(), esp_mail_debug_tag_type_info, true, false);
+                esp_mail_debug_print_tag((const char *)MBSTRING_FLASH_MCR("Connected with IP "), esp_mail_debug_tag_type_info, false, false);
+                ESP_MAIL_DEFAULT_DEBUG_PORT.println(Ethernet.localIP());
             }
             else
                 esp_mail_debug_print_tag((const char *)MBSTRING_FLASH_MCR("Can't connect"), esp_mail_debug_tag_type_error, true, false);

diff --git a/src/SSLClient/client/stm32_time_fix.c b/src/SSLClient/client/stm32_time_fix.c
@@ -0,0 +1,16 @@
+
+// _gettimeofday link missing in STM32 
+
+#if defined(ARDUINO_ARCH_STM32)
+
+#include <sys/time.h>
+
+__attribute__((weak)) int _gettimeofday(struct timeval *tv, void *ignore __attribute__((unused)))
+{
+    uint64_t t = 0;
+    tv->tv_sec = t / 1000000000;
+    tv->tv_usec = (t % 1000000000) / 1000;
+    return 0;
+}
+
+#endif
diff --git a/src/extras/MB_Time.h b/src/extras/MB_Time.h
@@ -2,7 +2,7 @@
 #define MB_Time_H
 
 #include "./ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/Networks.h b/src/extras/Networks.h
@@ -4,7 +4,7 @@
 #include "./ESP_Mail_FS.h"
 
 #include "./ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 
@@ -21,6 +21,10 @@
 #include <esp_idf_version.h>
 #endif
 
+#if __has_include(<IPAddress.h>)
+#include <IPAddress.h>
+#endif
+
 #if defined(ESP8266) || defined(MB_ARDUINO_PICO)
 
 #include <string>

diff --git a/src/extras/RFC2047.cpp b/src/extras/RFC2047.cpp
@@ -2,7 +2,7 @@
 #define RFC2047_CPP
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/RFC2047.h b/src/extras/RFC2047.h
@@ -4,7 +4,7 @@
 #define RFC2047_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30410)
+#if !VALID_VERSION_CHECK(30411)
 #error "Mixed versions compilation."
 #endif