diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 4dd040287..491ab32ba 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,7 +9,7 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.471
-    - renovate@41.118.1
+    - renovate@41.125.3
     - prettier@3.6.2
     - trufflehog@3.90.8
     - yamllint@1.37.1
@@ -23,7 +23,7 @@ lint:
     - svgo@4.0.0
     - actionlint@1.7.7
     - flake8@7.3.0
-    - hadolint@2.13.1
+    - hadolint@2.14.0
     - shfmt@3.6.0
     - shellcheck@0.11.0
     - black@25.9.0
diff --git a/platformio.ini b/platformio.ini
index 5da8c2e67..bd2e8fa37 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -125,7 +125,7 @@ lib_deps =
 [environmental_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
-	adafruit/Adafruit BusIO@1.17.3
+	adafruit/Adafruit BusIO@1.17.4
 	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
 	adafruit/Adafruit Unified Sensor@1.1.15
 	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
diff --git a/variants/nrf52840/heltec_mesh_solar/variant.cpp b/variants/nrf52840/heltec_mesh_solar/variant.cpp
index ab54621cc..c13f006d7 100644
--- a/variants/nrf52840/heltec_mesh_solar/variant.cpp
+++ b/variants/nrf52840/heltec_mesh_solar/variant.cpp
@@ -32,10 +32,9 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-  pinMode(BQ4050_EMERGENCY_SHUTDOWN_PIN, INPUT);
+    pinMode(BQ4050_EMERGENCY_SHUTDOWN_PIN, INPUT);
 #if defined(PIN_SCREEN_VDD_CTL)
-  pinMode(PIN_SCREEN_VDD_CTL, OUTPUT);
-  digitalWrite(PIN_SCREEN_VDD_CTL, LOW); // Start with power on
+    pinMode(PIN_SCREEN_VDD_CTL, OUTPUT);
+    digitalWrite(PIN_SCREEN_VDD_CTL, LOW); // Start with power on
 #endif
-
 }
diff --git a/variants/nrf52840/heltec_mesh_solar/variant.h b/variants/nrf52840/heltec_mesh_solar/variant.h
index 161a66a5a..d37e078f9 100644
--- a/variants/nrf52840/heltec_mesh_solar/variant.h
+++ b/variants/nrf52840/heltec_mesh_solar/variant.h
@@ -39,16 +39,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-
-#define PIN_LED1 (0 + 4) // green (confirmed on 1.0 board)
+#define PIN_LED1 (0 + 4)  // green (confirmed on 1.0 board)
 #define LED_BLUE PIN_LED1 // fake for bluefruit library
 #define LED_GREEN PIN_LED1
 #define LED_BUILTIN LED_GREEN
-#define LED_STATE_ON 0  // State when LED is lit
+#define LED_STATE_ON 0 // State when LED is lit
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
-#define NEOPIXEL_DATA (32+15)                // gpio pin used to send data to the neopixels
+#define NEOPIXEL_DATA (32 + 15)              // gpio pin used to send data to the neopixels
 #define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
 
 /*
@@ -70,6 +69,7 @@ No longer populated on PCB
 
 #define WIRE_INTERFACES_COUNT 2
 
+#ifndef HELTEC_MESH_SOLAR_OLED
 #ifndef HELTEC_MESH_SOLAR_OLED
 // I2C bus 0
 #define PIN_WIRE_SDA (0 + 6)
@@ -80,6 +80,8 @@ No longer populated on PCB
 // Available on header pins, for general use
 #define PIN_WIRE1_SDA (0 + 30)
 #define PIN_WIRE1_SCL (0 + 5)
+#define PIN_WIRE1_SDA (0 + 30)
+#define PIN_WIRE1_SCL (0 + 5)
 
 /*
  * Lora radio
@@ -88,14 +90,14 @@ No longer populated on PCB
 #define USE_SX1262
 // #define USE_SX1268
 #define SX126X_CS (0 + 24) // FIXME - we really should define LORA_CS instead
-#define LORA_CS  (0 + 24)
+#define LORA_CS (0 + 24)
 #define SX126X_DIO1 (0 + 20)
 // Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
 // #define SX1262_DIO3 (0 + 21)
 // This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the
 //    main
 // CPU?
-#define SX126X_BUSY  (0 + 17)
+#define SX126X_BUSY (0 + 17)
 #define SX126X_RESET (0 + 25)
 // Not really an E22 but TTGO seems to be trying to clone that
 #define SX126X_DIO2_AS_RF_SWITCH
@@ -132,16 +134,16 @@ No longer populated on PCB
 // For LORA, spi 0
 #define PIN_SPI_MISO (0 + 23)
 #define PIN_SPI_MOSI (0 + 22)
-#define PIN_SPI_SCK  (0 + 19)
+#define PIN_SPI_SCK (0 + 19)
 
 // #define PIN_PWR_EN (0 + 6)
 
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 
-#define BQ4050_SDA_PIN                      (32+1) // I2C data line pin
-#define BQ4050_SCL_PIN                      (32+0) // I2C clock line pin
-#define BQ4050_EMERGENCY_SHUTDOWN_PIN       (32+3) // Emergency shutdown pin
+#define BQ4050_SDA_PIN (32 + 1)                // I2C data line pin
+#define BQ4050_SCL_PIN (32 + 0)                // I2C clock line pin
+#define BQ4050_EMERGENCY_SHUTDOWN_PIN (32 + 3) // Emergency shutdown pin
 
 #define HAS_RTC 0
 #ifdef __cplusplus