Clean up some #defines, Add wire library, verify compilation in Arduino for ESP

src/fdrs_gateway.h

@@ -64,6 +64,9 @@ void sendLog();
 void resendLog();
 void releaseLogBuffer();
 
+#ifdef USE_I2C
+  #include <Wire.h>
+#endif
 #ifdef USE_OLED
   #include "fdrs_oled.h"
 #endif
@@ -120,10 +123,10 @@ void beginFDRS()
   Serial.begin(115200);
   UART_IF.begin(115200, SERIAL_8N1, RXD2, TXD2);
 #endif
-#if defined(USE_OLED) || defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+#ifdef USE_I2C
   Wire.begin(I2C_SDA, I2C_SCL);
 #endif
-#if defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+#ifdef USE_RTC
   begin_rtc();
 #endif
 #ifdef USE_OLED

src/fdrs_gateway_time.h

@@ -45,6 +45,7 @@ void sendTimeLoRa();
 void printTime();
 esp_err_t sendTimeESPNow();
 bool setTime(time_t);
+void sendTimeSerial();
 
 #ifdef USE_RTC_DS3231
 #include <RtcDS3231.h>
@@ -54,7 +55,7 @@ RtcDS3231<TwoWire> rtc(Wire);
 RtcDS3231<TwoWire> rtc(Wire);
 #endif
 
-#if defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+#ifdef USE_RTC
 void begin_rtc() {
   DBG("Starting RTC");
   rtc.Begin();
@@ -96,7 +97,7 @@ void begin_rtc() {
   rtc.Enable32kHzPin(false);
   rtc.SetSquareWavePin(DS3231SquareWavePin_ModeNone); 
 }
-#endif // USE_RTC_DS3231 || USE_RTC_DS1307
+#endif // USE_RTC
 
 bool validTime() {
   if(now < 1672000000 || (millis() - lastNTPFetchSuccess > (24*60*60*1000))) {
@@ -255,7 +256,7 @@ void sendTime() {
   if(validTime()) { // Only send time if it is valid
     DBG("Sending out time");
   // Only send via Serial interface if WiFi is enabled to prevent loops
-#if defined(USE_WIFI) || defined (USE_RTC_DS3231) || defined(USE_RTC_DS1307) // do not remove this line
+#if defined(USE_WIFI) || defined (USE_RTC) // do not remove this line
     sendTimeSerial();
 #endif          // do not remove this line
     sendTimeLoRa();
@@ -282,7 +283,7 @@ bool setTime(time_t currentTime) {
 #if defined(ESP32) || defined(ESP8266) // settimeofday may only work with Espressif chips
   settimeofday(&tv,NULL); // set the RTC time
 #endif
-#if defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+#ifdef USE_RTC
   RtcDateTime rtcNow;
   rtcNow.InitWithUnix32Time(now);
   rtc.SetDateTime(rtcNow);

src/fdrs_globals.h

@@ -37,4 +37,12 @@
 
 #define MAC_PREFIX  0xAA, 0xBB, 0xCC, 0xDD, 0xEE  // MAC address prefix. Can be used to distinguish different ESP-NOW networks.
 
+#if defined(USE_OLED) || defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+    #define USE_I2C
+#endif
+
+#if defined(USE_RTC_DS3231) || defined(USE_RTC_DS1307)
+  #define USE_RTC
+#endif
+
 #endif