Remove M5 Stack firmware and add TFT_ESPI firmware

CMakeListsUser.txt

@@ -20,9 +20,13 @@ add_custom_target(
     COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/d32_pro_tft/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/d32_pro_tft_partitions.bin"
     COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/d32_pro_tft/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/d32_pro_tft_spiffs.bin"
 
-    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_firmware.bin"
-    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_partitions.bin"
-    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_spiffs.bin"
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_firmware.bin"
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_partitions.bin"
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_spiffs.bin"
+
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_firmware.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_partitions.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_spiffs.bin"
 
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

platformio.ini

@@ -28,12 +28,8 @@ monitor_speed = 115200
 ; These are true for most of the TFT devices on MacOS - Will likely need to be changed if compiling on other platforms
 upload_port = /dev/cu.wch*
 monitor_port = /dev/cu.wch*
-; These are true for a good chunk of the OLED devices I've tried on MacOS. Again - probably won't work for other platforms.
-;upload_port = /dev/cu.SLAB_USBtoUART
-;monitor_port = /dev/cu.SLAB_USBtoUART
-; These are true for the TTGO T-Display connected via USB to USB-C cable to a Mac
-;upload_port = /dev/cu.usb*
-;monitor_port = /dev/cu.usb*
+
+
 
 ; -D_GLIBCXX_USE_C99 is to fix an issue with the xtensa toolchain that precludes the use of std::to_string
 ; See: https://github.com/espressif/esp-idf/issues/1445
@@ -66,9 +62,10 @@ lib_deps =
     ESP8266_SSD1306
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-monitor_port = ${common.monitor_port}
 
+; These are true for a good chunk of the OLED devices I've tried on MacOS. Again - probably won't work for other platforms.
+upload_port = /dev/cu.SLAB_USBtoUART
+monitor_port = /dev/cu.SLAB_USBtoUART
 
 
 [env:d32_pro_tft]
@@ -92,29 +89,29 @@ upload_port = ${common.upload_port}
 monitor_port = ${common.monitor_port}
 
 
-
-[env:m5_stack_tft]
-platform = ${common.platform}
-board = ${common.board}
-framework = ${common.framework}
-;m5 stack is a smaller flash
-board_build.partitions = huge_app.csv
-
-; Add the m5 stack flag for pin mappings
-build_flags =
-    ${common.build_flags}
-    -DLCD_TFT
-    -DLCD_TFT_M5_STACK
-;    -DCORE_DEBUG_LEVEL=5
-lib_deps =
-    ${common.lib_deps}
-    Adafruit GFX Library@1.7.5
-    Adafruit ILI9341
-    https://github.com/PaulStoffregen/XPT2046_Touchscreen
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-monitor_port = ${common.monitor_port}
+;
+;[env:m5_stack_tft]
+;platform = ${common.platform}
+;board = ${common.board}
+;framework = ${common.framework}
+;;m5 stack is a smaller flash
+;board_build.partitions = huge_app.csv
+;
+;; Add the m5 stack flag for pin mappings
+;build_flags =
+;    ${common.build_flags}
+;    -DLCD_TFT
+;    -DLCD_TFT_M5_STACK
+;;    -DCORE_DEBUG_LEVEL=5
+;lib_deps =
+;    ${common.lib_deps}
+;    Adafruit GFX Library@1.7.5
+;    Adafruit ILI9341
+;    https://github.com/PaulStoffregen/XPT2046_Touchscreen
+;upload_speed = ${common.upload_speed}
+;monitor_speed = ${common.monitor_speed}
+;upload_port = ${common.upload_port}
+;monitor_port = ${common.monitor_port}
 
 
 [env:tft_espi]
@@ -152,6 +149,9 @@ lib_deps =
     TFT_eSPI
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-monitor_port = ${common.monitor_port}
+;upload_port = ${common.upload_port}
+;monitor_port = ${common.monitor_port}
 
+; These are true for the TTGO T-Display connected via USB to USB-C cable to a Mac
+upload_port = /dev/cu.usb*
+monitor_port = /dev/cu.usb*