test on Windows

lib/espMqttClient/src/Helpers.h

@@ -23,7 +23,10 @@ the LICENSE file.
 #if EMC_ESP8266_MULTITHREADING
 // This lib doesn't run use multithreading on ESP8266
 // _xSemaphore defined as std::atomic<bool>
-    #define EMC_SEMAPHORE_TAKE() while (_xSemaphore) { /*ESP.wdtFeed();*/ } _xSemaphore = true
+#define EMC_SEMAPHORE_TAKE()                                                                                                                                   \
+    while (_xSemaphore) { /*ESP.wdtFeed();*/                                                                                                                   \
+    }                                                                                                                                                          \
+    _xSemaphore = true
 #define EMC_SEMAPHORE_GIVE() _xSemaphore = false
 #else
 #define EMC_SEMAPHORE_TAKE()
@@ -44,6 +47,13 @@ the LICENSE file.
 #include <mutex> // NOLINT [build/c++11]
 #define EMC_SEMAPHORE_TAKE() mtx.lock();
 #define EMC_SEMAPHORE_GIVE() mtx.unlock();
+#elif defined(_WIN32)
+#include <Arduino.h>
+#define EMC_SEMAPHORE_TAKE()
+#define EMC_SEMAPHORE_GIVE()
+#define EMC_YIELD()
+#define EMC_GET_FREE_MEMORY() 1000
+#define EMC_GENERATE_CLIENTID(x)
 #else
 #error Target platform not supported
 #endif

lib/espMqttClient/src/Transport/ClientPosixIPAddress.cpp

@@ -6,7 +6,7 @@ For a copy, see <https://opensource.org/licenses/MIT> or
 the LICENSE file.
 */
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(_WIN32)
 
 #include "ClientPosixIPAddress.h"
 

lib/espMqttClient/src/espMqttClient.cpp

@@ -120,4 +120,9 @@ espMqttClient::espMqttClient()
     , _client() {
     _transport = &_client;
 }
+#elif defined(_WIN32)
+// Windows
+espMqttClient::espMqttClient()
+    : MqttClientSetup(espMqttClientTypes::UseInternalTask::NO) {
+}
 #endif

lib/espMqttClient/src/espMqttClient.h

@@ -67,9 +67,8 @@ class espMqttClientSecure : public MqttClientSetup<espMqttClientSecure> {
   protected:
     espMqttClientInternals::ClientSecureSync _client;
 };
-#endif
 
-#if defined(__linux__)
+#elif defined(__linux__)
 class espMqttClient : public MqttClientSetup<espMqttClient> {
   public:
     espMqttClient();
@@ -77,4 +76,10 @@ class espMqttClient : public MqttClientSetup<espMqttClient> {
   protected:
     espMqttClientInternals::ClientPosix _client;
 };
+#elif defined(_WIN32)
+class espMqttClient : public MqttClientSetup<espMqttClient> {
+  public:
+    espMqttClient();
+};
+
 #endif

lib_standalone/Arduino.cpp

@@ -17,7 +17,6 @@
 
 #ifdef EMSESP_STANDALONE
 
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <iostream>
@@ -57,8 +56,11 @@ void ClientLoop(void * arg) {
     }
 }
 
+#ifndef UNITY_INCLUDE_CONFIG_H
+// we have another main that overrides this when using Unity in test_api.cpp
 int main(int argc __attribute__((unused)), char * argv[] __attribute__((unused))) {
     setup();
+
     std::thread t = std::thread(ClientLoop, nullptr);
     // while (millis() <= 10 * 1000) {
     while (1) {
@@ -69,10 +71,7 @@ int main(int argc __attribute__((unused)), char * argv[] __attribute__((unused))
     t.join();
     return EXIT_SUCCESS;
 }
-
+#endif
-// unsigned long millis() {
-//     return __millis;
-// }
 
 int64_t esp_timer_get_time() {
     return __millis;

lib_standalone/Arduino.h

@@ -32,6 +32,10 @@
 #include <iostream>
 
 #include "WString.h"
+#include "Network.h"
+
+extern ETHClass  ETH;
+extern WiFiClass WiFi;
 
 typedef double double_t;
 
@@ -86,6 +90,21 @@ int vsnprintf_P(char * str, size_t size, const char * format, va_list ap);
 #define pgm_read_float(addr) (*(const float *)(addr))
 #define pgm_read_ptr(addr) (*(const void **)(addr))
 
+// #if defined(__linux__)
+#include <chrono> // NOLINT [build/c++11]
+#include <thread> // NOLINT [build/c++11] for yield()
+#define millis() std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count()
+// #endif
+
+int64_t esp_timer_get_time();
+
+void delay(unsigned long millis);
+
+void yield(void);
+
+void setup(void);
+void loop(void);
+
 class Print;
 
 class NativeConsole : public Stream {
@@ -94,6 +113,11 @@ class NativeConsole : public Stream {
     }
 
     int available() override {
+#if defined(_WIN32)
+        // added for EMS-ESP
+        return 1;
+#else
+
         if (peek_ != -1)
             return 1;
 
@@ -107,6 +131,7 @@ class NativeConsole : public Stream {
         timeout.tv_usec = 1000;
 
         return ::select(STDIN_FILENO + 1, &rfds, NULL, NULL, &timeout) > 0 ? 1 : 0;
+#endif
     }
 
     int read() override {
@@ -163,27 +188,6 @@ class NativeConsole : public Stream {
     int peek_ = -1;
 };
 
-#include "Network.h"
-
 extern NativeConsole Serial;
-extern ETHClass      ETH;
-extern WiFiClass     WiFi;
-
-// unsigned long millis();
-
-#if defined(__linux__)
-#include <chrono> // NOLINT [build/c++11]
-#include <thread> // NOLINT [build/c++11] for yield()
-#define millis() std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count()
-#endif
-
-int64_t esp_timer_get_time();
-
-void delay(unsigned long millis);
-
-void yield(void);
-
-void setup(void);
-void loop(void);
 
 #endif

lib_standalone/Print.h

@@ -86,7 +86,12 @@ class Print {
         return print(str);
     }
     size_t println() {
+        // added for EMS-ESP
+#if defined(_WIN32)
+        return print("\n");
+#else
         return print("\r\n");
+#endif
     }
     size_t println(const char * data) {
         return print(data) + println();