From f1c588c5a438c12de45af4e4fe0ab486b0bb4f16 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Thu, 12 Dec 2024 02:53:58 +0100
Subject: [PATCH] Update to rc15

---
 lib/SimpleFTPServer/FtpServer.cpp        | 7 +++----
 platformio.ini                           | 2 +-
 user_setups/esp32s2/makerfabs-tft-s2.ini | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/SimpleFTPServer/FtpServer.cpp b/lib/SimpleFTPServer/FtpServer.cpp
index 7107c82bf..b035599f9 100644
--- a/lib/SimpleFTPServer/FtpServer.cpp
+++ b/lib/SimpleFTPServer/FtpServer.cpp
@@ -293,10 +293,9 @@ uint8_t FtpServer::handleFTP() {
 void FtpServer::clientConnected()
 {
   // DEBUG_PRINTLN( F(" Client connected!") );
-  client.print(F("220 ---")); client.print(welcomeMessage); client.println(F(" ---"));
-  // client.print(F("220---")); client.print(welcomeMessage); client.println(F(" ---"));
-  // client.println(F("220---   By Renzo Mischianti   ---"));
-  // client.print(F("220 --    Version ")); client.print(FTP_SERVER_VERSION); client.println(F("    --"));
+  client.print  (F("220--- ")); client.print(welcomeMessage); client.println(F(" ---"));
+  // client.println(F("    --   By Renzo Mischianti   --"));
+  client.print  (F("220 -- Version ")); client.print(FTP_SERVER_VERSION);
   iCL = 0;
   if (FtpServer::_callback) {
 	  FtpServer::_callback(FTP_CONNECT, free(), capacity());
diff --git a/platformio.ini b/platformio.ini
index 13f1f16be..256e7a3ee 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -75,7 +75,7 @@ build_flags =
     -D HASP_VER_MAJ=0
     -D HASP_VER_MIN=7
     ;-D HASP_VER_REV=4
-    -D HASP_VER_REV=0-rc14
+    -D HASP_VER_REV=0-rc15
     ;-D HASP_VER_REV=4-rc1
     ${override.build_flags}
 
diff --git a/user_setups/esp32s2/makerfabs-tft-s2.ini b/user_setups/esp32s2/makerfabs-tft-s2.ini
index 9990f9cba..6bca6dd12 100644
--- a/user_setups/esp32s2/makerfabs-tft-s2.ini
+++ b/user_setups/esp32s2/makerfabs-tft-s2.ini
@@ -6,12 +6,13 @@
 ;***************************************************;
 
 [env:makerfabs-tft-s2_ili9488]
-extends = esp32s2-solo_16mb_v2
+extends = arduino_esp32s2-solo_v2, flash_16mb
 board = esp32s2
 
 build_flags =
     ${env.build_flags}
     ${esp32s2.build_flags}
+    ${esp32s2.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
     -D ILI9488_DRIVER=1