Fix merge errors

Author: oscgonfer

src/modules/Telemetry/AirQualityTelemetry.h

@@ -11,10 +11,13 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
+#include "detect/ScanI2CConsumer.h"
+#include <OLEDDisplay.h>
+#include <OLEDDisplayUi.h>
 
 class AirQualityTelemetryModule : private concurrency::OSThread,
-    public ScanI2CConsumer,
-    public ProtobufModule<meshtastic_Telemetry>
+                                  public ScanI2CConsumer,
+                                  public ProtobufModule<meshtastic_Telemetry>
 {
     CallbackObserver<AirQualityTelemetryModule, const meshtastic::Status *> nodeStatusObserver =
         CallbackObserver<AirQualityTelemetryModule, const meshtastic::Status *>(this,

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -144,7 +144,6 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/AddI2CSensorTemplate.h"
 #include "graphics/ScreenFonts.h"
 #include <Throttle.h>
-#include "Sensor/AddI2CSensorTemplate.h"
 
 void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 {

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -58,11 +58,6 @@ class TelemetrySensor
     const char *sensorName;
     // TODO: delete after migration
     bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }
-    // Functions to sleep / wakeup sensors that support it
-    virtual void sleep(){};
-    virtual uint32_t wakeUp() { return 0; }
-    // Return active by default, override per sensor
-    virtual bool isActive() { return true; }
 
     // Functions to sleep / wakeup sensors that support it
     // These functions can save power consumption in cases like AQ