Merge branch 'main' into multiple-BLE-devices

CoretechR · Dec 7, 2024 · 83dcbb8 · 83dcbb8
2 parents 2b61db4 + 47018a6
commit 83dcbb8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/Platformio/hardware/hardwareLayer.h b/Platformio/hardware/hardwareLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WIN32) || defined(__linux__)
+#if defined(WIN32) || defined(__linux__) || defined(__APPLE__)
   #include "windows_linux/include_hal_windows_linux.h"
 #elif defined(ARDUINO)
   #include "ESP32/include_hal_esp32.h"

diff --git a/Platformio/hardware/windows_linux/heapUsage_hal_windows_linux.cpp b/Platformio/hardware/windows_linux/heapUsage_hal_windows_linux.cpp
@@ -1,4 +1,8 @@
+#if defined(__APPLE__)
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 
 #if defined(WIN32)
 // https://www.daniweb.com/programming/software-development/threads/135188/calculate-the-amount-of-heap-memory
@@ -20,7 +24,7 @@ long HeapUsed()
     return used;
 }
 
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 long HeapUsed() {
   // don't know how to get used heap size in linux
   return 800000;

diff --git a/Platformio/hardware/windows_linux/lib/MQTT-C/include/posix_sockets.h b/Platformio/hardware/windows_linux/lib/MQTT-C/include/posix_sockets.h
@@ -7,7 +7,9 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
+#if !defined(__APPLE__)
 #include <linux/if.h>
+#endif
 #else
 #include <ws2tcpip.h>
 #endif
@@ -50,7 +52,7 @@ int open_nb_socket(const char* addr, const char* port, char *MACaddress) {
           continue;
         }
 
-        #if !defined(WIN32)
+        #if !defined(WIN32) && !defined(__APPLE__)
         // get MAC address
         struct ifreq s;
         ioctl(sockfd, SIOCGIFHWADDR, &s);

diff --git a/Platformio/hardware/windows_linux/mqtt_hal_windows_linux.cpp b/Platformio/hardware/windows_linux/mqtt_hal_windows_linux.cpp
@@ -119,7 +119,7 @@ void reconnect_mqtt(struct mqtt_client *mqttClient, void**) {
   }
 }
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__APPLE__)
 std::string getMACaddress() {
   struct ifreq s;
   int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);

diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini
@@ -229,3 +229,11 @@ build_flags =
 	-m32
 	;linker option
 	-Wl,-mi386pe
+
+[env:macOS]
+extends = env:linux_64bit
+build_flags =
+	${env:linux_64bit.build_flags}
+	-I/opt/homebrew/include
+	-L/opt/homebrew/lib
+	-std=c++11
diff --git a/Platformio/src/applicationInternal/hardware/arduinoLayer.cpp b/Platformio/src/applicationInternal/hardware/arduinoLayer.cpp
@@ -1,4 +1,4 @@
-#if defined(WIN32) || defined(__linux__)
+#if defined(WIN32) || defined(__linux__) || defined(__APPLE__)
 
 #include "applicationInternal/hardware/arduinoLayer.h"
 #include <stdarg.h>

diff --git a/Platformio/src/applicationInternal/hardware/arduinoLayer.h b/Platformio/src/applicationInternal/hardware/arduinoLayer.h
@@ -6,7 +6,7 @@
   // for env:esp32 we need "Arduino.h" e.g. for Serial, delay(), millis()
   #include <Arduino.h>
 
-#elif defined(WIN32) || defined(__linux__)
+#elif defined(WIN32) || defined(__linux__) || defined(__APPLE__)
   #include <stdint.h>
   // For Windows and Linux there is no Arduino framework available. So we have to simulate at least those very few calls to Arduino functions which are left in the code.
   // Note: Of course there is a lot more Arduino code in folder "hardware/ESP32/*", but this code is only active in case of esp32, so we don't have to simulate this in the Arduino layer if Windows/Linux is active.

diff --git a/Platformio/src/main.cpp b/Platformio/src/main.cpp
@@ -53,7 +53,7 @@
 // in case of Arduino we have a setup() and a loop()
 void setup() {
 
-#elif defined(WIN32) || defined(__linux__)
+#elif defined(WIN32) || defined(__linux__) || defined(__APPLE__)
 // in case of Windows/Linux, we have only a main() function, no setup() and loop(), so we have to simulate them
 // forward declaration of loop()
 void loop(unsigned long *pIMUTaskTimer, unsigned long *pUpdateStatusTimer);
@@ -155,7 +155,7 @@ int main(int argc, char *argv[]) {
 
   omote_log_i("Setup finished in %lu ms.\r\n", millis());
 
-  #if defined(WIN32) || defined(__linux__)
+  #if defined(WIN32) || defined(__linux__) || defined(__APPLE__)
   // In Windows/Linux there is no loop function that is automatically being called. So we have to do this on our own infinitely here in main()
   unsigned long IMUTaskTimer = 0;
   unsigned long updateStatusTimer = 0;
@@ -172,7 +172,7 @@ unsigned long updateStatusTimer = 0;
 unsigned long *pIMUTaskTimer = &IMUTaskTimer;
 unsigned long *pUpdateStatusTimer = &updateStatusTimer;
 void loop() {
-#elif defined(WIN32) || defined(__linux__)
+#elif defined(WIN32) || defined(__linux__) || defined(__APPLE__)
 void loop(unsigned long *pIMUTaskTimer, unsigned long *pUpdateStatusTimer) {
 #endif