Fix Other build flags

lib/bme/bme.cpp

@@ -8,7 +8,7 @@
 
 #include "bme.hpp"
 
-#ifdef ENABLE_BME
+#ifdef BME280
 
 Adafruit_BME280 bme = Adafruit_BME280();
 

lib/bme/bme.hpp

@@ -9,7 +9,9 @@
 #ifndef BME_HPP
 #define BME_HPP
 
-#ifdef ENABLE_BME
+#ifdef BME280
+
+#define ENABLE_TEMP
 
 #include <Adafruit_Sensor.h>
 #include <Adafruit_BME280.h>

lib/compass/compass.cpp

@@ -14,7 +14,7 @@ int mapHeading = 0;
 Adafruit_HMC5883_Unified compass = Adafruit_HMC5883_Unified(12345);
 #endif
 
-#ifdef MPU9250
+#ifdef IMU_MPU9250
 MPU9250 IMU = MPU9250(Wire, 0x68);
 #endif
 
@@ -54,7 +54,7 @@ void initCompass()
   if (!compass.begin())
     compass.begin();
   #endif
-  #ifdef MPU9250
+  #ifdef IMU_MPU9250
   int status = IMU.begin();
   if (status < 0)
   {
@@ -82,7 +82,7 @@ void readCompass(float &x, float &y, float &z)
   z = event.magnetic.z;
   #endif
 
-  #ifdef MPU9250
+  #ifdef IMU_MPU9250
   IMU.readSensor();
   x = IMU.getMagX_uT();
   y = IMU.getMagY_uT();

lib/compass/compass.hpp

@@ -20,7 +20,7 @@ extern Adafruit_HMC5883_Unified compass;
 #define ENABLE_COMPASS
 #endif
 
-#ifdef MPU9250
+#ifdef IMU_MPU9250
 #include <MPU9250.h>
 extern MPU9250 IMU;
 #define ENABLE_COMPASS

lib/gui/src/notifyBar.cpp

@@ -25,7 +25,7 @@ void updateNotifyBar(lv_event_t *event)
 
   if (obj == gpsTime)
     lv_label_set_text_fmt(obj, timeFormat, hour(now()), minute(now()), second(now()));
-  #ifdef ENABLE_BME
+  #ifdef ENABLE_TEMP
   if (obj == temp)
     lv_label_set_text_fmt(obj, "%02d\xC2\xB0", tempValue);
   #endif
@@ -114,7 +114,7 @@ void updateNotifyBarTimer(lv_timer_t *t)
   else
    lv_led_off(gpsFix);
 
-  #ifdef ENABLE_BME
+  #ifdef ENABLE_TEMP
   tempValue = (uint8_t)(bme.readTemperature());
   if (tempValue != tempOld)
   {
@@ -170,7 +170,7 @@ void createNotifyBar()
   lv_label_set_text_static(wifi, " ");
   lv_obj_add_event_cb(wifi, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);
 
-  #ifdef ENABLE_BME
+  #ifdef ENABLE_TEMP
   temp = lv_label_create(notifyBarIcons);
   lv_label_set_text_static(temp, "--\xC2\xB0");
   lv_obj_add_event_cb(temp, updateNotifyBar, LV_EVENT_VALUE_CHANGED, NULL);

platformio.ini

@@ -68,7 +68,7 @@ build_flags =
   -mfix-esp32-psram-cache-issue
 	-D AT6558D_GPS=1
   -D HMC5883L=1
-	-D ENABLE_BME=1
+	-D BME280=1
 	-D ILI9488_XPT2046_SPI=1
 	-D TFT_BL=33
 
@@ -85,7 +85,7 @@ build_flags =
 	-DBOARD_HAS_PSRAM
   -DARDUINO_ESP32S3_DEV
   -D AT6558D_GPS=1
-	-D MPU9250=1
+	-D IMU_MPU9250=1
 	-D ILI9488_FT5x06_16B=1
 	-D TFT_BL=45
 

src/main.cpp

@@ -24,11 +24,15 @@
 #include "storage.hpp"
 #include "tft.hpp"
 
-#ifdef ENABLE_COMPASS
+#ifdef HMC5883L
 #include "compass.hpp"
 #endif
 
-#ifdef ENABLE_BME
+#ifdef IMU_MPU9250
+#include "compass.hpp"
+#endif
+
+#ifdef BME280
 #include "bme.hpp"
 #endif
 
@@ -49,7 +53,7 @@ void setup()
    Wire.begin();
   #endif
 
-  #ifdef ENABLE_BME
+  #ifdef BME280
    initBME();
   #endif