From deea7be89ba59069d5dc8c3e373666cdd21f4870 Mon Sep 17 00:00:00 2001
From: "Ethac.chen" <ethan.chen@rakwireless.com>
Date: Thu, 16 Jul 2026 20:02:57 +0800
Subject: [PATCH] Add RAK WisMesh Pocket V3 variant (rak_wismesh_pocket env)
 (#10953)

---
 variants/nrf52840/rak4631/platformio.ini | 15 +++++++++++++++
 variants/nrf52840/rak4631/variant.h      | 13 ++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
index 2cdaafba4..d0b776b3b 100644
--- a/variants/nrf52840/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -56,6 +56,21 @@ build_flags =
   -DSAFE_VDD_VOLTAGE_THRESHOLD_MV=2900
   -DSAFE_VDD_VOLTAGE_THRESHOLD_HYST_MV=100
 
+; RAK WisMesh Pocket V3 - rak4631 pin map + OLED; no ethernet (unlike env:rak4631)
+[env:rak_wismesh_pocket]
+extends = env:rak4631
+custom_meshtastic_display_name = RAK WisMesh Pocket V3
+custom_meshtastic_images = rak4631.svg
+build_flags =
+  ${env:rak4631.build_flags}
+  -D WISMESH_POCKET
+  -DLOW_VDD_SYSTEMOFF_DELAY_MS=5000
+  -DSAFE_VDD_VOLTAGE_THRESHOLD_MV=2900
+  -DSAFE_VDD_VOLTAGE_THRESHOLD_HYST_MV=100
+build_src_filter = ${env:rak4631.build_src_filter}
+  -<mesh/eth/>
+  -<mesh/api/>
+
 ; 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
diff --git a/variants/nrf52840/rak4631/variant.h b/variants/nrf52840/rak4631/variant.h
index 8ea272a15..bdd797836 100644
--- a/variants/nrf52840/rak4631/variant.h
+++ b/variants/nrf52840/rak4631/variant.h
@@ -231,6 +231,11 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define PIN_3V3_EN (34)
 #define WB_IO2 PIN_3V3_EN
 
+#if defined(WISMESH_POCKET)
+// Pocket v3: P1.02 (GPIO 34) = GPS_PWR_EN
+#define PIN_GPS_EN PIN_3V3_EN
+#endif
+
 // 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
@@ -253,9 +258,11 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define PIN_BUZZER 21 // IO3 is PWM2
 // NEW: set this via protobuf instead!
 
-// RAK4631 custom ringtone
+// RAK4631 custom ringtone (but not for Pocket - it uses the default ringtone)
+#ifndef WISMESH_POCKET
 #undef USERPREFS_RINGTONE_RTTTL
 #define USERPREFS_RINGTONE_RTTTL "Rak:d=32,o=5,b=200:b7,p,b7,4p,p"
+#endif
 
 // Battery
 // The battery sense is hooked to pin A0 (5)
@@ -282,7 +289,11 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 // VDD=3.3V AIN3=6/8*VDD=2.47V VBAT=1.66*AIN3=4.1V
 #define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_11_16
 
+#if defined(WISMESH_POCKET)
+#define HAS_ETHERNET 0
+#else
 #define HAS_ETHERNET 1
+#endif
 
 #define RAK_4631 1