diff --git a/.DS_Store b/.DS_Store
index 82c0f7f3..ef53a1ec 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/docs/.DS_Store b/docs/.DS_Store
index 6dd673df..19ed0cdf 100644
Binary files a/docs/.DS_Store and b/docs/.DS_Store differ
diff --git a/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/.play_a_song.gif.icloud b/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/.play_a_song.gif.icloud
new file mode 100644
index 00000000..12fd40ac
Binary files /dev/null and b/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/.play_a_song.gif.icloud differ
diff --git a/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/play_a_song.gif b/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/play_a_song.gif
deleted file mode 100644
index 8e685307..00000000
Binary files a/docs/assets/img/getting_started_pics/m5stack_core/get_started_with_uiflow/play_a_song.gif and /dev/null differ
diff --git a/docs/assets/img/product_pics/accessory/watch/.watch_06.jpg.icloud b/docs/assets/img/product_pics/accessory/watch/.watch_06.jpg.icloud
new file mode 100644
index 00000000..dba916f8
Binary files /dev/null and b/docs/assets/img/product_pics/accessory/watch/.watch_06.jpg.icloud differ
diff --git a/docs/assets/img/product_pics/accessory/watch/watch_06.jpg b/docs/assets/img/product_pics/accessory/watch/watch_06.jpg
deleted file mode 100644
index c87d402d..00000000
Binary files a/docs/assets/img/product_pics/accessory/watch/watch_06.jpg and /dev/null differ
diff --git a/docs/assets/img/product_pics/app/ac_socket/.p04.jpg.icloud b/docs/assets/img/product_pics/app/ac_socket/.p04.jpg.icloud
new file mode 100644
index 00000000..eb686a4e
Binary files /dev/null and b/docs/assets/img/product_pics/app/ac_socket/.p04.jpg.icloud differ
diff --git a/docs/assets/img/product_pics/app/ac_socket/p04.jpg b/docs/assets/img/product_pics/app/ac_socket/p04.jpg
deleted file mode 100644
index bd10b7af..00000000
Binary files a/docs/assets/img/product_pics/app/ac_socket/p04.jpg and /dev/null differ
diff --git a/docs/assets/img/product_pics/base/.faces_06.png.icloud b/docs/assets/img/product_pics/base/.faces_06.png.icloud
new file mode 100644
index 00000000..52044c04
Binary files /dev/null and b/docs/assets/img/product_pics/base/.faces_06.png.icloud differ
diff --git a/docs/assets/img/product_pics/base/.m5go_05.png.icloud b/docs/assets/img/product_pics/base/.m5go_05.png.icloud
new file mode 100644
index 00000000..9d72e704
Binary files /dev/null and b/docs/assets/img/product_pics/base/.m5go_05.png.icloud differ
diff --git a/docs/assets/img/product_pics/base/faces_06.png b/docs/assets/img/product_pics/base/faces_06.png
deleted file mode 100644
index ed174844..00000000
Binary files a/docs/assets/img/product_pics/base/faces_06.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/base/m5go_05.png b/docs/assets/img/product_pics/base/m5go_05.png
deleted file mode 100644
index 96c82094..00000000
Binary files a/docs/assets/img/product_pics/base/m5go_05.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/core/basic/.basic_05.png.icloud b/docs/assets/img/product_pics/core/basic/.basic_05.png.icloud
new file mode 100644
index 00000000..a9866cd7
Binary files /dev/null and b/docs/assets/img/product_pics/core/basic/.basic_05.png.icloud differ
diff --git a/docs/assets/img/product_pics/core/basic/basic_05.png b/docs/assets/img/product_pics/core/basic/basic_05.png
deleted file mode 100644
index e429f262..00000000
Binary files a/docs/assets/img/product_pics/core/basic/basic_05.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/core/faces_kit/.faces_base.png.icloud b/docs/assets/img/product_pics/core/faces_kit/.faces_base.png.icloud
new file mode 100644
index 00000000..29d7c872
Binary files /dev/null and b/docs/assets/img/product_pics/core/faces_kit/.faces_base.png.icloud differ
diff --git a/docs/assets/img/product_pics/core/faces_kit/faces_base.png b/docs/assets/img/product_pics/core/faces_kit/faces_base.png
deleted file mode 100644
index 3d1989fb..00000000
Binary files a/docs/assets/img/product_pics/core/faces_kit/faces_base.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/core/gray/.gray_05.png.icloud b/docs/assets/img/product_pics/core/gray/.gray_05.png.icloud
new file mode 100644
index 00000000..2599abfd
Binary files /dev/null and b/docs/assets/img/product_pics/core/gray/.gray_05.png.icloud differ
diff --git a/docs/assets/img/product_pics/core/gray/gray_05.png b/docs/assets/img/product_pics/core/gray/gray_05.png
deleted file mode 100644
index 56caa556..00000000
Binary files a/docs/assets/img/product_pics/core/gray/gray_05.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/core/m5go/.m5go_main_board.png.icloud b/docs/assets/img/product_pics/core/m5go/.m5go_main_board.png.icloud
new file mode 100644
index 00000000..3c1f024a
Binary files /dev/null and b/docs/assets/img/product_pics/core/m5go/.m5go_main_board.png.icloud differ
diff --git a/docs/assets/img/product_pics/core/m5go/m5go_main_board.png b/docs/assets/img/product_pics/core/m5go/m5go_main_board.png
deleted file mode 100644
index 96c82094..00000000
Binary files a/docs/assets/img/product_pics/core/m5go/m5go_main_board.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/app/puppyc/puppyc_01.jpg b/docs/assets/img/product_pics/hat/puppyc_hat/puppyc_01.jpg
similarity index 100%
rename from docs/assets/img/product_pics/app/puppyc/puppyc_01.jpg
rename to docs/assets/img/product_pics/hat/puppyc_hat/puppyc_01.jpg
diff --git a/docs/assets/img/product_pics/app/puppyc/puppyc_02.jpg b/docs/assets/img/product_pics/hat/puppyc_hat/puppyc_02.jpg
similarity index 100%
rename from docs/assets/img/product_pics/app/puppyc/puppyc_02.jpg
rename to docs/assets/img/product_pics/hat/puppyc_hat/puppyc_02.jpg
diff --git a/docs/assets/img/product_pics/app/puppyc/puppyc_03.jpg b/docs/assets/img/product_pics/hat/puppyc_hat/puppyc_03.jpg
similarity index 100%
rename from docs/assets/img/product_pics/app/puppyc/puppyc_03.jpg
rename to docs/assets/img/product_pics/hat/puppyc_hat/puppyc_03.jpg
diff --git a/docs/assets/img/product_pics/app/puppyc/puppyc_04.jpg b/docs/assets/img/product_pics/hat/puppyc_hat/puppyc_04.jpg
similarity index 100%
rename from docs/assets/img/product_pics/app/puppyc/puppyc_04.jpg
rename to docs/assets/img/product_pics/hat/puppyc_hat/puppyc_04.jpg
diff --git a/docs/assets/img/product_pics/tool/.progisp172.zip.icloud b/docs/assets/img/product_pics/tool/.progisp172.zip.icloud
new file mode 100644
index 00000000..80ba009c
Binary files /dev/null and b/docs/assets/img/product_pics/tool/.progisp172.zip.icloud differ
diff --git a/docs/assets/img/product_pics/tool/progisp172.zip b/docs/assets/img/product_pics/tool/progisp172.zip
deleted file mode 100644
index c6a61db6..00000000
Binary files a/docs/assets/img/product_pics/tool/progisp172.zip and /dev/null differ
diff --git a/docs/assets/img/product_pics/unit/gps/.unit_gps_08.png.icloud b/docs/assets/img/product_pics/unit/gps/.unit_gps_08.png.icloud
new file mode 100644
index 00000000..9bb108f1
Binary files /dev/null and b/docs/assets/img/product_pics/unit/gps/.unit_gps_08.png.icloud differ
diff --git a/docs/assets/img/product_pics/unit/gps/unit_gps_08.png b/docs/assets/img/product_pics/unit/gps/unit_gps_08.png
deleted file mode 100644
index 1acf8b24..00000000
Binary files a/docs/assets/img/product_pics/unit/gps/unit_gps_08.png and /dev/null differ
diff --git a/docs/assets/img/product_pics/unit/pahub/.tca9548a.pdf.icloud b/docs/assets/img/product_pics/unit/pahub/.tca9548a.pdf.icloud
new file mode 100644
index 00000000..66a22334
Binary files /dev/null and b/docs/assets/img/product_pics/unit/pahub/.tca9548a.pdf.icloud differ
diff --git a/docs/assets/img/product_pics/unit/pahub/tca9548a.pdf b/docs/assets/img/product_pics/unit/pahub/tca9548a.pdf
deleted file mode 100644
index 59dd3c23..00000000
Binary files a/docs/assets/img/product_pics/unit/pahub/tca9548a.pdf and /dev/null differ
diff --git a/docs/en/app/puppyc.md b/docs/en/hat/hat-puppyc.md
similarity index 82%
rename from docs/en/app/puppyc.md
rename to docs/en/hat/hat-puppyc.md
index f1a68bb8..42a3e063 100644
--- a/docs/en/app/puppyc.md
+++ b/docs/en/hat/hat-puppyc.md
@@ -1,7 +1,7 @@
# PuppyC {docsify-ignore-all}
-
-
+
+
:memo:**[Description](#Description)** 
**[EasyLoader](#EasyLoader)** 🛒**[Purchase](https://m5stack.com/products/puppyc-w-o-m5stickc)** :clapper:**[Videos](#Videos)**
@@ -16,7 +16,7 @@ PuppyC base needs to be used in conjunction with the M5StickC controller.After t
It walks slowly and is easy to control.Due to the small contact area, the movement is slow and the frictional force is as large as possible even on a soft surface.
-
+
## Product Features
@@ -47,7 +47,7 @@ It walks slowly and is easy to control.Due to the small contact area, the moveme
-
+
>1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. This can be burned to the M5 device through simple steps, and a series of function verifications can be performed.
diff --git a/docs/image/Advanced module/RS485.png b/docs/image/Advanced module/RS485.png
new file mode 100644
index 00000000..d016efd7
Binary files /dev/null and b/docs/image/Advanced module/RS485.png differ
diff --git a/docs/image/Display/.UI_user4.gif.icloud b/docs/image/Display/.UI_user4.gif.icloud
new file mode 100644
index 00000000..969944e4
Binary files /dev/null and b/docs/image/Display/.UI_user4.gif.icloud differ
diff --git a/docs/image/Display/UI_user4.gif b/docs/image/Display/UI_user4.gif
deleted file mode 100644
index a2489a0c..00000000
Binary files a/docs/image/Display/UI_user4.gif and /dev/null differ
diff --git a/docs/image/Hardwares/.IMU_user.gif.icloud b/docs/image/Hardwares/.IMU_user.gif.icloud
new file mode 100644
index 00000000..95eb24e1
Binary files /dev/null and b/docs/image/Hardwares/.IMU_user.gif.icloud differ
diff --git a/docs/image/Hardwares/.RGB_user.gif.icloud b/docs/image/Hardwares/.RGB_user.gif.icloud
new file mode 100644
index 00000000..bdf4e1ce
Binary files /dev/null and b/docs/image/Hardwares/.RGB_user.gif.icloud differ
diff --git a/docs/image/Hardwares/IMU_user.gif b/docs/image/Hardwares/IMU_user.gif
deleted file mode 100644
index 104767c0..00000000
Binary files a/docs/image/Hardwares/IMU_user.gif and /dev/null differ
diff --git a/docs/image/Hardwares/RGB_user.gif b/docs/image/Hardwares/RGB_user.gif
deleted file mode 100644
index a3d4909b..00000000
Binary files a/docs/image/Hardwares/RGB_user.gif and /dev/null differ
diff --git a/docs/image/Loops/.Range_user.gif.icloud b/docs/image/Loops/.Range_user.gif.icloud
new file mode 100644
index 00000000..58ab1722
Binary files /dev/null and b/docs/image/Loops/.Range_user.gif.icloud differ
diff --git a/docs/image/Loops/.Repeat_user.gif.icloud b/docs/image/Loops/.Repeat_user.gif.icloud
new file mode 100644
index 00000000..8f01787f
Binary files /dev/null and b/docs/image/Loops/.Repeat_user.gif.icloud differ
diff --git a/docs/image/Loops/Range_user.gif b/docs/image/Loops/Range_user.gif
deleted file mode 100644
index 1e6622de..00000000
Binary files a/docs/image/Loops/Range_user.gif and /dev/null differ
diff --git a/docs/image/Loops/Repeat_user.gif b/docs/image/Loops/Repeat_user.gif
deleted file mode 100644
index bb326a4a..00000000
Binary files a/docs/image/Loops/Repeat_user.gif and /dev/null differ
diff --git a/docs/image/Modules/.PM2.5_user.gif.icloud b/docs/image/Modules/.PM2.5_user.gif.icloud
new file mode 100644
index 00000000..46daa364
Binary files /dev/null and b/docs/image/Modules/.PM2.5_user.gif.icloud differ
diff --git a/docs/image/Modules/PM2.5_user.gif b/docs/image/Modules/PM2.5_user.gif
deleted file mode 100644
index 8d52f4d4..00000000
Binary files a/docs/image/Modules/PM2.5_user.gif and /dev/null differ
diff --git a/docs/image/Network/.P2PSend_user.gif.icloud b/docs/image/Network/.P2PSend_user.gif.icloud
new file mode 100644
index 00000000..0303eff8
Binary files /dev/null and b/docs/image/Network/.P2PSend_user.gif.icloud differ
diff --git a/docs/image/Network/.wifi_user.gif.icloud b/docs/image/Network/.wifi_user.gif.icloud
new file mode 100644
index 00000000..9318b2a8
Binary files /dev/null and b/docs/image/Network/.wifi_user.gif.icloud differ
diff --git a/docs/image/Network/P2PSend_user.gif b/docs/image/Network/P2PSend_user.gif
deleted file mode 100644
index 88d02add..00000000
Binary files a/docs/image/Network/P2PSend_user.gif and /dev/null differ
diff --git a/docs/image/Network/wifi_user.gif b/docs/image/Network/wifi_user.gif
deleted file mode 100644
index 9f404933..00000000
Binary files a/docs/image/Network/wifi_user.gif and /dev/null differ
diff --git a/docs/image/Operation/.JSON_dump_user.gif.icloud b/docs/image/Operation/.JSON_dump_user.gif.icloud
new file mode 100644
index 00000000..42fd1550
Binary files /dev/null and b/docs/image/Operation/.JSON_dump_user.gif.icloud differ
diff --git a/docs/image/Operation/.map_creat_user.gif.icloud b/docs/image/Operation/.map_creat_user.gif.icloud
new file mode 100644
index 00000000..3302d925
Binary files /dev/null and b/docs/image/Operation/.map_creat_user.gif.icloud differ
diff --git a/docs/image/Operation/JSON_dump_user.gif b/docs/image/Operation/JSON_dump_user.gif
deleted file mode 100644
index 22f66cef..00000000
Binary files a/docs/image/Operation/JSON_dump_user.gif and /dev/null differ
diff --git a/docs/image/Operation/map_creat_user.gif b/docs/image/Operation/map_creat_user.gif
deleted file mode 100644
index 22f66cef..00000000
Binary files a/docs/image/Operation/map_creat_user.gif and /dev/null differ
diff --git a/docs/image/Units/.THERMAL_user.gif.icloud b/docs/image/Units/.THERMAL_user.gif.icloud
new file mode 100644
index 00000000..d1454aeb
Binary files /dev/null and b/docs/image/Units/.THERMAL_user.gif.icloud differ
diff --git a/docs/image/Units/THERMAL_user.gif b/docs/image/Units/THERMAL_user.gif
deleted file mode 100644
index 0fc3e907..00000000
Binary files a/docs/image/Units/THERMAL_user.gif and /dev/null differ
diff --git a/docs/image/base/.downpage.png.icloud b/docs/image/base/.downpage.png.icloud
new file mode 100644
index 00000000..c1a6fd4f
Binary files /dev/null and b/docs/image/base/.downpage.png.icloud differ
diff --git a/docs/image/base/downpage.png b/docs/image/base/downpage.png
deleted file mode 100644
index 5524ecb6..00000000
Binary files a/docs/image/base/downpage.png and /dev/null differ
diff --git a/docs/index.md b/docs/index.md
index 7359d221..39bae593 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -897,6 +897,14 @@
+
+
+
***
@@ -1005,12 +1013,7 @@
-
+
***
diff --git a/docs/zh_CN/1515/6060-push.md b/docs/zh_CN/1515/6060-push.md
index d4adbe2b..bfd82ee3 100644
--- a/docs/zh_CN/1515/6060-push.md
+++ b/docs/zh_CN/1515/6060-push.md
@@ -30,6 +30,9 @@
- 3D打印
- 直线运动控制
+## RS485示例
+
+代码示例
## 相关链接
diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md
index 97bc4776..489e0ac2 100644
--- a/docs/zh_CN/README.md
+++ b/docs/zh_CN/README.md
@@ -902,6 +902,15 @@
+
+
+
+
***
@@ -1007,12 +1016,7 @@
-
+
***
diff --git a/docs/zh_CN/app/puppyc.md b/docs/zh_CN/hat/hat-puppyc.md
similarity index 79%
rename from docs/zh_CN/app/puppyc.md
rename to docs/zh_CN/hat/hat-puppyc.md
index e0b2ba03..519c13d9 100644
--- a/docs/zh_CN/app/puppyc.md
+++ b/docs/zh_CN/hat/hat-puppyc.md
@@ -1,9 +1,9 @@
# PuppyC {docsify-ignore-all}
-
-
+
+
-:memo:**[描述](#描述)** **[EasyLoader](#EasyLoader)** 🛒**[购买链接](https://m5stack.com/products/puppyc-w-o-m5stickc)**
+:memo:**[描述](#描述)** **[EasyLoader](#EasyLoader)** 🛒**[购买链接](https://m5stack.com/products/puppyc-w-o-m5stickc)** :clapper:**[Videos](#Videos)**
@@ -16,7 +16,7 @@ PuppyC底座需要结合M5StickC控制器使用，StickC编程后通过I2C协议
-
+
## 产品特性
@@ -49,7 +49,7 @@ PuppyC底座需要结合M5StickC控制器使用，StickC编程后通过I2C协议
-
+
>1. EasyLoader是一个简洁快速的程序烧录器，每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序，通过简单步骤将其烧录至主控，能够进行一系列的功能验证.**(目前EasyLoader仅适用于Windows操作系统)**
diff --git a/docs/zh_CN/uiflow/RS485.md b/docs/zh_CN/uiflow/RS485.md
new file mode 100644
index 00000000..552978ce
--- /dev/null
+++ b/docs/zh_CN/uiflow/RS485.md
@@ -0,0 +1,128 @@
+# RS485 {docsify-ignore-all}
+
+
+
+
+**[1. RS485使用介绍](#RS485使用介绍)**
+
+**[2. RS485例程](#RS485使用示例)**
+
+**[3. PUSH6060例程](#PUSH6060例程)**
+
+
+## RS485使用介绍
+
+>RS485是一种长距离数据传输标准，其基本使用方法与串口的用法相同，即定义RX与TX端口，通信波特率及数据位，进行通信。通常情况下配置为(9600,Serial_8N1,RX_PIN,TX_PIN),9600波特率，8个数据位，无奇偶校验位，1个停止位
+
+
+## RS485使用Arduino示例
+
+>1. 在程序初始化时定义串口2，通常情况下M5Stack的串口为16（RX_PIN)和17（TX_PIN)，M5StickC的串口为33（RX_PIN）和32(TX_PIN)，HAT串口为26（RX_PIN）和0(TX_PIN)，
+
+Serial2.begin(115200, SERIAL_8N1, RX_PIN, TX_PIN);
+
+
+>2. 发送数据可以使用Serial2.print(“x”)或者Serial.write("x"),关于两者的区别请参照Arduino中Serial的使用
+
+Serial2.print("97");或者Serial2.write("97");
+
+>3. 读取数据可以使用Serial2.read()从缓冲区中读出
+
+ if(Serial2.available()){
+ char c = Serial2.read();
+ }
+
+
+> *以下基本代码仅供参考
+
+```arduino
+#include
+
+#define RX_PIN 16
+#define TX_PIN 17
+
+void setup() {
+ M5.begin();
+ Serial2.begin(9600, SERIAL_8N1, RX_PIN, TX_PIN); //串口2初始化
+}
+
+
+void loop() {
+ if(M5.BtnA.wasPressed()){ //如果按键A被按下
+ Serial2.print("hello,from RS485\r\n"); //通过串口2发送数据
+ }
+ if(Serial2.available()){ //如果串口有数据读取并打印
+ char c = Serial2.read();
+ Serial.print(c);
+ }
+ M5.update(); //按键状态刷新
+}
+
+```
+
+>UIFlow使用RS485示例
+
+
+
+
+## PUSH6060例程：
+
+>具体细节参考RS485示例，以下为示范代码
+
+```arduino
+
+#include
+#define RX_PIN 16
+#define TX_PIN 17
+
+#define X_LOCAL 40
+#define Y_LOCAL 40
+
+#define X_OFF 160
+#define Y_OFF 30
+
+int distance = 0; //步进电机移动步进值
+
+void header(const char *string, uint16_t color){ //标题
+ M5.Lcd.fillScreen(color);
+ M5.Lcd.setTextSize(1);
+ M5.Lcd.setTextColor(TFT_MAGENTA, TFT_BLUE);
+ M5.Lcd.fillRect(0, 0, 320, 30, TFT_BLUE);
+ M5.Lcd.setTextDatum(TC_DATUM);
+ M5.Lcd.drawString(string, 160, 3, 4);
+}
+
+void setup() {
+ M5.begin();
+ M5.Power.begin();
+
+ header("PUSH 6060", TFT_BLACK);
+ M5.Lcd.setTextFont(2);
+ M5.Lcd.setTextColor(TFT_WHITE, TFT_BLACK);
+ Serial2.begin(9600, SERIAL_8N1, RX_PIN, TX_PIN); //配置串口2
+ delay(500);
+ Serial2.print("ID=123\r\n"); //串口2输出ID=123\r\n，配置6060电机ID为123
+}
+
+
+void loop() {
+ if(M5.BtnA.wasPressed()){ //按键A按下发送ID\r\n，查看6060电机ID
+ Serial2.print("ID\r\n");
+ }
+ if(M5.BtnB.wasPressed()){ //按键B按下发送ID123:X%d\r\n控制移动绝对行程，其中%d为变量distance
+ if(distance < 50){
+ distance +=10;
+ Serial2.printf("ID123:X%d\r\n",distance);
+ }
+ }
+ if(M5.BtnC.wasPressed()){ //按键C按下发送ID123Z\r\n,电机回原点
+ Serial2.print("ID123Z\r\n");
+ }
+ if(Serial2.available()){ //串口2接收6060返回的消息并打印
+ char c = Serial2.read();
+ Serial.print(c);
+ }
+ M5.update();
+}
+
+```
\ No newline at end of file
+ 
-