Never gonna say goodbye

bmorcelli · Jan 5, 2025 · 71e7d02 · 71e7d02
1 parent 1482706
commit 71e7d02
Show file tree

Hide file tree

Showing 25 changed files with 105 additions and 125 deletions.
diff --git a/boards/CYD-2432S028/platformio.ini b/boards/CYD-2432S028/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 	-Os
 
 	-DCYD=1
-	-DREDRAW_DELAY=200
 
 	-DPART_04MB=1
 	;-DPART_08MB =0

diff --git a/boards/_New-Device-Model/platformio.ini b/boards/_New-Device-Model/platformio.ini
@@ -20,7 +20,6 @@ build_flags =
 	-mfix-esp32-psram-cache-strategy=memw
 
 	-DSTICK_C_PLUS2=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB=1
 	-DPART_08MB=1

diff --git a/boards/lilygo-t-deck/platformio.ini b/boards/lilygo-t-deck/platformio.ini
@@ -21,7 +21,6 @@ build_flags =
 
 	-DT_DECK=1
 	-DPIN_POWER_ON=10
-	-DREDRAW_DELAY=250
 	-DBK_BTN=6
 
 	;-DPART_04MB =0

diff --git a/boards/lilygo-t-display-s3-pro/platformio.ini b/boards/lilygo-t-display-s3-pro/platformio.ini
@@ -23,7 +23,6 @@ build_flags =
 
 	-DT_DISPLAY_S3=1
 	-DT_DISPLAY_S3_PRO=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	;-DPART_08MB =0

diff --git a/boards/lilygo-t-display-s3-touch/platformio.ini b/boards/lilygo-t-display-s3-touch/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 
 	-DT_DISPLAY_S3=1
 	-DT_DISPLAY_S3_TOUCH=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	;-DPART_08MB =0

diff --git a/boards/lilygo-t-embed-cc1101/platformio.ini b/boards/lilygo-t-embed-cc1101/platformio.ini
@@ -25,7 +25,6 @@ build_flags =
 
 	-DT_EMBED=1
 	-DPIN_POWER_ON=46
-	-DREDRAW_DELAY=1
 	-DBK_BTN=6
 
 	;-DPART_04MB =0
@@ -110,7 +109,6 @@ build_flags =
 	-DT_EMBED=1
 	-DT_EMBED_1101=1
 	-DPIN_POWER_ON=15
-	-DREDRAW_DELAY=0
 	-DBK_BTN=6
 
 	;-DPART_04MB =0

diff --git a/boards/m5stack-cardputer/platformio.ini b/boards/m5stack-cardputer/platformio.ini
@@ -19,7 +19,6 @@ build_flags =
 	-DCORE_DEBUG_LEVEL=5
 	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DCARDPUTER=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	-DPART_08MB=1

diff --git a/boards/m5stack-core/platformio.ini b/boards/m5stack-core/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 	-mfix-esp32-psram-cache-strategy=memw
 
 	-DCORE=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	;-DPART_08MB =0

diff --git a/boards/m5stack-core2/platformio.ini b/boards/m5stack-core2/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 	-mfix-esp32-psram-cache-strategy=memw
 
 	-DCORE2=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	;-DPART_08MB =0

diff --git a/boards/m5stack-cores3/platformio.ini b/boards/m5stack-cores3/platformio.ini
@@ -17,11 +17,8 @@ build_flags =
 	${env.build_flags}
 	-Iboards/m5stack-cores3
 	;-DCORE_DEBUG_LEVEL=5
-	-DBOARD_HAS_PSRAM
-	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DCORE3=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB =0
 	;-DPART_08MB =0

diff --git a/boards/m5stack-cplus1_1/platformio.ini b/boards/m5stack-cplus1_1/platformio.ini
@@ -20,7 +20,6 @@ build_flags =
 	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
 	-Wl,--gc-sections
 	-DSTICK_C_PLUS=1
-	-DREDRAW_DELAY=200
 
 	-DPART_04MB=1
 	;-DPART_08MB =0
@@ -84,7 +83,6 @@ build_flags =
 	-Os
 	-DSTICK_C=1
 	-DSTICK_C_PLUS=1
-	-DREDRAW_DELAY=200
 
 	-DPART_04MB=1
 	;-DPART_08MB =0

diff --git a/boards/m5stack-cplus2.json b/boards/m5stack-cplus2.json
@@ -30,9 +30,9 @@
   ],
   "name": "M5Stick CPlus2",
   "upload": {
-    "flash_size": "4MB",
+    "flash_size": "8MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
+    "maximum_size": 8388608,
     "require_upload_port": true,
     "speed": 1500000
   },

diff --git a/boards/m5stack-cplus2/platformio.ini b/boards/m5stack-cplus2/platformio.ini
@@ -17,12 +17,8 @@ build_flags =
 	${env.build_flags}
 	-Iboards/m5stack-cplus2
 	;-DCORE_DEBUG_LEVEL=5
-	-DBOARD_HAS_PSRAM
-	-mfix-esp32-psram-cache-issue	
-	-mfix-esp32-psram-cache-strategy=memw
 
 	-DSTICK_C_PLUS2=1
-	-DREDRAW_DELAY=200
 
 	;-DPART_04MB=1
 	-DPART_08MB=1

diff --git a/boards/marauder-mini/platformio.ini b/boards/marauder-mini/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 	-Os
 
 	-DMARAUDERMINI=1
-	-DREDRAW_DELAY=200
 
 	-DPART_04MB=1
 	;-DPART_08MB =0

diff --git a/boards/marauder-v4og/platformio.ini b/boards/marauder-v4og/platformio.ini
@@ -22,7 +22,6 @@ build_flags =
 	-Os
 
 	-DMARAUDERV4=1
-	-DREDRAW_DELAY=200
 
 	-DPART_04MB=1
 	;-DPART_08MB =0

diff --git a/boards/pinouts/m5stack-cores3.h b/boards/pinouts/m5stack-cores3.h
@@ -60,7 +60,6 @@ static const uint8_t G46 = 46;
 
 static const uint8_t ADC = 10;
 
-
 #define HAS_RTC 
 #define USB_as_HID
 
@@ -89,11 +88,11 @@ static const uint8_t ADC = 10;
 #define M5STACK
 #define TFT_HEIGHT 320
 #define TFT_WIDTH 240
-#define TFT_MOSI MOSI
-#define TFT_MISO MISO
-#define TFT_SCLK SCK
-#define TFT_CS G3
-#define TFT_DC G35
+#define TFT_MOSI 37
+#define TFT_MISO 35
+#define TFT_SCLK 36
+#define TFT_CS 3
+#define TFT_DC 35
 #define TFT_RST -1
 #define TFT_BL -1
 #define TOUCH_CS -1
@@ -108,10 +107,10 @@ static const uint8_t ADC = 10;
 #define BTN_ACT LOW
 
 // SD Card Setup pins
-#define SDCARD_CS G4
-#define SDCARD_SCK SCK
-#define SDCARD_MISO MISO
-#define SDCARD_MOSI MOSI
+#define SDCARD_CS 4
+#define SDCARD_SCK 36
+#define SDCARD_MISO 35
+#define SDCARD_MOSI 37
 
 // Default I2C port
 #define GROVE_SDA 32

diff --git a/include/pre_compiler.h b/include/pre_compiler.h
@@ -1,7 +1,3 @@
-#ifndef REDRAW_DELAY
-#define REDRAW_DELAY 250
-#endif
-
 #if !defined(PART_04MB) && !defined(PART_08MB) && !defined(PART_16MB) && !defined(HEADLESS)
 #define PART_04MB 1
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ build_flags = @@
     	-Os
     	-DCYD=1
-    	-DREDRAW_DELAY=200
     	-DPART_04MB=1
     	;-DPART_08MB =0
@@ Expand Down @@