From 3e9217daddc2477170d4dc9cf3555082edc3aff2 Mon Sep 17 00:00:00 2001
From: Guido Aguiar <guido.aguiar@logcomex.com>
Date: Mon, 6 May 2024 11:21:32 -0300
Subject: [PATCH] chore: Configure TFT_eSPI and configs.h for Marauder
 M5Cardputer

---
 .github/workflows/build_push.yml | 31 +++++++++++++++++++++++++++++++
 .gitmodules                      |  1 +
 2 files changed, 32 insertions(+)

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index aca2edc59..3fd022e69 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -181,6 +181,30 @@ jobs:
             cat "$i" | grep compiler.c.elf.libs.esp32
           done
 
+      - name: Configure TFT_eSPI and configs.h for Marauder M5Cardputer
+        run: |
+          # Configure TFT_eSPI
+          sed -i 's/^#include <User_Setup.h>/\/\/#include <User_Setup.h>/' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h
+          sed -i 's/^\/\/#include <User_setup_marauder_m5cardputer.h>/#include <User_setup_marauder_m5cardputer.h>/' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h
+            
+          # Configure configs.h
+          sed -i 's/^  #define MARAUDER_REV_FEATHER/  \/\/#define MARAUDER_REV_FEATHER/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_MINI/  \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V4/  \/\/#define MARAUDER_V4/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V6/  \/\/#define MARAUDER_V6/' esp32_marauder/configs.h
+          sed -i 's/^  \/\/#define MARAUDER_M5CARDPUTER/  #define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h      
+  
+      - name: Build Marauder for M5Cardputer
+        uses: ArminJo/arduino-test-compile@v3.2.1
+        with:
+          sketch-names: esp32_marauder.ino
+          arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled
+          extra-arduino-cli-args: "--warnings none"
+  
+      - name: Rename Marauder M5Cardputer bin
+        run: |
+          mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.m5cardputer.bin
+
       - name: Configure configs.h for Flipper Zero WiFi Dev Board
         run: |
           sed -i 's/^  #define MARAUDER_REV_FEATHER/  \/\/#define MARAUDER_REV_FEATHER/' esp32_marauder/configs.h
@@ -554,6 +578,13 @@ jobs:
           path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin
           retention-days: 5
 
+      - name: "Upload M5Cardputer Artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          name: esp32_marauder.m5cardputer.bin
+          path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.m5cardputer.bin
+          retention-days: 5
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
diff --git a/.gitmodules b/.gitmodules
index 729d62826..c1f5d6b59 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,7 @@
 [submodule "esp32_marauder/libraries/TFT_eSPI"]
 	path = esp32_marauder/libraries/TFT_eSPI
 	url = https://github.com/justcallmekoko/TFT_eSPI.git
+	# url = https://github.com/Bodmer/TFT_eSPI.git
 [submodule "esp32_marauder/libraries/JPEGDecoder"]
 	path = esp32_marauder/libraries/JPEGDecoder
 	url = https://github.com/Bodmer/JPEGDecoder.git