From bc08e0fdaaf09c0275281c58faa70736ff422ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 27 May 2025 23:34:23 +0200 Subject: [PATCH] Update to real HWID and trunk fmt --- .trunk/trunk.yaml | 7 ++++--- src/platform/esp32/architecture.h | 2 ++ variants/link32_s3_v1/platformio.ini | 3 +-- variants/link32_s3_v1/variant.h | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 91bdf11cb..162fdfd2d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -4,11 +4,12 @@ cli: plugins: sources: - id: trunk - ref: v1.6.8 + ref: v1.7.0 uri: https://github.com/trunk-io/plugins lint: enabled: - - renovate@40.0.6 + - checkov@3.2.435 + - renovate@40.32.7 - prettier@3.5.3 - trufflehog@3.88.34 - yamllint@1.37.1 @@ -37,7 +38,7 @@ runtimes: enabled: - python@3.10.8 - go@1.21.0 - - node@18.20.5 + - node@22.16.0 actions: disabled: - trunk-announce diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index 68d06c6d7..3763bce1e 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -184,6 +184,8 @@ #define HW_VENDOR meshtastic_HardwareModel_HELTEC_SENSOR_HUB #elif defined(ELECROW_PANEL) #define HW_VENDOR meshtastic_HardwareModel_CROWPANEL +#elif defined(LINK_32) +#define HW_VENDOR meshtastic_HardwareModel_LINK_32 #endif // ----------------------------------------------------------------------------- diff --git a/variants/link32_s3_v1/platformio.ini b/variants/link32_s3_v1/platformio.ini index 767548e4f..5a614a7af 100644 --- a/variants/link32_s3_v1/platformio.ini +++ b/variants/link32_s3_v1/platformio.ini @@ -2,11 +2,10 @@ extends = esp32s3_base board = esp32-s3-devkitc-1 build_flags = - ${esp32_base.build_flags} -D PRIVATE_HW -I variants/link32_s3_v1 + ${esp32_base.build_flags} -D LINK_32 -I variants/link32_s3_v1 -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. -DARDUINO_USB_CDC_ON_BOOT -DARDUINO_USB_MODE=1 -DRADIOLIB_EXCLUDE_SX128X=1 -DRADIOLIB_EXCLUDE_SX127X=1 -DRADIOLIB_EXCLUDE_LR11X0=1 - \ No newline at end of file diff --git a/variants/link32_s3_v1/variant.h b/variants/link32_s3_v1/variant.h index 2308cd1ff..1f8a7435a 100644 --- a/variants/link32_s3_v1/variant.h +++ b/variants/link32_s3_v1/variant.h @@ -8,9 +8,9 @@ #define BUTTON_PIN 0 // Button pin for this board #define BUTTON_PIN_ALT 36 -#define HAS_NEOPIXEL // If defined, we will use the neopixel library -#define NEOPIXEL_DATA 35 // Neopixel pin for this board -#define NEOPIXEL_COUNT 1 // Number of neopixels on this board +#define HAS_NEOPIXEL // If defined, we will use the neopixel library +#define NEOPIXEL_DATA 35 // Neopixel pin for this board +#define NEOPIXEL_COUNT 1 // Number of neopixels on this board #define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use #define ADC_MULTIPLIER 2