Merge pull request #144 from Tinyu-Zhao/master

fix some error

README_cn.md

@@ -22,7 +22,7 @@
 
 **Arduino IDE 环境搭建**: [点击这里](https://docs.m5stack.com/zh_CN/arduino/arduino_development)
 
-**M5StickC Arduino API**: [点击这里](https://docs.m5stack.com/en/api/stickc/system_m5stickc)
+**M5StickC Arduino API**: [点击这里](https://docs.m5stack.com/zh_CN/api/stickc/system_m5stickc)
 
 **引脚地图**: [点击这里](https://docs.m5stack.com/zh_CN/core/m5stickc)
 

examples/Advanced/EzData/EzData.ino

@@ -0,0 +1,88 @@
+/*
+*******************************************************************************
+* Copyright (c) 2021 by M5Stack
+*                  Equipped with M5StickC sample source code
+*                          配套  M5StickC 示例源代码
+* Visit the website for more information：https://docs.m5stack.com/en/core/m5stickc
+* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/core/m5stickc
+*
+* describe：EzData.
+* date：2021/10/23
+*******************************************************************************
+*/
+#include "M5StickC.h"
+#include "M5_EzData.h"
+
+// Configure the name and password of the connected wifi and your token.  配置所连接wifi的名称、密码以及你的token
+const char* ssid = "Explore-F";
+const char* password = "xingchentansuo123";
+const char* token = "";
+
+void setup() {
+  M5.begin();   //Initialize M5Stack
+  M5.Lcd.setRotation(3);
+  if(setupWifi(ssid,password)){ //Connect to wifi.  连接到wifi
+    M5.Lcd.printf("Success connecting to %s\n",ssid);
+  }else{
+    M5.Lcd.printf("Connecting to %s failed\n",ssid);
+  }
+}
+
+void loop() {
+   //Save the data 20 to the top of the testData topic queue.  保存数据20至 testData 队列首位
+  if(setData(token,"testData",20)){
+    M5.Lcd.printf("Success sending data to the topic\n");
+  }else{
+    M5.Lcd.print("Fail to save data\n");
+  }
+  delay(5000);
+
+  //Save 3 data in sequence to the first place of testList.  依次保存3个数据至 testList首位
+  for(int i=0;i<3;i++){
+    if(addToList(token,"testList",i)){
+      M5.Lcd.printf("Success sending %d to the list\n",i);
+    }else{
+      M5.Lcd.print("Fail to save data\n");
+    }
+    delay(100);
+  }
+  delay(5000);
+  M5.Lcd.fillScreen(BLACK);
+  M5.Lcd.setCursor(0,0);
+
+  //Get a piece of data from a topic and store the value in result.  从一个 topic中获取一个数据,并将值存储在 result
+  int result=0;
+  if(getData(token,"testData",result)){
+    M5.Lcd.printf("Success get data %d\n",result);
+  }else{
+    M5.Lcd.print("Fail to get data\n");
+  }
+  delay(5000);
+
+//Get a set of data from a list and store the values in the Array array.  从一个 list中获取一组数据,并将值存储在 Array数组中
+  int Array[3]={};
+  if(getData(token,"testList",Array,0,3)){
+    M5.Lcd.print("Success get list\n");
+    for(int i=0;i<3;i++){
+      M5.Lcd.printf("Array[%d]=%d,",i,Array[i]);
+    }
+    M5.Lcd.println("");
+  }else{
+    M5.Lcd.println("Fail to get data");
+  }
+  delay(5000);
+
+  //Remove data
+  if(removeData(token,"testData"))
+    M5.Lcd.printf("Success remove data\n");
+  else
+    M5.Lcd.println("Fail to remove data");
+
+  if(removeData(token,"testList"))
+    M5.Lcd.printf("Success remove data from the list\n");
+  else
+    M5.Lcd.println("Fail to remove data");
+  delay(5000);
+  M5.Lcd.fillScreen(BLACK);
+  M5.Lcd.setCursor(0,0);
+}

examples/Advanced/I2C_Tester/I2C_Tester.ino

@@ -22,7 +22,7 @@ void setup()
   Wire.begin(); //Init wire and join the I2C network.  初始化wire，并且加入到I2C网络
   //Wire.begin(21, 22); //Detect internal I2C, if this sentence is not added, it will detect external I2C.  检测内部I2C,若不加此句为检测外部I2C
   M5.Lcd.setTextColor(YELLOW);  //Set the font color to yellow.  设置字体颜色为黄色
-  M5.Lcd.getTextDatum(3);  //Rotate the screen.  旋转屏幕
+  M5.Lcd.setRotation(3);  //Rotate the screen.  旋转屏幕
   M5.Lcd.println("M5StickC I2C Tester"); //Print a string on the screen.  在屏幕上打印字符串
 
   delay(3000);

examples/Advanced/MultSerial/MultSerial.ino

@@ -15,7 +15,7 @@
 void setup() {
   M5.begin(); //Init M5StickC.  初始化 M5StickC
   // Serial2.begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert)
-  Serial2.begin(115200, SERIAL_8N1, 16, 17);  //Init serial port 2.  初始化串口2
+  Serial2.begin(115200, SERIAL_8N1, 33, 32);  //Init serial port 2.  初始化串口2
 }
 
 void loop() {

examples/Basics/HelloWorld/HelloWorld.ino

@@ -6,7 +6,7 @@
 * Visit the website for more information：https://docs.m5stack.com/en/core/m5stickc
 * 获取更多资料请访问：https://docs.m5stack.com/zh_CN/core/m5stickc
 *
-* describe: Display.
+* describe: Hello World.
 * date：2021/9/3
 *******************************************************************************
 */

library.properties

@@ -8,4 +8,4 @@ category=Device Control
 url=https://github.com/m5stack/M5StickC.git
 architectures=esp32
 includes=M5StickC.h
-depends=UNIT_ENV,Adafruit MCP4725,Adafruit TCS34725,Adafruit NeoPixel,MAX30100lib,FastLED,MFRC522_I2C,M5GFX,M5_BM8563,M5_ADS1100,M5_ADS1115,M5_FPC1020A,HX711 Arduino Library,PCA9554,TinyGPSPlus,Adafruit SGP30 Sensor,FFT,TFTTerminal,ClosedCube TCA9548A,M5GFX
+depends=UNIT_ENV,Adafruit MCP4725,Adafruit TCS34725,Adafruit NeoPixel,MAX30100lib,FastLED,MFRC522_I2C,M5GFX,M5_BM8563,M5_ADS1100,M5_ADS1115,M5_FPC1020A,HX711 Arduino Library,PCA9554,TinyGPSPlus,Adafruit SGP30 Sensor,FFT,TFTTerminal,ClosedCube TCA9548A,M5GFX,M5_EzData,ArduinoJson