Merge branch 'master' into master

Tinyu-Zhao · web-flow · commit 52022a055ff6 · 2022-01-25T12:43:04.000+08:00
diff --git a/README.md b/README.md
@@ -19,17 +19,17 @@ English | [中文](docs/getting_started_cn.md) | [日本語](docs/getting_starte
 
 ## More Information
 
-**UIFlow Quick Start**: [PinMap](https://docs.m5stack.com/zh_CN/quick_start/m5core/uiflow)
+**UIFlow Quick Start**: [Click Here](https://docs.m5stack.com/zh_CN/quick_start/m5core/uiflow)
 
-**MicroPyhton API**: [PinMap](https://docs.m5stack.com/zh_CN/mpy/display/m5stack_lvgl)
+**MicroPyhton API**: [Click Here](https://docs.m5stack.com/zh_CN/mpy/display/m5stack_lvgl)
 
-**Arduino IDE Development**: [PinMap](https://docs.m5stack.com/zh_CN/quick_start/m5core/arduino)
+**Arduino IDE Development**: [Click Here](https://docs.m5stack.com/zh_CN/quick_start/m5core/arduino)
 
-**M5StickC Arduino API**: [PinMap](https://docs.m5stack.com/zh_CN/api/system)
+**M5StickC Arduino API**: [Click Here](https://docs.m5stack.com/zh_CN/api/system)
 
-**Gray PinMap**: [PinMap](https://docs.m5stack.com/zh_CN/core/gray)
+**Gray PinMap**: [Click Here](https://docs.m5stack.com/zh_CN/core/gray)
 
-**Basic PinMap**: [PinMap](https://docs.m5stack.com/zh_CN/core/basic)
+**Basic PinMap**: [Click Here](https://docs.m5stack.com/zh_CN/core/basic)
 
 
 ## USER CASES
diff --git a/examples/Advanced/Display/Bmp_Jpg_SPIFFS_draw/Bmp_Jpg_SPIFFS_draw.ino b/examples/Advanced/Display/Bmp_Jpg_SPIFFS_draw/Bmp_Jpg_SPIFFS_draw.ino
@@ -11,9 +11,8 @@
 #include "M5Stack.h"
 
 void setup(){
-    M5.begin(true, false, false, false);
+    M5.begin(true, false, true, false);
     M5.Power.begin();
-    Serial.begin(115200);
     if(!SPIFFS.begin(true)){
         Serial.println("SPIFFS Mount Failed");
         return;
diff --git a/examples/Advanced/Display/Display_Unicode/Display_Unicode.ino b/examples/Advanced/Display/Display_Unicode/Display_Unicode.ino
@@ -12,6 +12,7 @@
 
 -----PLEASE SEE THE README----
 ------请在使用前看README文件----*/
+#define USE_M5_FONT_CREATOR
 #include <M5Stack.h>
 #include "CUF_24px.h"
 
diff --git a/examples/Face/ENCODER/ENCODER.ino b/examples/Face/ENCODER/ENCODER.ino
@@ -39,7 +39,6 @@ void setup()
     M5.begin();
     M5.Power.begin();
     Wire.begin();
-    Serial.begin(115200);
     dacWrite(25, 0);
     M5.Lcd.setTextFont(2);
     M5.Lcd.println("FACES ENCODER I2C Read Example");
diff --git a/examples/Face/FINGER/FINGER.ino b/examples/Face/FINGER/FINGER.ino
@@ -18,7 +18,6 @@ void CleanScreen()
 void setup() {
     M5.begin();
     M5.Power.begin();
-    Serial.begin(115200);
     Serial2.begin(19200, SERIAL_8N1, 16, 17);
     pinMode(5, OUTPUT);
     pinMode(26, OUTPUT);
diff --git a/examples/Modules/COM_GSM/COM_GSM.ino b/examples/Modules/COM_GSM/COM_GSM.ino
@@ -321,7 +321,6 @@ void setup()
 {
   // put your setup code here, to run once:
   M5.begin();
-  Serial.begin(115200);
   Serial2.begin(115200, SERIAL_8N1, 5, 13);
 
   Disbuff.createSprite(320,20);
diff --git a/examples/Modules/COM_LTE-DATA/COM_LTE-DATA.ino b/examples/Modules/COM_LTE-DATA/COM_LTE-DATA.ino
@@ -320,7 +320,6 @@ void setup()
 {
 	// put your setup code here, to run once:
 	M5.begin();
-	Serial.begin(115200);
 	Serial2.begin(115200, SERIAL_8N1, 5, 13);
 
 	Disbuff.createSprite(320,20);
diff --git a/examples/Modules/COM_LTE/COM_LTE.ino b/examples/Modules/COM_LTE/COM_LTE.ino
@@ -321,7 +321,6 @@ void setup()
 {
 	// put your setup code here, to run once:
 	M5.begin();
-	Serial.begin(115200);
 	Serial2.begin(115200, SERIAL_8N1, 5, 13);
 
 	Disbuff.createSprite(320,20);
diff --git a/examples/Modules/COM_LoRaWAN/LoRaWAN_Receive/LoRaWAN_Receive.ino b/examples/Modules/COM_LoRaWAN/LoRaWAN_Receive/LoRaWAN_Receive.ino
@@ -49,7 +49,6 @@ bool ReceiveAT(uint32_t timeout)
 void setup() 
 {
   M5.begin();
-  Serial.begin(115200);
   Serial2.begin(115200, SERIAL_8N1, 15, 13);
 
   TerminalBuff.createSprite(250,220);
diff --git a/examples/Modules/COM_LoRaWAN/LoRaWAN_Send/LoRaWAN_Send.ino b/examples/Modules/COM_LoRaWAN/LoRaWAN_Send/LoRaWAN_Send.ino
@@ -48,7 +48,6 @@ bool ReceiveAT(uint32_t timeout)
 void setup() 
 {
   M5.begin();
-  Serial.begin(115200);
   Serial2.begin(115200, SERIAL_8N1, 15, 13);
 
   TerminalBuff.createSprite(250,220);
diff --git a/examples/Modules/COM_NB-IoT/COM_NB-IoT.ino b/examples/Modules/COM_NB-IoT/COM_NB-IoT.ino
@@ -309,7 +309,6 @@ void setup()
 {
 	// put your setup code here, to run once:
 	M5.begin();
-	Serial.begin(115200);
 	Serial2.begin(115200, SERIAL_8N1, 5, 13);
 
 	Disbuff.createSprite(320,20);
diff --git a/examples/Modules/COM_SigFox/COM_SigFox.ino b/examples/Modules/COM_SigFox/COM_SigFox.ino
@@ -20,9 +20,6 @@ void setup() {
   
   M5.begin();
   Serial2.begin(9600, SERIAL_8N1, rxPin, txPin);
-
-
-  Serial.begin(115200);
   
   delay(2000);
   getID();
diff --git a/examples/Modules/GSM_M6315/GSM_M6315.ino b/examples/Modules/GSM_M6315/GSM_M6315.ino
@@ -29,7 +29,6 @@ void setup() {
   M5.begin();
   M5.Power.begin();
   
-  Serial.begin(115200);
   Serial2.begin(115200, SERIAL_8N1, 16, 17);
   pinMode(5, OUTPUT);
   digitalWrite(5, 1);
diff --git a/examples/Modules/LORA868_SX1276/LoRa868Duplex/LoRa868Duplex.ino b/examples/Modules/LORA868_SX1276/LoRa868Duplex/LoRa868Duplex.ino
@@ -3,11 +3,11 @@
 * Copyright (c) 2021 by M5Stack
 *                  Equipped with M5Core sample source code
 *                          配套  M5Core 示例源代码
-* Visit the website for more information：https://docs.m5stack.com/en/module/comx_lorawan
-* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/module/comx_lorawan
+* Visit the website for more information：https://docs.m5stack.com/en/module/lora868
+* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/module/lora868
 *
-* describe: comx_lorawan.
-* date：2021/9/2
+* describe: Module LoRa868.
+* date：2021/12/26
 *******************************************************************************
   LoRa868 Duplex communication.Send messages regularly "HeLoRa World!"
   LoRa868 双工通讯。定期发送消息“HeLoRa World！”
diff --git a/examples/Modules/LTE_M8321/LTE_M8321.ino b/examples/Modules/LTE_M8321/LTE_M8321.ino
@@ -304,7 +304,6 @@ void setup()
     // put your setup code here, to run once:
     M5.begin();
     M5.Power.begin();
-    Serial.begin(115200);
     Serial2.begin(115200, SERIAL_8N1, 16, 17);
 
     Disbuff.createSprite(320, 100);
diff --git a/examples/Modules/SERVO/SERVO.ino b/examples/Modules/SERVO/SERVO.ino
@@ -27,7 +27,6 @@ void setup() {
     M5.Lcd.print("Servo Example");
 
     Wire.begin(21, 22, 100000UL);
-}
 
 // addr 0x01 mean control the number 1 servo by us
 void Servo_write_us(uint8_t number, uint16_t us) {
diff --git a/examples/Modules/SIM800L/ATCOM/AT/AT.ino b/examples/Modules/SIM800L/ATCOM/AT/AT.ino
@@ -23,7 +23,6 @@ void setup() {
   M5.Lcd.setTextColor(TFT_WHITE, TFT_BLACK);
   M5.Lcd.drawString("Please use serial port to Test AT command.",0, 35, 2);
   // Host serial communication
-  Serial.begin(115200);   
 
   // SIM800L serial communication
   Serial2.begin(115200, SERIAL_8N1, RX_PIN, TX_PIN);   
diff --git a/examples/Modules/StepmotorGRBL_M012/StepmotorGRBL_M012.ino b/examples/Modules/StepmotorGRBL_M012/StepmotorGRBL_M012.ino
@@ -32,7 +32,6 @@ void setup() {
   M5.begin();
   M5.Power.begin();
   Wire.begin();
-  Serial.begin(115200);
   m5.Lcd.setTextColor(WHITE, BLACK);
   m5.Lcd.setTextSize(2);
   m5.lcd.setBrightness(100);
diff --git a/examples/Unit/DLIGHT_BH1750FVI/DLIGHT_BH1750FVI.ino b/examples/Unit/DLIGHT_BH1750FVI/DLIGHT_BH1750FVI.ino
@@ -0,0 +1,59 @@
+/*
+*******************************************************************************
+* Copyright (c) 2022 by M5Stack
+*                  Equipped with M5Core sample source code
+*                          配套  M5Core 示例源代码
+* Visit the website for more
+information：https://docs.m5stack.com/en/unit/dlight
+* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/unit/dlight
+*
+* describe：数字环境光检测传感器BH1750FVI
+* date：2021/8/17
+*******************************************************************************
+  Please connect the sensor to port A (22, 21), the Lux value will be displayed
+on the display after successful initialization 请将传感器连接至端口A(22、21),
+成功初始化后显示屏上将显示Lux数值
+*/
+
+#include <M5Stack.h>
+#include <M5GFX.h>
+#include <M5_BH1750FVI.h>
+
+M5GFX display;
+M5Canvas canvas(&display);
+
+M5_BH1750FVI sensor;
+uint16_t lux;
+
+void setup() {
+    M5.begin();
+    display.begin();
+    canvas.setTextDatum(MC_DATUM);
+    canvas.setColorDepth(1);
+    canvas.setFont(&fonts::Orbitron_Light_24);
+    canvas.setTextSize(2);
+    canvas.createSprite(display.width(), display.height());
+    canvas.setPaletteColor(1, ORANGE);
+    Serial.println("Sensor begin.....");
+    sensor.begin(&Wire, 21, 22);
+
+    // CONTINUOUSLY_H_RESOLUTION_MODE
+    // CONTINUOUSLY_H_RESOLUTION_MODE2
+    // CONTINUOUSLY_L_RESOLUTION_MODE
+    // ONE_TIME_H_RESOLUTION_MODE
+    // ONE_TIME_H_RESOLUTION_MODE2
+    // ONE_TIME_L_RESOLUTION_MODE
+    sensor.setMode(CONTINUOUSLY_H_RESOLUTION_MODE);
+}
+
+char info[40];
+
+void loop() {
+    lux = sensor.getLUX();
+    sprintf(info, "lux: %d", lux);
+    canvas.fillSprite(BLACK);
+    canvas.drawString(info, 160, 120);
+    canvas.pushSprite(0, 0);
+    Serial.println(info);
+    delay(100);
+}
diff --git a/examples/Unit/GESTURE_PAJ7620U2/GESTURE_PAJ7620U2.ino b/examples/Unit/GESTURE_PAJ7620U2/GESTURE_PAJ7620U2.ino
@@ -0,0 +1,74 @@
+/*
+*******************************************************************************
+* Copyright (c) 2021 by M5Stack
+*                  Equipped with M5Core sample source code
+*                          配套  M5Core 示例源代码
+* Visit the website for more information：https://docs.m5stack.com/en/unit/gesture
+* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/unit/gesture
+*
+* describe：GESTURE.  手势传感器
+* date：2021/11/17
+*******************************************************************************
+  Please connect to Port A (G21, G22)
+  请连接端口A (G21, G22)
+
+  编译前请安装依赖库
+  Please install dependent libraries before compiling：
+  https://github.com/ouki-wang/DFRobot_PAJ7620U2
+*/
+
+#include <M5Stack.h>
+#include <M5GFX.h>
+#include <DFRobot_PAJ7620U2.h>
+
+M5GFX display;
+M5Canvas canvas(&display);
+
+DFRobot_PAJ7620U2 sensor;
+
+void log(String info) {
+  Serial.println(info);
+  canvas.println(info);
+  canvas.pushSprite(0, 0);
+}
+
+void setup()
+{
+
+  M5.begin();
+  display.begin();
+
+  canvas.setColorDepth(1); // mono color
+  canvas.createSprite(display.width(), display.height());
+  canvas.setPaletteColor(1, ORANGE);
+  canvas.setTextSize((float)canvas.width() / 160);
+  canvas.setTextScroll(true);
+
+  Serial.begin(115200);
+  delay(300);
+  log("PAJ7620U2 Init");
+  while(sensor.begin() != 0){
+    log("initial PAJ7620U2 failure!");
+    delay(500);
+  }
+  sensor.setGestureHighRate(true);
+  log("Start to recognize");
+}
+
+void loop()
+{
+  /* 
+   * eGestureNone  eGestureRight  eGestureLeft  eGestureUp  eGestureDown  eGestureForward
+   * eGestureBackward  eGestureClockwise  eGestureAntiClockwise  eGestureWave  eGestureWaveSlowlyDisorder
+   * eGestureWaveSlowlyLeftRight  eGestureWaveSlowlyUpDown  eGestureWaveSlowlyForwardBackward
+   */
+  DFRobot_PAJ7620U2::eGesture_t gesture = sensor.getGesture();
+  if(gesture != sensor.eGestureNone ){
+   /* 
+    * "None","Right","Left", "Up", "Down", "Forward", "Backward", "Clockwise", "Anti-Clockwise", "Wave",
+    * "WaveSlowlyDisorder", "WaveSlowlyLeftRight", "WaveSlowlyUpDown", "WaveSlowlyForwardBackward"
+    */
+    String description  = sensor.gestureDescription(gesture);
+    log("Gesture = " + description);
+  }
+}
diff --git a/examples/Unit/IR/IR.ino b/examples/Unit/IR/IR.ino
@@ -24,7 +24,6 @@ int cur_recv_value = 0;
 void setup() {
   M5.begin();
   M5.Power.begin();
-  Serial.begin(115200);
   pinMode(ir_recv_pin, INPUT);
   pinMode(ir_send_pin, OUTPUT);
   //send infrared light.  发送红外线
diff --git a/examples/Unit/NBIoT_SIM7020/NBIoT_SIM7020.ino b/examples/Unit/NBIoT_SIM7020/NBIoT_SIM7020.ino
diff --git a/examples/Unit/RS485_SP485EEN/RS485_SP485EEN.ino b/examples/Unit/RS485_SP485EEN/RS485_SP485EEN.ino
diff --git a/examples/Unit/WEIGHT_HX711/WEIGHT_HX711.ino b/examples/Unit/WEIGHT_HX711/WEIGHT_HX711.ino
diff --git a/library.json b/library.json
diff --git a/library.properties b/library.properties
diff --git a/src/utility/In_eSPI.cpp b/src/utility/In_eSPI.cpp

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,6 @@ void setup()`
`321`	`321`	`{`
`322`	`322`	`// put your setup code here, to run once:`
`323`	`323`	`M5.begin();`
`324`		`- Serial.begin(115200);`
`325`	`324`	`Serial2.begin(115200, SERIAL_8N1, 5, 13);`
`326`	`325`
`327`	`326`	`Disbuff.createSprite(320,20);`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,6 @@ void setup()`
`320`	`320`	`{`
`321`	`321`	`// put your setup code here, to run once:`
`322`	`322`	`M5.begin();`
`323`		`- Serial.begin(115200);`
`324`	`323`	`Serial2.begin(115200, SERIAL_8N1, 5, 13);`
`325`	`324`
`326`	`325`	`Disbuff.createSprite(320,20);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ bool ReceiveAT(uint32_t timeout)`
`49`	`49`	`void setup()`
`50`	`50`	`{`
`51`	`51`	`M5.begin();`
`52`		`- Serial.begin(115200);`
`53`	`52`	`Serial2.begin(115200, SERIAL_8N1, 15, 13);`
`54`	`53`
`55`	`54`	`TerminalBuff.createSprite(250,220);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ bool ReceiveAT(uint32_t timeout)`
`48`	`48`	`void setup()`
`49`	`49`	`{`
`50`	`50`	`M5.begin();`
`51`		`- Serial.begin(115200);`
`52`	`51`	`Serial2.begin(115200, SERIAL_8N1, 15, 13);`
`53`	`52`
`54`	`53`	`TerminalBuff.createSprite(250,220);`