Merge branch 'master' into tft-gui-work

.trunk/trunk.yaml

@@ -1,32 +1,32 @@
 version: 0.1
 cli:
-  version: 1.20.1
+  version: 1.22.1
 plugins:
   sources:
     - id: trunk
-      ref: v1.4.4
+      ref: v1.5.0
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - trufflehog@3.68.5
+    - trufflehog@3.76.3
     - yamllint@1.35.1
-    - bandit@1.7.7
-    - checkov@3.2.32
+    - bandit@1.7.8
+    - checkov@3.2.95
     - terrascan@1.19.1
-    - trivy@0.49.1
+    - trivy@0.51.1
     #- trufflehog@3.63.2-rc0
     - taplo@0.8.1
-    - ruff@0.3.1
+    - ruff@0.4.4
     - isort@5.13.2
-    - markdownlint@0.39.0
-    - oxipng@9.0.0
-    - svgo@3.2.0
-    - actionlint@1.6.27
+    - markdownlint@0.40.0
+    - oxipng@9.1.1
+    - svgo@3.3.2
+    - actionlint@1.7.0
     - flake8@7.0.0
     - hadolint@2.12.0
     - shfmt@3.6.0
-    - shellcheck@0.9.0
-    - black@24.2.0
+    - shellcheck@0.10.0
+    - black@24.4.2
     - git-diff-check
     - gitleaks@8.18.2
     - clang-format@16.0.3

src/main.cpp

@@ -378,18 +378,11 @@ void setup()
     delay(1);
 #endif
 
-#ifdef RAK4630
-#ifdef PIN_3V3_EN
-    // We need to enable 3.3V periphery in order to scan it
-    pinMode(PIN_3V3_EN, OUTPUT);
-    digitalWrite(PIN_3V3_EN, HIGH);
-#endif
 #ifdef AQ_SET_PIN
     // RAK-12039 set pin for Air quality sensor
     pinMode(AQ_SET_PIN, OUTPUT);
     digitalWrite(AQ_SET_PIN, HIGH);
 #endif
-#endif
 
 #if defined(T_DECK)
     // enable keyboard
@@ -565,10 +558,6 @@ void setup()
     setupSDCard();
 #endif
 
-#ifdef RAK4630
-    // scanEInkDevice();
-#endif
-
     // LED init
 
 #ifdef LED_PIN

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -69,8 +69,12 @@ meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
     t.time = getTime();
     t.which_variant = meshtastic_Telemetry_device_metrics_tag;
     t.variant.device_metrics.air_util_tx = airTime->utilizationTXPercent();
+#if ARCH_PORTDUINO
+    t.variant.device_metrics.battery_level = MAGIC_USB_BATTERY_LEVEL;
+#else
     t.variant.device_metrics.battery_level =
         powerStatus->getIsCharging() ? MAGIC_USB_BATTERY_LEVEL : powerStatus->getBatteryChargePercent();
+#endif
     t.variant.device_metrics.channel_utilization = airTime->channelUtilizationPercent();
     t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
     t.variant.device_metrics.uptime_seconds = getUptimeSeconds();
@@ -100,4 +104,4 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
         service.sendToMesh(p, RX_SRC_LOCAL, true);
     }
     return true;
-}
+}

variants/rak10701/variant.cpp

@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }

variants/rak4631/variant.cpp

@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }

variants/rak4631_epaper/variant.cpp

@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }

variants/rak4631_epaper_onrxtx/variant.cpp

@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }

variants/rpipico/variant.h

@@ -4,8 +4,6 @@
 
 #define ARDUINO_ARCH_AVR
 
-#define USE_SH1106 1
-
 // default I2C pins:
 // SDA = 4
 // SCL = 5

variants/rpipicow/variant.h

@@ -8,8 +8,6 @@
 #define HAS_WIFI 1
 #endif
 
-#define USE_SH1106 1
-
 // default I2C pins:
 // SDA = 4
 // SCL = 5