src/graphics/Screen.cpp

@@ -1581,6 +1581,10 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             digitalWrite(VTFT_LEDA, TFT_BACKLIGHT_ON);
 #endif
 #endif
+#ifdef TFT_BL
+            pinMode(TFT_BL, OUTPUT);
+            digitalWrite(TFT_BL, HIGH);
+#endif
 #if defined(M5STACK_CORE2)
             M5.Power.Axp192.setDCDC3(1000);
             M5.Display.setBrightness(130);
@@ -1596,6 +1600,10 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #endif
             LOG_INFO("Turn off screen");
             dispdev->displayOff();
+#ifdef TFT_BL
+            pinMode(TFT_BL, OUTPUT);
+            digitalWrite(TFT_BL, LOW);
+#endif
 #if defined(M5STACK_CORE2)
             M5.Power.Axp192.setDCDC3(0);
 #endif
@@ -2763,4 +2771,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

variants/m5stack_core2/variant.h

@@ -1,7 +1,4 @@
 #define BUTTON_NEED_PULLUP
-#define HAS_AXP192
-#define I2C_SDA 21 // For AXP192
-#define I2C_SCL 22 // For AXP192
 
 #undef LORA_SCK
 #undef LORA_MISO