updated latest eSPI version

Author: 0x1abin

examples/Basics/FactoryTest/FactoryTest.ino

@@ -2,8 +2,46 @@
 #include "utility/MPU9250.h"
 #include "WiFi.h"
 
+extern const unsigned char gImage_logoM5[];
+extern const unsigned char m5stack_startup_music[];
+
+#ifndef min
+  #define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
 MPU9250 IMU;
 
+void startupLogo() {
+    static uint8_t brightness, pre_brightness;
+    uint32_t length = strlen((char*)m5stack_startup_music);
+    M5.Lcd.setBrightness(0);
+    M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+    for(int i=0; i<length; i++) {
+        dacWrite(SPEAKER_PIN, m5stack_startup_music[i]>>2);
+        delayMicroseconds(40);
+        brightness = (i/157);
+        if(pre_brightness != brightness) {
+            pre_brightness = brightness;
+            M5.Lcd.setBrightness(brightness);
+        }
+    }
+
+    for(int i=255; i>=0; i--) {
+        M5.Lcd.setBrightness(i);
+        if(i<=32) {
+            dacWrite(SPEAKER_PIN, i);
+        }
+        delay(2);
+    }
+
+    M5.Lcd.fillScreen(BLACK);
+    delay(800);
+    for(int i=0; i>=100; i++) {
+        M5.Lcd.setBrightness(i);
+        delay(2);
+    }
+}
+
 //TF card test
 void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
     Serial.printf("Listing directory: %s\n", dirname);
@@ -142,6 +180,7 @@ void wifi_test() {
     M5.Lcd.println("");
 }
 
+/*
 bool gpio_test_flg = 0;
 void GPIO_test() {
     // uint8_t gpio_table[] = {23,19,18,3,16,21,2,12,15,26,1,17,22,5,13,0,34};
@@ -179,7 +218,7 @@ void adc_test() {
         delay(500);
     }
 }
-
+*/
 unsigned long testLines(uint16_t color)
 {
     unsigned long start, t;
@@ -418,25 +457,25 @@ unsigned long testFilledRoundRects()
 void setup() {
 
     //gpio test 
-    pinMode(BUTTON_A_PIN, INPUT_PULLUP);
-    if(digitalRead(BUTTON_A_PIN) == 0) {
-        gpio_test_flg = 1;
-    }
+    // pinMode(BUTTON_A_PIN, INPUT_PULLUP);
+    // if(digitalRead(BUTTON_A_PIN) == 0) {
+    //     gpio_test_flg = 1;
+    // }
 
-    if (gpio_test_flg) {
-        GPIO_test();
-    }
+    // if (gpio_test_flg) {
+    //     GPIO_test();
+    // }
 
     // initialize the M5Stack object
     M5.begin();
 
     // dac test
-    if (gpio_test_flg)
-    {
-        adc_test();
-    }
+    // if (gpio_test_flg)
+    // {
+    //     adc_test();
+    // }
 
-    M5.startupLogo();
+    startupLogo();
     Wire.begin();
 
     // Lcd display

src/utility/bmp_map.c examples/Basics/FactoryTest/bmp_map.csrc/utility/bmp_map.c renamed to examples/Basics/FactoryTest/bmp_map.c

@@ -1,5 +1,3 @@
-#include "bmp_map.h"
-
 const unsigned char gImage_logoM5[153600] = {/* 0X00,0X10,0X40,0X01,0XF0,0X00,0X01,0X1B, */
 /* 0X10,0X10,0X01,0X40,0X00,0XF0,0X01,0X1B, */
 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D, 0XEF, 0X7D,

src/utility/startup_music.c …mples/Basics/FactoryTest/startup_music.csrc/utility/startup_music.c renamed to examples/Basics/FactoryTest/startup_music.c src/utility/startup_music.c renamed to examples/Basics/FactoryTest/startup_music.c

@@ -7,7 +7,7 @@ void setup(){
   M5.begin();
 
   // LCD display
-  M5.Lcd.printf("hello world");
+  M5.Lcd.print("Hello World");
 }
 
 // the loop routine runs over and over again forever

examples/Basics/Hello/Hello.ino examples/Basics/HelloWorld/HelloWorld.inoexamples/Basics/Hello/Hello.ino renamed to examples/Basics/HelloWorld/HelloWorld.ino

@@ -39,11 +39,9 @@ Block blocks[7] = {
 extern uint8_t tetris_img[];
 //========================================================================
 void setup(void) {
-  Serial.begin(115200);         // SERIAL
   M5.begin();                   // M5STACK INITIALIZE
   M5.Lcd.setBrightness(200);    // BRIGHTNESS = MAX 255
   M5.Lcd.fillScreen(BLACK);     // CLEAR SCREEN
-  M5.Lcd.setRotation(0);        // SCREEN ROTATION = 0
   //----------------------------// Make Block ----------------------------
   make_block( 0, BLACK);        // Type No, Color
   make_block( 1, 0x00F0);       // DDDD     RED
@@ -76,7 +74,7 @@ void Draw() {                               // Draw 120x240 in the center
   for (int i = 0; i < Width; ++i) for (int j = 0; j < Height; ++j)
    for (int k = 0; k < Length; ++k) for (int l = 0; l < Length; ++l)
     backBuffer[j * Length + l][i * Length + k] = BlockImage[screen[i][j]][k][l];
-    M5.Lcd.drawBitmap(100, 0, 120, 240, (uint16_t *)backBuffer);
+    M5.Lcd.pushImage(100, 0, 120, 240, (uint16_t *)backBuffer);
 }
 //========================================================================
 void PutStartPos() {

examples/Games/Tetris/Tetris.ino

@@ -1,5 +1,5 @@
 #include <M5Stack.h>
-#include "utility/DHT12.h"
+#include "DHT12.h"
 #include <Wire.h>     //The DHT12 uses I2C comunication.
 DHT12 dht12;          //Preset scale CELSIUS and ID 0x5c.