From 0325a129c4ca27869da4b5cc671cd385f99b4c81 Mon Sep 17 00:00:00 2001 From: "Daniel.Cao" Date: Mon, 14 Jul 2025 10:26:51 +0800 Subject: [PATCH] Remove unused build flags and dependencies --- variants/rak_wismeshtag/platformio.ini | 45 ++------------------------ variants/rak_wismeshtag/variant.h | 5 --- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/variants/rak_wismeshtag/platformio.ini b/variants/rak_wismeshtag/platformio.ini index 05dfb760d..a066e5282 100644 --- a/variants/rak_wismeshtag/platformio.ini +++ b/variants/rak_wismeshtag/platformio.ini @@ -6,49 +6,10 @@ board_check = true build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtag -D WISMESH_TAG -D RAK_4631 -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. - -DEINK_WIDTH=250 - -DEINK_HEIGHT=122 -DRADIOLIB_EXCLUDE_SX128X=1 -DRADIOLIB_EXCLUDE_SX127X=1 -DRADIOLIB_EXCLUDE_LR11X0=1 -build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak_wismeshtag> + + + + -DMESHTASTIC_EXCLUDE_WIFI=1 +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak_wismeshtag> lib_deps = - ${nrf52840_base.lib_deps} - ${networking_base.lib_deps} - melopero/Melopero RV3028@^1.1.0 - https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip - rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2 - https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip - -; 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 -;upload_protocol = jlink - -; Allows programming and debug via the RAK NanoDAP as the default debugger tool for the RAK4631 (it is only $10!) -; programming time is about the same as the bootloader version. -; For information on this see the meshtastic developers documentation for "Development on the NRF52" -[env:rak4631_dbg] -extends = env:rak4631 -board_level = extra - -; if the builtin version of openocd has a buggy version of semihosting, so use the external version -; platform_packages = platformio/tool-openocd@^3.1200.0 - -build_flags = - ${env:rak4631.build_flags} - -D USE_SEMIHOSTING - -lib_deps = - ${env:rak4631.lib_deps} - https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip - -; NOTE: the pyocd support for semihosting is buggy. So I switched to using the builtin platformio support for the stlink adapter which worked much better. -; However the built in openocd version in platformio has buggy support for TCP to semihosting. -; -; So I'm now trying the external openocd - but the openocd scripts for nrf52.cfg assume you are using a DAP adapter not an STLINK adapter. -; In theory I could change those scripts. But for now I'm trying going back to a DAP adapter but with the external openocd. - -upload_protocol = stlink -; eventually use platformio/tool-pyocd@^2.3600.0 instad -;upload_protocol = custom -;upload_command = pyocd flash -t nrf52840 $UPLOADERFLAGS $SOURCE \ No newline at end of file + ${nrf52840_base.lib_deps} \ No newline at end of file diff --git a/variants/rak_wismeshtag/variant.h b/variants/rak_wismeshtag/variant.h index f87592680..dd82b76a1 100644 --- a/variants/rak_wismeshtag/variant.h +++ b/variants/rak_wismeshtag/variant.h @@ -218,11 +218,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG #define GPS_RX_PIN PIN_SERIAL1_RX #define GPS_TX_PIN PIN_SERIAL1_TX -// Define pin to enable GPS toggle (set GPIO to LOW) via user button triple press - -// RAK12002 RTC Module -#define RV3028_RTC (uint8_t)0b1010010 - // RAK WISMESHTAG #define PIN_BUZZER 21