Merge branch 'develop' into t-watch-ultra

2026-10-21 10:42:35 +10:00 · 2025-10-21 10:17:13 +02:00
parent efd2ca9c06 26747038bb
commit 9f8311ffd5
173 changed files with 2370 additions and 1342 deletions
@@ -6,7 +6,6 @@
 #define GPS_TX_PIN 15
 #define GPS_RX_PIN 12
 #define PIN_GPS_EN 4
-#define GPS_POWER_TOGGLE // Moved definition from platformio.ini to here

 #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
 // Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.
@@ -7,4 +7,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_1
  -I variants/esp32/heltec_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -6,4 +6,3 @@ build_flags =
  ${esp32_base.build_flags}
  -D PRIVATE_HW
  -I variants/esp32/heltec_wsl_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -10,7 +10,6 @@ build_flags =
  ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
-  -DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely.
  -DBOARD_HAS_PSRAM
  -mfix-esp32-psram-cache-issue
 upload_speed = 921600
@@ -4,5 +4,13 @@ board = ttgo-lora32-v21
 board_check = true
 build_flags = 
  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 upload_speed = 115200
+
+[env:sugarcube]
+extends = env:tlora-v2-1-1_6
+board_level = extra
+build_flags =
+  ${env:tlora-v2-1-1_6.build_flags}
+  -DBUTTON_PIN=0
+  -DPIN_BUZZER=25
+  -DLED_PIN=-1
@@ -8,7 +8,11 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22

+#if defined(LED_PIN) && LED_PIN == -1
+#undef LED_PIN
+#else
 #define LED_PIN 25 // If defined we will blink this LED
+#endif

 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module
@@ -6,6 +6,5 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D LORA_TCXO_GPIO=33
 upload_speed = 115200
@@ -5,6 +5,5 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D LORA_TCXO_GPIO=12
  -D BUTTON_PIN=0
@@ -5,4 +5,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D CDEBYTE_EORA_S3
  -I variants/esp32s3/CDEBYTE_EoRa-S3
-  -D GPS_POWER_TOGGLE
@@ -16,7 +16,6 @@ build_flags =
  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
  -DEINK_DISPLAY_MODEL=GxEPD2_579_GDEY0579T93 ;https://www.good-display.com/product/439.html
  -DEINK_WIDTH=792
  -DEINK_HEIGHT=272
@@ -46,7 +45,6 @@ build_flags =
  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
  -DEINK_DISPLAY_MODEL=GxEPD2_420_GYE042A87   ; similar Panel: GDEY042T81 : https://www.good-display.com/product/386.html
  -DEINK_WIDTH=400
  -DEINK_HEIGHT=300
@@ -76,7 +74,6 @@ build_flags =
  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
  -DEINK_DISPLAY_MODEL=GxEPD2_290_GDEY029T94 ;https://www.good-display.com/product/389.html
  -DEINK_WIDTH=296
  -DEINK_HEIGHT=128
@@ -6,5 +6,4 @@ board_build.partitions = default_8MB.csv
 build_flags = 
  ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
  -D HELTEC_CAPSULE_SENSOR_V3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
@@ -8,4 +8,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V3
  -I variants/esp32s3/heltec_v3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -7,4 +7,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V4
  -I variants/esp32s3/heltec_v4
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -8,7 +8,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_wireless_tracker
  -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

 lib_deps =
@@ -8,7 +8,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_wireless_tracker_V1_0
  -D HELTEC_TRACKER_V1_0
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 lib_deps =
  ${esp32s3_base.lib_deps}
@@ -8,7 +8,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_wireless_tracker_v2
  -D HELTEC_WIRELESS_TRACKER_V2
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 lib_deps =
  ${esp32s3_base.lib_deps}
  lovyan03/LovyanGFX@^1.2.0
@@ -7,4 +7,3 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_WSL_V3
  -I variants/esp32s3/heltec_wsl_v3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -5,7 +5,6 @@ build_flags =
  ${esp32_base.build_flags}
  -D LINK_32
  -I variants/esp32s3/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
@@ -7,7 +7,6 @@ upload_protocol = esptool
 build_flags = 
  ${esp32_base.build_flags} -I variants/esp32s3/t-deck-pro
  -D T_DECK_PRO
-  -D GPS_POWER_TOGGLE
  -D USE_EINK
  -D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10
  -D EINK_WIDTH=240
@@ -9,7 +9,6 @@ upload_protocol = esptool
 build_flags = ${esp32s3_base.build_flags} 
  -D T_DECK 
  -D BOARD_HAS_PSRAM
-  -D GPS_POWER_TOGGLE
  -I variants/esp32s3/t-deck

 lib_deps = ${esp32s3_base.lib_deps}
@@ -9,7 +9,6 @@ build_flags =
  -D T_ETH_ELITE
  -D HAS_UDP_MULTICAST=1
  -I variants/esp32s3/t-eth-elite
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

 lib_ignore = 
    Ethernet
@@ -10,7 +10,6 @@ build_flags = ${esp32s3_base.build_flags}
  -I variants/esp32s3/tlora-pager
  -D T_LORA_PAGER 
  -D BOARD_HAS_PSRAM
-  -D GPS_POWER_TOGGLE
  -D HAS_SDCARD
  -D SDCARD_USE_SPI1
  -D ENABLE_ROTARY_PULLUP
@@ -8,7 +8,6 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_T3S3_EPAPER
  -I variants/esp32s3/tlora_t3s3_epaper
-  -DGPS_POWER_TOGGLE
  -DUSE_EINK
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
@@ -6,4 +6,3 @@ upload_protocol = esptool

 build_flags = 
  ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/esp32s3/tlora_t3s3_v1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -8,7 +8,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/tracksenger/internal
  -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

 lib_deps =
@@ -25,7 +24,6 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/tracksenger/lcd
  -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

 lib_deps =
@@ -42,5 +40,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/tracksenger/oled
  -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
@@ -17,6 +17,7 @@ extends = native_base
 build_flags = ${native_base.build_flags}
  !pkg-config --libs libulfius --silence-errors || :
  !pkg-config --libs openssl --silence-errors || :
+  !pkg-config --cflags --libs sdl2 --silence-errors || :

 [env:native-tft]
 extends = native_base
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/ELECROW-ThinkNode-M1
  -DELECROW_ThinkNode_M1
-  -DGPS_POWER_TOGGLE
  -DUSE_EINK
  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
  -DEINK_WIDTH=200
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DME25LS01_4Y10TD
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD>
 lib_deps = 
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DME25LS01_4Y10TD
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
  -DEINK_WIDTH=400
  -DEINK_HEIGHT=300
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/MS24SF1
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MS24SF1>
 lib_deps =
@@ -94,7 +94,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define PIN_GPS_RX (0 + 20) // P0.20

 #define PIN_GPS_EN (0 + 24) // P0.24
-#define GPS_POWER_TOGGLE
 #define GPS_UBLOX
 // define GPS_DEBUG

@@ -93,7 +93,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define PIN_GPS_RX (0 + 20) // P0.20

 #define PIN_GPS_EN (0 + 24) // P0.24
-#define GPS_POWER_TOGGLE
 #define GPS_UBLOX
 // define GPS_DEBUG

@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/gat562_mesh_trial_tracker
  ;-D GAT562_MESH_TRIAL_TRACKER
  -D PRIVATE_HW
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/heltec_mesh_node_t114
-  -DGPS_POWER_TOGGLE
  -DHELTEC_T114

 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t114>
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/heltec_mesh_solar
-  -DGPS_POWER_TOGGLE
  -DHELTEC_MESH_SOLAR

 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_solar>
@@ -9,7 +9,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/meshlink
  -D MESHLINK
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
  -D EINK_WIDTH=250
  -D EINK_HEIGHT=122
@@ -9,7 +9,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/meshlink_eink
  -D MESHLINK
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
  -D EINK_WIDTH=250
  -D EINK_HEIGHT=122
@@ -19,7 +19,9 @@
 #ifndef _VARIANT_MESHTINY_
 #define _VARIANT_MESHTINY_

+#ifndef MESHTINY
 #define MESHTINY
+#endif

 /** Master clock frequency */
 #define VARIANT_MCK (64000000ul)
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/r1-neo
  -D R1_NEO
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/rak2560
  -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
@@ -0,0 +1,31 @@
+; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
+[env:rak3401-1watt]
+extends = nrf52840_base
+board = wiscore_rak4631
+board_check = true
+build_flags = ${nrf52840_base.build_flags} 
+  -Ivariants/nrf52840/rak3401_1watt
+  -D RAK_4631
+;   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D RAK3401
+  -D RAK13302 ; RAK 1Watt Power Amplifier
+  -DRADIOLIB_EXCLUDE_SX128X=1
+  -DRADIOLIB_EXCLUDE_SX127X=1
+  -DRADIOLIB_EXCLUDE_LR11X0=1
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak3401_1watt> +<mesh/api/>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  ${networking_base.lib_deps}
+  melopero/Melopero RV3028@^1.1.0
+  rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
+  beegee-tokyo/RAK12035_SoilMoisture@^1.0.4
+  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"
+
@@ -0,0 +1,45 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // LED1 & LED2
+    pinMode(PIN_LED1, OUTPUT);
+    ledOff(PIN_LED1);
+
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
+}
@@ -0,0 +1,226 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_RAK3401_
+#define _VARIANT_RAK3401_
+
+#define RAK4630
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+// define USE_LFRC    // Board uses RC for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (6)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (35)
+#define PIN_LED2 (36)
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (5)
+#define PIN_A1 (31)
+#define PIN_A2 (28)
+#define PIN_A3 (29)
+#define PIN_A4 (30)
+#define PIN_A5 (31)
+#define PIN_A6 (0xff)
+#define PIN_A7 (0xff)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+static const uint8_t A4 = PIN_A4;
+static const uint8_t A5 = PIN_A5;
+static const uint8_t A6 = PIN_A6;
+static const uint8_t A7 = PIN_A7;
+#define ADC_RESOLUTION 14
+
+// Other pins
+#define WB_I2C1_SDA (13) // SENSOR_SLOT IO_SLOT
+#define WB_I2C1_SCL (14) // SENSOR_SLOT IO_SLOT
+
+#define PIN_AREF (2)
+#define PIN_NFC1 (9)
+#define WB_IO5 PIN_NFC1
+#define WB_IO4 (4)
+#define PIN_NFC2 (10)
+
+static const uint8_t AREF = PIN_AREF;
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL1_RX (15)
+#define PIN_SERIAL1_TX (16)
+
+// Connected to Jlink CDC
+#define PIN_SERIAL2_RX (8)
+#define PIN_SERIAL2_TX (6)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 2
+
+#define PIN_SPI_MISO (45)
+#define PIN_SPI_MOSI (44)
+#define PIN_SPI_SCK (43)
+
+#define PIN_SPI1_MISO (29) // (0 + 29)
+#define PIN_SPI1_MOSI (30) // (0 + 30)
+#define PIN_SPI1_SCK (3)   // (0 + 3)
+
+static const uint8_t SS = 42;
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
+static const uint8_t SCK = PIN_SPI_SCK;
+
+/*
+ * eink display pins
+ */
+#define PIN_EINK_CS (0 + 26)
+#define PIN_EINK_BUSY (0 + 4)
+#define PIN_EINK_DC (0 + 17)
+#define PIN_EINK_RES (-1)
+#define PIN_EINK_SCLK (0 + 3)
+#define PIN_EINK_MOSI (0 + 30) // also called SDI
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (WB_I2C1_SDA)
+#define PIN_WIRE_SCL (WB_I2C1_SCL)
+
+// QSPI Pins
+#define PIN_QSPI_SCK 3
+#define PIN_QSPI_CS 26
+#define PIN_QSPI_IO0 30
+#define PIN_QSPI_IO1 29
+#define PIN_QSPI_IO2 28
+#define PIN_QSPI_IO3 2
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES IS25LP080D
+#define EXTERNAL_FLASH_USE_QSPI
+
+// 1watt sx1262 RAK13302
+#define HW_SPI1_DEVICE 1
+
+#define LORA_SCK PIN_SPI1_SCK
+#define LORA_MISO PIN_SPI1_MISO
+#define LORA_MOSI PIN_SPI1_MOSI
+#define LORA_CS 26
+
+#define USE_SX1262
+#define SX126X_CS (26)
+#define SX126X_DIO1 (10)
+#define SX126X_BUSY (9)
+#define SX126X_RESET (4)
+
+#define SX126X_POWER_EN (21)
+// DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+// Testing USB detection
+#define NRF_APM
+// If using a power chip like the INA3221 you can override the default battery voltage channel below
+// and comment out NRF_APM to use the INA3221 instead of the USB detection for charging
+// #define INA3221_BAT_CH INA3221_CH2
+// #define INA3221_ENV_CH INA3221_CH1
+
+// enables 3.3V periphery like GPS or IO Module
+// Do not toggle this for GPS power savings
+#define PIN_3V3_EN (34)
+#define WB_IO2 PIN_3V3_EN
+
+// RAK1910 GPS module
+// If using the wisblock GPS module and pluged into Port A on WisBlock base
+// IO1 is hooked to PPS (pin 12 on header) = gpio 17
+// IO2 is hooked to GPS RESET = gpio 34, but it can not be used to this because IO2 is ALSO used to control 3V3_S power (1 is on).
+// Therefore must be 1 to keep peripherals powered
+// Power is on the controllable 3V3_S rail
+// #define PIN_GPS_RESET (34)
+// #define PIN_GPS_EN PIN_3V3_EN
+#define PIN_GPS_PPS (17) // Pulse per second input from the GPS
+
+#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
+
+// RAK18001 Buzzer in Slot C
+// #define PIN_BUZZER 21 // IO3 is PWM2
+// NEW: set this via protobuf instead!
+
+// Battery
+// The battery sense is hooked to pin A0 (5)
+#define BATTERY_PIN PIN_A0
+// and has 12 bit resolution
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER 1.73
+
+#define HAS_RTC 1
+
+#define RAK_4631 1
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif
@@ -7,7 +7,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/rak4631
  -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
  -DEINK_HEIGHT=122
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/rak4631_eth_gw
  -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DHAS_UDP_MULTICAST=1
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/rak4631_nomadstar_meteor_pro
  -D NOMADSTAR_METEOR_PRO
-  ;-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
  -DEINK_HEIGHT=122
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
  -I variants/nrf52840/rak_wismeshtag
  -D WISMESH_TAG
  -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
@@ -6,7 +6,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/rak_wismeshtap
  -DWISMESH_TAP
  -DRAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
  -DEINK_HEIGHT=122
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/t-echo-lite
  -D T_ECHO_LITE
-  -D GPS_POWER_TOGGLE
  -D EINK_DISPLAY_MODEL=GxEPD2_122_T61
  -D EINK_WIDTH=192
  -D EINK_HEIGHT=176
@@ -9,7 +9,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
  -Ivariants/nrf52840/t-echo
-  -DGPS_POWER_TOGGLE
  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
  -DEINK_WIDTH=200
  -DEINK_HEIGHT=200
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DTRACKER_T1000_E
-  -DGPS_POWER_TOGGLE
  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
  -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -DMESHTASTIC_EXCLUDE_SCREEN=1
@@ -14,7 +14,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DCFG_TUD_CDC=0
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-sdk-wm1110>
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-t1000-s>
 lib_deps = 
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
  -Isrc/platform/nrf52/softdevice
  -Isrc/platform/nrf52/softdevice/nrf52
  -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-tracker-wm1110>
 lib_deps =