simplify TFT display definition

include/display.h

@@ -2,6 +2,7 @@
 #define _DISPLAY_H
 
 #include <libpax_api.h>
+#include <Wire.h>
 #include "cyclic.h"
 #include "qrcode.h"
 #include "power.h"
@@ -48,7 +49,7 @@ extern BB_SPI_LCD *dp;
 #endif
 
 // settings for TFT display library
-#elif (HAS_DISPLAY == 2)
+#elif (HAS_DISPLAY) == 2
 
 #define MY_FONT_SMALL 2
 #define MY_FONT_NORMAL 2
@@ -74,10 +75,6 @@ extern BB_SPI_LCD *dp;
 #define OLED_TYPE OLED_128x64
 #endif
 
-#ifndef MY_DISPLAY_INVERT
-#define MY_DISPLAY_INVERT 0
-#endif
-
 #ifndef MY_DISPLAY_FLIP
 #define MY_DISPLAY_FLIP 0
 #endif

include/globals.h

@@ -12,7 +12,10 @@
 #include <set>
 #include <array>
 #include <algorithm>
+
+#ifdef HAS_BME680
 #include <bsec.h>
+#endif
 
 #define _bit(b) (1U << (b))
 #define _bitl(b) (1UL << (b))

include/i2c.h

@@ -2,6 +2,7 @@
 #define _I2C_H
 
 #include <Arduino.h>
+#include <Wire.h>
 #include <BitBang_I2C.h>
 
 #define SSD1306_PRIMARY_ADDRESS (0x3D)

include/led.h

@@ -1,8 +1,12 @@
 #ifndef _LED_H
 #define _LED_H
 
+#ifdef RGB_LED_COUNT
 #include <SmartLeds.h>
+#endif
+#ifdef HAS_LORA
 #include "lorawan.h"
+#endif
 
 #ifndef RGB_LED_COUNT
 #define RGB_LED_COUNT 1