From b161649989d3fea8e2ca080f25d0b88d1169e401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 18 May 2024 10:22:07 +0200 Subject: [PATCH 1/5] remove screen pinning for pico targets --- variants/rpipico/variant.h | 2 -- variants/rpipicow/variant.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/variants/rpipico/variant.h b/variants/rpipico/variant.h index ad6d0b211..7efaeaf7a 100644 --- a/variants/rpipico/variant.h +++ b/variants/rpipico/variant.h @@ -4,8 +4,6 @@ #define ARDUINO_ARCH_AVR -#define USE_SH1106 1 - // default I2C pins: // SDA = 4 // SCL = 5 diff --git a/variants/rpipicow/variant.h b/variants/rpipicow/variant.h index a17f05ee0..24da8f932 100644 --- a/variants/rpipicow/variant.h +++ b/variants/rpipicow/variant.h @@ -8,8 +8,6 @@ #define HAS_WIFI 1 #endif -#define USE_SH1106 1 - // default I2C pins: // SDA = 4 // SCL = 5 From 108dfdc2ecd38ed6e3007036da49a10ec4e4b7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 18 May 2024 10:41:32 +0200 Subject: [PATCH 2/5] update trunk --- .trunk/trunk.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 0826b71d9..8a2f18ad5 100644 --- a/.trunk/trunk.yaml +++ b/.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 From 7ef9fec446b6a214d3c5ee39f8c1cb66695c7102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 17 May 2024 10:21:56 +0200 Subject: [PATCH 3/5] PLEASE TEST move the power rail init earlier in the startup process on 4630 --- src/main.cpp | 11 ----------- variants/monteops_hw1/variant.cpp | 4 ++++ variants/rak10701/variant.cpp | 4 ++++ variants/rak4631/variant.cpp | 4 ++++ variants/rak4631_epaper/variant.cpp | 4 ++++ variants/rak4631_epaper_onrxtx/variant.cpp | 4 ++++ 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 64ff92dd7..4a9fef5d0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -360,18 +360,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 #ifdef T_DECK // enable keyboard @@ -548,10 +541,6 @@ void setup() setupSDCard(); #endif -#ifdef RAK4630 - // scanEInkDevice(); -#endif - // LED init #ifdef LED_PIN diff --git a/variants/monteops_hw1/variant.cpp b/variants/monteops_hw1/variant.cpp index 75cca1dc3..e84b60b3b 100644 --- a/variants/monteops_hw1/variant.cpp +++ b/variants/monteops_hw1/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); } diff --git a/variants/rak10701/variant.cpp b/variants/rak10701/variant.cpp index 2b4bd39a6..5a3587982 100644 --- a/variants/rak10701/variant.cpp +++ b/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); } \ No newline at end of file diff --git a/variants/rak4631/variant.cpp b/variants/rak4631/variant.cpp index 75cca1dc3..e84b60b3b 100644 --- a/variants/rak4631/variant.cpp +++ b/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); } diff --git a/variants/rak4631_epaper/variant.cpp b/variants/rak4631_epaper/variant.cpp index 75cca1dc3..e84b60b3b 100644 --- a/variants/rak4631_epaper/variant.cpp +++ b/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); } diff --git a/variants/rak4631_epaper_onrxtx/variant.cpp b/variants/rak4631_epaper_onrxtx/variant.cpp index 75cca1dc3..e84b60b3b 100644 --- a/variants/rak4631_epaper_onrxtx/variant.cpp +++ b/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); } From cf0424922ac79c4e092fbd06d3443be5f372dd39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 17 May 2024 10:42:23 +0200 Subject: [PATCH 4/5] target does not use the powerrail --- variants/monteops_hw1/variant.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variants/monteops_hw1/variant.cpp b/variants/monteops_hw1/variant.cpp index e84b60b3b..75cca1dc3 100644 --- a/variants/monteops_hw1/variant.cpp +++ b/variants/monteops_hw1/variant.cpp @@ -38,8 +38,4 @@ void initVariant() pinMode(PIN_LED2, OUTPUT); ledOff(PIN_LED2); - - // 3V3 Power Rail - pinMode(PIN_3V3_EN, OUTPUT); - digitalWrite(PIN_3V3_EN, HIGH); } From 84d3117a7aa930d31721929613c17eb1097974ea Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sat, 18 May 2024 12:21:35 -0500 Subject: [PATCH 5/5] Lock Portduino to MAGIC_USB_BATTERY_LEVEL for now (#3894) --- src/modules/Telemetry/DeviceTelemetry.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp index 3529267cb..002ce62a9 100644 --- a/src/modules/Telemetry/DeviceTelemetry.cpp +++ b/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; -} \ No newline at end of file +}