project migrated to arduino LMIC 1.6 MCCI

include/globals.h

@@ -53,7 +53,7 @@ extern std::array<uint64_t, 0xff> beacons;
 extern TaskHandle_t irqHandlerTask, wifiSwitchTask;
 
 #ifdef HAS_GPS
-#include "gps.h"
+#include "gpsread.h"
 #endif
 
 #if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
@@ -67,7 +67,7 @@ extern TaskHandle_t irqHandlerTask, wifiSwitchTask;
 #endif
 
 #ifdef HAS_SPI
-#include "spi.h"
+#include "spisend.h"
 #endif
 
 #ifdef HAS_DISPLAY

include/gpsread.h

@@ -1,5 +1,5 @@
-#ifndef _GPS_H
-#define _GPS_H
+#ifndef _GPSREAD_H
+#define _GPSREAD_H
 
 #include <TinyGPS++.h> // library for parsing NMEA data
 #include <TimeLib.h>

include/ota.h

@@ -17,7 +17,7 @@ int version_compare(const String v1, const String v2);
 void display(const uint8_t row, const std::string status,
                        const std::string msg);
 #ifdef HAS_DISPLAY
-void show_progress(size_t current, size_t size);
+void show_progress(unsigned long current, unsigned long size);
 #endif
 
 #endif // USE_OTA

include/spisend.h

@@ -1,5 +1,5 @@
-#ifndef _SPI_H
-#define _SPI_H
+#ifndef _SPISEND_H
+#define _SPISEND_H
 
 extern TaskHandle_t SpiTask;
 extern QueueHandle_t SPISendQueue;