misc library updates and compiler warnings, trunk upgrade

2025-02-01 02:09:57 +00:00 · 2024-10-01 16:02:10 +02:00 · 2024-10-01 16:02:10 +02:00 · 0d175a918c
commit 0d175a918c
parent 3440c640c3
10 changed files with 25 additions and 26 deletions
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@ -1,14 +1,14 @@
 version: 0.1
 cli:
-  version: 1.22.5
+  version: 1.22.6
 plugins:
  sources:
    - id: trunk
-      ref: v1.6.2
+      ref: v1.6.3
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - trufflehog@3.82.5
+    - trufflehog@3.82.6
    - yamllint@1.35.1
    - bandit@1.7.10
    - checkov@3.2.255
@ -16,19 +16,19 @@ lint:
    - trivy@0.55.2
    #- trufflehog@3.63.2-rc0
    - taplo@0.9.3
-    - ruff@0.6.7
+    - ruff@0.6.8
    - isort@5.13.2
    - markdownlint@0.42.0
    - oxipng@9.1.2
    - svgo@3.3.2
-    - actionlint@1.7.2
+    - actionlint@1.7.3
    - flake8@7.1.1
    - hadolint@2.12.0
    - shfmt@3.6.0
    - shellcheck@0.10.0
    - black@24.8.0
    - git-diff-check
-    - gitleaks@8.19.2
+    - gitleaks@8.19.3
    - clang-format@16.0.3
    - prettier@3.3.3
  ignore:
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@ -2,7 +2,7 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-platform = platformio/espressif32@6.7.0
+platform = platformio/espressif32@6.9.0

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@ -46,7 +46,7 @@ lib_deps =
  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
  h2zero/NimBLE-Arduino@^1.4.2
  https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+  lewisxhe/XPowersLib@^0.2.6
  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  rweather/Crypto@^0.4.0

--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@ -23,7 +23,7 @@ lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+  lewisxhe/XPowersLib@^0.2.6
  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  rweather/Crypto@^0.4.0

--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@ -24,7 +24,7 @@ lib_deps =
  ${env.lib_deps}
  ${networking_base.lib_deps}
  rweather/Crypto@^0.4.0
-  https://github.com/lovyan03/LovyanGFX.git#5a39989aa2c9492572255b22f033843ec8900233
+  lovyan03/LovyanGFX@^1.1.16

 build_flags =
  ${arduino_base.build_flags}
--- a/arch/rp2xx0/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#60d6ae81fcc73c34b1493ca9e261695e471bc0c2
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9e55f6db5c56b9867c69fe473f388beea4546672
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.7.2
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#a6ab6e1f95bc1428d667d55ea7173c0744acc03c ; 4.0.2+

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@ -1,7 +1,7 @@
 [stm32_base]
 extends = arduino_base
 platform = ststm32
-platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#361a7fdb67e2a7104e99b4f42a802469eef8b129
+platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#ea74156acd823b6d14739f389e6cdc648f8ee36e

 build_type = release

@ -33,5 +33,5 @@ lib_deps =
  https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e

 lib_ignore =
-  https://github.com/mathertel/OneButton@~2.6.1
+  mathertel/OneButton@~2.6.1
  Wire
--- a/platformio.ini
+++ b/platformio.ini
@ -82,7 +82,7 @@ build_flags = -Wno-missing-field-initializers
  -DRADIOLIB_EXCLUDE_LORAWAN=1
  -DMESHTASTIC_EXCLUDE_DROPZONE=1
  -DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
-  -DBUILD_EPOCH=$UNIX_TIME
+  ;-DBUILD_EPOCH=$UNIX_TIME
  ;-D OLED_PL

 monitor_speed = 115200
@ -91,11 +91,11 @@ monitor_filters = direct
 lib_deps =
  jgromes/RadioLib@~7.0.2
  https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
-  https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
+  mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
  https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
  https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
-  nanopb/Nanopb@^0.4.8
+  nanopb/Nanopb@^0.4.9
  erriez/ErriezCRC32@^1.0.1

 ; Used for the code analysis in PIO Home / Inspect
@ -128,7 +128,7 @@ lib_deps =
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-  adafruit/Adafruit BusIO@^1.15.0
+  adafruit/Adafruit BusIO@^1.16.1
  adafruit/Adafruit Unified Sensor@^1.1.11
  adafruit/Adafruit BMP280 Library@^2.6.8
  adafruit/Adafruit BMP085 Library@^1.2.4
@ -141,9 +141,9 @@ lib_deps =
  adafruit/Adafruit SHTC3 Library@^1.0.0
  adafruit/Adafruit LPS2X@^2.0.4
  adafruit/Adafruit SHT31 Library@^2.2.2
-  adafruit/Adafruit PM25 AQI Sensor@^1.0.6
+  adafruit/Adafruit PM25 AQI Sensor@^1.1.1
  adafruit/Adafruit MPU6050@^2.2.4
-  adafruit/Adafruit LIS3DH@^1.2.4
+  adafruit/Adafruit LIS3DH@^1.3.0
  adafruit/Adafruit AHTX0@^2.0.5
  adafruit/Adafruit LSM6DS@^4.7.2
  adafruit/Adafruit VEML7700 Library@^2.1.6
@ -158,8 +158,8 @@ lib_deps =
  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
  boschsensortec/BME68x Sensor Library@^1.1.40407
  https://github.com/KodinLanewave/INA3221@^1.0.1
-  lewisxhe/SensorLib@0.2.0
+  lewisxhe/SensorLib@^0.2.1
  mprograms/QMC5883LCompass@^1.2.0
  
-  https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
+  https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@ -66,7 +66,6 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
                                     uint8_t *bytesOut)
 {
    uint8_t *auth;
-    uint32_t *extraNonce;
    long extraNonceTmp = random();
    auth = bytesOut + numBytes;
    memcpy((uint8_t *)(auth + 8), &extraNonceTmp,
--- a/src/motion/BMA423Sensor.cpp
+++ b/src/motion/BMA423Sensor.cpp
@ -26,9 +26,9 @@ bool BMA423Sensor::init()

 #ifdef T_WATCH_S3
        // Need to raise the wrist function, need to set the correct axis
-        sensor.setReampAxes(sensor.REMAP_TOP_LAYER_RIGHT_CORNER);
+        sensor.setRemapAxes(sensor.REMAP_TOP_LAYER_RIGHT_CORNER);
 #else
-        sensor.setReampAxes(sensor.REMAP_BOTTOM_LAYER_BOTTOM_LEFT_CORNER);
+        sensor.setRemapAxes(sensor.REMAP_BOTTOM_LAYER_BOTTOM_LEFT_CORNER);
 #endif
        // sensor.enableFeature(sensor.FEATURE_STEP_CNTR, true);
        sensor.enableFeature(sensor.FEATURE_TILT, true);
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@ -19,7 +19,7 @@ lib_deps =
  melopero/Melopero RV3028@^1.1.0
  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
  rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
-  https://github.com/meshtastic/RAK12034-BMX160.git#4821355fb10390ba8557dc43ca29a023bcfbb9d9
+  https://github.com/RAKWireless/RAK12034-BMX160.git#dcead07ffa267d3c906e9ca4a1330ab989e957e2

 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds