From 5850a7cd6b503bc57216446cb8ec2260c3c39e9b Mon Sep 17 00:00:00 2001
From: "Daniel.Cao" <144674500+DanielCao0@users.noreply.github.com>
Date: Wed, 3 Sep 2025 19:20:19 +0800
Subject: [PATCH] Add RAK WisMesh Tap V2 (ESP32S3) Hardware Variant (#7741)

* Add initial variant and platformio configuration for RAK WISMESHTAP V2

* Add initial variant and platformio configuration for rak wismesh tap v2

* Remove unnecessary Meshtastic build flags from rak_wismesh_tap_v2 configuration

* Enable LGFX button support in rak_wismesh_tap_v2 configuration

* Revert "Enable LGFX button support in rak_wismesh_tap_v2 configuration"

This reverts commit 2bd2c1a03b1b8a224c440049b7aff8a15bb54dbf.

---------

Co-authored-by: Daniel.Cao <daniel.cao@rakwireless.com>
---
 .../esp32s3/rak_wismesh_tap_v2/pins_arduino.h | 28 ++++++
 .../esp32s3/rak_wismesh_tap_v2/platformio.ini | 87 +++++++++++++++++++
 variants/esp32s3/rak_wismesh_tap_v2/variant.h | 71 +++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
 create mode 100644 variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
 create mode 100644 variants/esp32s3/rak_wismesh_tap_v2/variant.h

diff --git a/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h b/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
new file mode 100644
index 000000000..15a26e991
--- /dev/null
+++ b/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
@@ -0,0 +1,28 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include "variant.h"
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 9;
+static const uint8_t SCL = 40;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 12;
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 10;
+static const uint8_t SCK = 13;
+
+#define SPI_MOSI (11)
+#define SPI_SCK (13)
+#define SPI_MISO (10)
+#define SPI_CS (12)
+
+// LEDs
+#define LED_BUILTIN LED_GREEN
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
new file mode 100644
index 000000000..8b86e0217
--- /dev/null
+++ b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
@@ -0,0 +1,87 @@
+; rak_wismeshtap2 rak3112
+
+[rak_wismeshtap_s3]
+extends = esp32s3_base
+board = wiscore_rak3312
+board_check = true
+upload_protocol = esptool
+board_build.partitions = default_8MB.csv
+
+build_flags = 
+  ${esp32_base.build_flags} 
+  -D RAK3312
+  -D RAK_WISMESH_TAP_V2 
+  -I variants/esp32s3/rak_wismesh_tap_v2
+
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  lovyan03/LovyanGFX@^1.2.0
+
+[ft5x06]
+extends = mesh_tab_base
+build_flags = 
+  -D LGFX_TOUCH=FT5x06
+  -D LGFX_TOUCH_I2C_FREQ=100000
+  -D LGFX_TOUCH_I2C_PORT=0
+  -D LGFX_TOUCH_I2C_ADDR=0x38
+  -D LGFX_TOUCH_I2C_SDA=9
+  -D LGFX_TOUCH_I2C_SCL=40
+  -D LGFX_TOUCH_RST=-1
+  -D LGFX_TOUCH_INT=39
+
+[env:rak_wismesh_tap_v2-tft]
+extends = rak_wismeshtap_s3
+
+build_flags =
+  ${rak_wismeshtap_s3.build_flags}
+  -D CONFIG_ARDUHAL_ESP_LOG
+  -D CONFIG_ARDUHAL_LOG_COLORS=1
+  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_USE_SYSMON=0
+  -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_LOG=0
+  -D LV_BUILD_TEST=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D RADIOLIB_SPI_PARANOID=0
+  -D INPUTDRIVER_BUTTON_TYPE=0
+  -D HAS_SDCARD
+  -D HAS_SCREEN=0
+  -D HAS_TFT=1
+  -D USE_PIN_BUZZER=PIN_BUZZER
+  -D RAM_SIZE=5120
+  -D LGFX_DRIVER_TEMPLATE
+  -D LGFX_DRIVER=LGFX_GENERIC
+  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
+  -D LGFX_PIN_SCK=13
+  -D LGFX_PIN_MOSI=11
+  -D LGFX_PIN_MISO=10
+  -D LGFX_PIN_DC=42
+  -D LGFX_PIN_CS=12
+  -D LGFX_PIN_RST=-1
+  -D LGFX_PIN_BL=41
+  -D VIEW_320x240
+  -D USE_PACKET_API
+  ${ft5x06.build_flags}
+  -D LGFX_SCREEN_WIDTH=240
+  -D LGFX_SCREEN_HEIGHT=320
+  -D LGFX_PANEL=ST7789
+  -D LGFX_ROTATION=1
+  -D LGFX_TOUCH_X_MIN=0
+  -D LGFX_TOUCH_X_MAX=239
+  -D LGFX_TOUCH_Y_MIN=0
+  -D LGFX_TOUCH_Y_MAX=319
+  -D LGFX_TOUCH_ROTATION=2
+  -D LGFX_CFG_HOST=SPI3_HOST
+  -D MAP_FULL_REDRAW=1
+
+lib_deps =
+  ${rak_wismeshtap_s3.lib_deps}
+  ${device-ui_base.lib_deps}
+
+
diff --git a/variants/esp32s3/rak_wismesh_tap_v2/variant.h b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
new file mode 100644
index 000000000..8468c557e
--- /dev/null
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -0,0 +1,71 @@
+#ifndef _VARIANT_RAK_WISMESHTAP_V2_H
+#define _VARIANT_RAK_WISMESHTAP_V2_H
+
+#define I2C_SDA 9
+#define I2C_SCL 40
+
+#define USE_SX1262
+
+#define LORA_SCK 5
+#define LORA_MISO 3
+#define LORA_MOSI 6
+#define LORA_CS 7
+#define LORA_RESET 8
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 47
+#define SX126X_BUSY 48
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif
+
+#define SX126X_POWER_EN (4)
+
+#define PIN_POWER_EN PIN_3V3_EN
+#define PIN_3V3_EN (14)
+
+#define LED_GREEN 46
+#define LED_BLUE 45
+
+#define PIN_LED1 LED_GREEN
+#define PIN_LED2 LED_BLUE
+
+#define LED_CONN LED_BLUE
+#define LED_PIN LED_GREEN
+#define ledOff(pin) pinMode(pin, INPUT)
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+#define HAS_GPS 1
+#define GPS_TX_PIN 43
+#define GPS_RX_PIN 44
+
+#define SPI_MOSI (11)
+#define SPI_SCK (13)
+#define SPI_MISO (10)
+#define SPI_CS (12)
+
+#define HAS_BUTTON 1
+#define BUTTON_PIN 0
+
+#define CANNED_MESSAGE_MODULE_ENABLE 1
+#define USE_VIRTUAL_KEYBOARD 1
+
+#define BATTERY_PIN 1
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_MULTIPLIER 1.667
+
+#define PIN_BUZZER 38
+
+#define HAS_SDCARD 1
+#define SDCARD_USE_SPI1 1
+#define SDCARD_CS  2
+
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+
+#define SD_SPI_FREQUENCY 50000000
+
+#endif
\ No newline at end of file