From a2e5f28be127a558f6224a72e6caf18e05e9f0da Mon Sep 17 00:00:00 2001
From: "Daniel.Cao" <daniel.cao@rakwireless.com>
Date: Mon, 25 Aug 2025 10:47:20 +0800
Subject: [PATCH] Add initial variant and platformio configuration for rak
 wismesh tap v2

---
 .../pins_arduino.h                            |  0
 .../platformio.ini                            | 20 +++++------
 .../variant.h                                 | 36 +++----------------
 3 files changed, 15 insertions(+), 41 deletions(-)
 rename variants/esp32s3/{rak_wismeshtap_v2 => rak_wismesh_tap_v2}/pins_arduino.h (100%)
 rename variants/esp32s3/{rak_wismeshtap_v2 => rak_wismesh_tap_v2}/platformio.ini (83%)
 rename variants/esp32s3/{rak_wismeshtap_v2 => rak_wismesh_tap_v2}/variant.h (60%)

diff --git a/variants/esp32s3/rak_wismeshtap_v2/pins_arduino.h b/variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
similarity index 100%
rename from variants/esp32s3/rak_wismeshtap_v2/pins_arduino.h
rename to variants/esp32s3/rak_wismesh_tap_v2/pins_arduino.h
diff --git a/variants/esp32s3/rak_wismeshtap_v2/platformio.ini b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
similarity index 83%
rename from variants/esp32s3/rak_wismeshtap_v2/platformio.ini
rename to variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
index 6057e956b..dbf96ebae 100644
--- a/variants/esp32s3/rak_wismeshtap_v2/platformio.ini
+++ b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
@@ -10,8 +10,8 @@ board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32_base.build_flags} 
   -D RAK3312
-  -D RAK_WISMESHTAP_V2 
-  -I variants/esp32s3/rak_wismeshtap_v2
+  -D RAK_WISMESH_TAP_V2 
+  -I variants/esp32s3/rak_wismesh_tap_v2
 
 lib_deps =
   ${esp32s3_base.lib_deps}
@@ -29,7 +29,7 @@ build_flags =
   -D LGFX_TOUCH_RST=-1
   -D LGFX_TOUCH_INT=39
 
-[env:rak_wismeshtap_v2-tft]
+[env:rak_wismesh_tap_v2-tft]
 extends = rak_wismeshtap_s3
 
 build_flags =
@@ -37,10 +37,10 @@ build_flags =
   -D CONFIG_ARDUHAL_ESP_LOG
   -D CONFIG_ARDUHAL_LOG_COLORS=1
   -D CONFIG_DISABLE_HAL_LOCKS=1
-  ; -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  ; -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
-  ; -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
-  ; -D MESHTASTIC_EXCLUDE_WEBSERVER=1
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
+  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
   -D LV_LVGL_H_INCLUDE_SIMPLE
   -D LV_CONF_INCLUDE_SIMPLE
   -D LV_COMP_CONF_INCLUDE_SIMPLE
@@ -53,12 +53,12 @@ build_flags =
   -D USE_LOG_DEBUG
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D RADIOLIB_SPI_PARANOID=0
-  ; -D INPUTDRIVER_BUTTON_TYPE=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=1024
+  -D RAM_SIZE=5120
   -D LGFX_DRIVER_TEMPLATE
   -D LGFX_DRIVER=LGFX_GENERIC
   -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
@@ -72,7 +72,6 @@ build_flags =
   -D VIEW_320x240
   -D USE_PACKET_API
   ${ft5x06.build_flags}
-  ; -D SPI_FREQUENCY=16000000 ; may go higher upto 60/80 MHz
   -D LGFX_SCREEN_WIDTH=240
   -D LGFX_SCREEN_HEIGHT=320
   -D LGFX_PANEL=ST7789
@@ -83,6 +82,7 @@ build_flags =
   -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}
diff --git a/variants/esp32s3/rak_wismeshtap_v2/variant.h b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
similarity index 60%
rename from variants/esp32s3/rak_wismeshtap_v2/variant.h
rename to variants/esp32s3/rak_wismesh_tap_v2/variant.h
index fbac5d2fd..8468c557e 100644
--- a/variants/esp32s3/rak_wismeshtap_v2/variant.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -42,40 +42,11 @@
 #define GPS_TX_PIN 43
 #define GPS_RX_PIN 44
 
-// #define BATTERY_PIN 10
-// #define ADC_CHANNEL ADC1_GPIO10_CHANNEL
-// #define ADC_MULTIPLIER   1.667
-
 #define SPI_MOSI (11)
 #define SPI_SCK (13)
 #define SPI_MISO (10)
 #define SPI_CS (12)
 
-// LORA SPI2
-
-#define ST7789_CS SPI_CS
-#define ST7789_BL 41
-#define SPI_FREQUENCY 40000000
-#define SPI_READ_FREQUENCY 40000000
-#define ST7789_SCK SPI_SCK   // Set SPI SCLK pin number
-#define ST7789_SDA SPI_MOSI  // Set SPI MOSI pin number
-#define ST7789_MISO SPI_MISO // Set SPI MISO pin number (-1 = disable)
-#define ST7789_RS 42
-#define ST7789_CS SPI_CS
-#define TFT_WIDTH 240
-#define TFT_HEIGHT 320
-#define TFT_OFFSET_X 0
-#define TFT_OFFSET_Y 0
-#define TFT_OFFSET_ROTATION 2
-#define ST7789_SPI_HOST SPI3_HOST
-
-#define SCREEN_ROTATE
-
-#define HAS_TOUCHSCREEN 1
-#define SCREEN_TOUCH_INT 39
-#define TOUCH_SLAVE_ADDRESS 0x38 // RAK14014_FT6336U
-#define TOUCH_I2C_PORT 0
-
 #define HAS_BUTTON 1
 #define BUTTON_PIN 0
 
@@ -88,10 +59,13 @@
 
 #define PIN_BUZZER 38
 
+#define HAS_SDCARD 1
 #define SDCARD_USE_SPI1 1
-// #define HAS_SDCARD 1
 #define SDCARD_CS  2
 
-#define SD_SPI_FREQUENCY 16000000
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+
+#define SD_SPI_FREQUENCY 50000000
 
 #endif
\ No newline at end of file