Swap LCD to use second SPI bus, correct color order, fix offset, fix rotation

Author: TinyuZhao

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5AtomS3.git"
   },
-  "version": "0.0.2",
+  "version": "0.0.3",
   "frameworks": "arduino",
   "platforms": "espressif32",
   "headers": "M5AtomS3.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5AtomS3
-version=0.0.2
+version=0.0.3
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5AtomS3 Core development kit

src/M5AtomS3.h

@@ -26,7 +26,7 @@ class M5AtomS3 {
     Button Btn = Button(41, 25, true, true);
 
     void begin(bool LCDEnable = true, bool SerialEnable = true,
-               bool I2CEnable = true, bool LEDEnable = false);
+               bool I2CEnable = false, bool LEDEnable = false);
     void update();
 };
 

src/utility/In_eSPI_Drivers/ST7789_Rotation.h

@@ -18,8 +18,8 @@ switch (rotation) {
             colstart = 35;
             rowstart = 0;
         } else {
-            colstart = 0;
-            rowstart = 0;
+            colstart = 2;
+            rowstart = 1;
         }
 #endif
         writedata(TFT_MAD_COLOR_ORDER);
@@ -43,8 +43,8 @@ switch (rotation) {
             colstart = 0;
             rowstart = 35;
         } else {
-            colstart = 0;
-            rowstart = 0;
+            colstart = 1;
+            rowstart = 2;
         }
 #endif
         writedata(TFT_MAD_MX | TFT_MAD_MV | TFT_MAD_COLOR_ORDER);
@@ -68,8 +68,8 @@ switch (rotation) {
             colstart = 35;
             rowstart = 0;
         } else {
-            colstart = 0;
-            rowstart = 80;
+            colstart = 2;
+            rowstart = 1;
         }
 #endif
         writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_COLOR_ORDER);
@@ -92,8 +92,8 @@ switch (rotation) {
             colstart = 0;
             rowstart = 35;
         } else {
-            colstart = 80;
-            rowstart = 0;
+            colstart = 1;
+            rowstart = 2;
         }
 #endif
         writedata(TFT_MAD_MV | TFT_MAD_MY | TFT_MAD_COLOR_ORDER);

src/utility/In_eSPI_Setup.h

@@ -1,11 +1,22 @@
+#define TFT_RGB_ORDER 0  // Use the correct RGB order for the display
+
+#define CGRAM_OFFSET  // Display has an offset that needs to be corrected
+                      // Offset corrections in In_eSPI_Drivers\ST7789_Rotation.h
+
+// Above values must be set before ST7789_Defines.h is included
+
 #include "In_eSPI_Drivers/ST7789_Defines.h"
 
 #define ST7789_DRIVER  // Full configuration option, define additional
                        // parameters below for this display
 
+#define USE_HSPI_PORT  // Use the second SPI port for the display, keeping the
+                       // default SPI port free for use on the Atom expansion
+                       // port
+
 #define TFT_DRIVER 0x7789
-#define TFT_WIDTH  129
-#define TFT_HEIGHT 129
+#define TFT_WIDTH  128
+#define TFT_HEIGHT 128
 
 #define TFT_MISO -1
 #define TFT_MOSI 21
@@ -35,4 +46,4 @@
 
 #define SPI_READ_FREQUENCY 20000000
 
-#define SPI_TOUCH_FREQUENCY 2500000
+#define SPI_TOUCH_FREQUENCY 2500000