Merge branch 'master' into update_eSPI

Author: 0x1abin

component.mk

@@ -3,5 +3,5 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
-COMPONENT_SRCDIRS := . src
-COMPONENT_ADD_INCLUDEDIRS := . src
+COMPONENT_SRCDIRS := src src/utility src/Fonts
+COMPONENT_ADD_INCLUDEDIRS := src

examples/Advanced/Display/HZK16/HZK16.ino

@@ -26,7 +26,7 @@ void setup() {
 
   delay(1000);
   // Clear screen
-  M5.Lcd.clear(BLACK);
+  M5.Lcd.clear();
   // Turn highlight off
   M5.Lcd.highlight(false);
   M5.Lcd.setCursor(0,10);
@@ -38,7 +38,7 @@ void setup() {
   M5.Lcd.printf(GbkStr);
 
   delay(1000);
-  M5.Lcd.clear(BLACK);
+  M5.Lcd.clear();
 
   // Set text size to 2
   M5.Lcd.setTextSize(2);
@@ -51,7 +51,7 @@ void setup() {
   M5.Lcd.printf(AscStr);  
   delay(1000);
 
-  M5.Lcd.clear(BLACK);
+  M5.Lcd.clear();
   M5.Lcd.highlight(false);
   M5.Lcd.setCursor(0,10);
   M5.Lcd.printf(GbkStr);
@@ -62,7 +62,7 @@ void setup() {
 
   delay(1000);
 
-  M5.Lcd.clear(NAVY);
+  M5.Lcd.clear();
   M5.Lcd.highlight(false);
 
   // Set text with non-transparent back color, BLACK as set at the beginning.
@@ -79,4 +79,4 @@ void setup() {
 void loop() {
   // put your main code here, to run repeatedly:
 
-}
+}