diff --git a/docs/assets/img/product_pics/app/lidarbot_03.jpg b/docs/assets/img/product_pics/app/lidarbot_03.jpg index 0cd0bd30..ee79fefc 100644 Binary files a/docs/assets/img/product_pics/app/lidarbot_03.jpg and b/docs/assets/img/product_pics/app/lidarbot_03.jpg differ diff --git a/docs/assets/img/product_pics/base/lan_sch.JPG b/docs/assets/img/product_pics/base/lan_sch.JPG new file mode 100644 index 00000000..07952ccf Binary files /dev/null and b/docs/assets/img/product_pics/base/lan_sch.JPG differ diff --git a/docs/assets/img/product_pics/base/rfid_01.png b/docs/assets/img/product_pics/base/rfid_01.png new file mode 100644 index 00000000..dd0bac68 Binary files /dev/null and b/docs/assets/img/product_pics/base/rfid_01.png differ diff --git a/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_01.png b/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_01.png new file mode 100644 index 00000000..b1ee7626 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_01.png differ diff --git a/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_02.png b/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_02.png new file mode 100644 index 00000000..dba3f465 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_example/COMMU/example_module_commu_02.png differ diff --git a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_01.png b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_01.png index dbec60d5..f5158c1c 100644 Binary files a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_01.png and b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_01.png differ diff --git a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02.png b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02.png deleted file mode 100644 index 43f7948e..00000000 Binary files a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02.png and /dev/null differ diff --git a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_en.png b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_en.png new file mode 100644 index 00000000..8f32b963 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_en.png differ diff --git a/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_zh_CN.png b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_zh_CN.png new file mode 100644 index 00000000..79768570 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_example/LEGO_PLUS/example_module_lego_plus_02_zh_CN.png differ diff --git a/docs/assets/img/product_pics/module/module_example/USB/example_module_usb_01.png b/docs/assets/img/product_pics/module/module_example/USB/example_module_usb_01.png new file mode 100644 index 00000000..2df1b730 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_example/USB/example_module_usb_01.png differ diff --git a/docs/assets/img/product_pics/unit/unit_example/NEOPIXEL/example_unit_neopixel_01.png b/docs/assets/img/product_pics/unit/unit_example/NEOPIXEL/example_unit_neopixel_01.png index 87b0e9d5..e9725dd6 100644 Binary files a/docs/assets/img/product_pics/unit/unit_example/NEOPIXEL/example_unit_neopixel_01.png and b/docs/assets/img/product_pics/unit/unit_example/NEOPIXEL/example_unit_neopixel_01.png differ diff --git a/docs/en/related_documents/establish_serial_connection.md b/docs/en/related_documents/establish_serial_connection.md index 90b2a9e3..fcbaff8e 100644 --- a/docs/en/related_documents/establish_serial_connection.md +++ b/docs/en/related_documents/establish_serial_connection.md @@ -1,5 +1,7 @@ # Establish Serial Connection +**[MacOS](#for-macOS)**      **[Windows](#for-windows)** + **This section provides guidance how to establish serial connection between your board and PC.** ## For MacOS diff --git a/docs/ja/related_documents/establish_serial_connection.md b/docs/ja/related_documents/establish_serial_connection.md index 17477529..807d2668 100644 --- a/docs/ja/related_documents/establish_serial_connection.md +++ b/docs/ja/related_documents/establish_serial_connection.md @@ -1,6 +1,6 @@ # シリアル接続の確立方法 - +**[MacOS](#for-macOS)**      **[Windows](#for-windows)** **このページでは、M5StackとPCとの間でシリアル接続を確立するための方法を説明します。** diff --git a/docs/zh_CN/app/lidarbot.md b/docs/zh_CN/app/lidarbot.md index d7a78999..24f188f1 100644 --- a/docs/zh_CN/app/lidarbot.md +++ b/docs/zh_CN/app/lidarbot.md @@ -1,6 +1,6 @@ # LidarBot - + * * * @@ -33,23 +33,29 @@ ## 参数 - 通信参数 - - 车体的M5Core主控与激光雷达传感器(RXD <-> GPIO16) + - 车体的M5Core主控与激光雷达传感器(雷达TXD <-> U2RXD(GPIO16)) 串口参数:230400bps,8位数据位,无奇偶校验,1位停止位 - - 车体的M5Core主控与车轮控制底板(TXD <-> GPIO17) + - 车体的M5Core主控与车轮控制底板(底板RXD <-> U2TXD(GPIO17)) 串口参数:115200bps,8位数据位,无奇偶校验,1位停止位 - 接口 - 舵机0 <-> A0(MEGA328) - 舵机1 <-> A1(MEGA328) - - NeoPixelRGB <-> 11(MEGA328) + - RGB灯条 <-> 11(MEGA328) + + + + ## 包含 -- 1x LidarBot +- 1x 雷达车 - 1x 远程遥控手柄 - 2x 电池(1300mAh @ 11.1V) - 1x 电池充电器 - 1x Type-C USB线 + + ## 应用 - 室内导航 diff --git a/docs/zh_CN/base/lan_base.md b/docs/zh_CN/base/lan_base.md index d797f2f4..a57b5fb5 100644 --- a/docs/zh_CN/base/lan_base.md +++ b/docs/zh_CN/base/lan_base.md @@ -3,10 +3,10 @@ *** + -:memo:**[描述](#描述)**      :octocat:**[例程](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/LAN/Arduino)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.6c24425eKdAPr3&id=574863427657)** - - +:memo:**[描述](#描述)**      :octocat:**[例程](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/LAN/Arduino)**      :electric_plug:**[原理图](#原理图)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.6c24425eKdAPr3&id=574863427657)** ## 描述 @@ -48,4 +48,6 @@ - **[官方论坛](http://forum.m5stack.com/)** - +## 原理图 + + \ No newline at end of file diff --git a/docs/zh_CN/base/rfid_base.md b/docs/zh_CN/base/rfid_base.md new file mode 100644 index 00000000..b88f777b --- /dev/null +++ b/docs/zh_CN/base/rfid_base.md @@ -0,0 +1,123 @@ +# RFID底座 - m5go底座升级版 + +basic_02 + +* * * + +:memo:**[描述](#描述)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.57b2425eKUxTqx&id=584855077636)** + + + +## 描述 + +RFID底座是[M5GO底座](zh_CN/product_documents/base/m5go_base)是升级版,在M5GO底座的基础上增加了RFID功能。 + +RFID底座由**330mAh的电池**、M-Bus总线接口、麦克风、红色的充电指示LED、2条RGB灯条(10颗)、PORT B和PORT C组成。 + +M5GO底座在充电过程中,红色LED闪烁,充满了常亮。 + +## 管脚映射 + +**POGO Pin** + +| POGO Pin | ESP32 Chip | +| :----------: |:------------: | +| SCL | GPIO22 | +| SDA | GPIO21 | + +**LED Bar(Neopixel)** + +*有10颗RGB灯,左右各5颗* + +| LED Pin | ESP32 Chip | +| :----------: |:------------: | +| LED Pin | GPIO15 | + +**麦克风MIC** + +| MIC Pin | ESP32 Chip | +| :----------: |:------------: | +| MIC Pin | GPIO34 | + +**GROVE接口** + +| PORT A(I2C) | ESP32 Chip | +| :----------: |:------------: | +| SCL | GPIO22 | +| SDA | GPIO21 | +| 5V | 5V | +| GND | GND | + +| PORT B(I/O) | ESP32 Chip | +| :----------: |:------------: | +| G36 | GPIO36 | +| G26 | GPIO26 | +| 5V | 5V | +| GND | GND | + +| PORT C(UART2) | ESP32 Chip | +| :----------: |:------------: | +| RXD | GPIO16 | +| TXD | GPIO17 | +| 5V | 5V | +| GND | GND | + +**M-Bus** + +
+ M_BUS +
+ +## 相关链接 + +- **[官方频道视频](https://i.youku.com/i/UNjE1ODA2MzE0OA==?spm=a2hzp.8253869.0.0)** + +- **[官方论坛](http://forum.m5stack.com/)** + + + + + + \ No newline at end of file diff --git a/docs/zh_CN/module/commu.md b/docs/zh_CN/module/commu.md index cde54749..08247a98 100644 --- a/docs/zh_CN/module/commu.md +++ b/docs/zh_CN/module/commu.md @@ -50,7 +50,9 @@ COMMU模块中的TTL接口,实际上是串口接口,默认连接的是串口 #### CAN通信 -先将库[MCP_CAN_lib]()放置到Arduino的库管理文件路径中,然后分别打开CAN的发送和接收两个程序,并分别烧录到两个m5core中。 +这是两个COMMU模块分别堆叠了M5Core之后,相互之间收发数据的例程。 + +先将库[MCP_CAN_lib](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/COMMU/Arduino/DependentLibrary/MCP_CAN_lib)放置到Arduino的库管理文件路径`C:\Users\\Documents\Arduino\libraries`中,然后分别打开CAN的发送和接收两个程序,并分别烧录到两个m5core中。 *具体例程请点击[这里](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/COMMU/Arduino/CAN).* @@ -105,8 +107,12 @@ pinMode(CAN0_INT, INPUT);// Configuring pin for /INT input CAN0.readMsgBuf(&rxId, &len, rxBuf); ``` + + #### RS485通信 -*请点击[这里](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/COMMU/Arduino/RS485)下载完整例程。* +这是两个M5Core之间通过RS485相互收发数据的例程。 -分别下载例程到两个m5core之后,按下按键A,然后两个core之间会相互发送数据。 \ No newline at end of file +分别下载[例程](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/COMMU/Arduino/RS485)到两个M5Core之后,按下按键A,然后两个core之间会相互发送数据。 + + \ No newline at end of file diff --git a/docs/zh_CN/module/lego_plus.md b/docs/zh_CN/module/lego_plus.md index 70c04e7b..04549d75 100644 --- a/docs/zh_CN/module/lego_plus.md +++ b/docs/zh_CN/module/lego_plus.md @@ -41,6 +41,6 @@ *具体例程请点击[这里](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/LEGO_PLUS/UIFlow)。* - + diff --git a/docs/zh_CN/module/usb.md b/docs/zh_CN/module/usb.md index 61f5ae13..4d98d6bf 100644 --- a/docs/zh_CN/module/usb.md +++ b/docs/zh_CN/module/usb.md @@ -35,6 +35,51 @@ ## 例程 +*以下仅为用法示意,并不完整。如果需要完整例程请点击[这里](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Unit/JOYSTICK/Arduino)。* + +烧录例程,USB鼠标接入模块之后,按住左键并拖动鼠标描绘白色线条;按住右键,描述绿色线条;按下中间滚轮键,清屏。 + +```arduino +#include +#include +#include +#include +#include +#include +#include "M5Mouse.h" + +// new objects +USB Usb; +USBHub Hub(&Usb); +HIDBoot HidMouse(&Usb); +MouseRptParser Prs; + +// initialization +M5.begin(); +Usb.Init(); +HidMouse.SetReportParser(0,(HIDReportParser*)&Prs); + +// handle event coming from usb device +Usb.Task(); +if(Usb.getUsbTaskState() == USB_STATE_RUNNING) +{ + Mouse_Pointer(mou_px, mou_py); + mou_px = 0; + mou_py = 0; + /* left button pressed: draw white point */ + if (mou_button == 1) + M5.Lcd.drawCircle(StaPotX, StaPotY, 1, WHITE); + /* right button pressed: draw green point */ + if (mou_button == 2) + M5.Lcd.drawCircle(StaPotX, StaPotY, 1, GREEN); + /* middle button pressed: clear screen */ + if (mou_button == 4) + M5.Lcd.fillScreen(BLACK); +} +``` + + + ## 原理图 \ No newline at end of file diff --git a/docs/zh_CN/related_documents/establish_serial_connection.md b/docs/zh_CN/related_documents/establish_serial_connection.md index d950402a..926e2d63 100644 --- a/docs/zh_CN/related_documents/establish_serial_connection.md +++ b/docs/zh_CN/related_documents/establish_serial_connection.md @@ -1,5 +1,7 @@ # 如何安装USB驱动并建立与PC的串口通讯 +**[MacOS](#for-macOS)**      **[Windows](#for-windows)** + **这个文档会介绍如何安装USB驱动,并与PC建立串口通信.** ## For MacOS diff --git a/docs/zh_CN/unit/heart.md b/docs/zh_CN/unit/heart.md index 7dddafe1..75520672 100644 --- a/docs/zh_CN/unit/heart.md +++ b/docs/zh_CN/unit/heart.md @@ -4,9 +4,9 @@ *** -:memo:**[描述](#描述)**|🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.11.7a46425eWmFRNi&id=583999638264)** +:memo:**[描述](#描述)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.11.7a46425eWmFRNi&id=583999638264)** - + ## 描述 diff --git a/docs/zh_CN/unit/thermal.md b/docs/zh_CN/unit/thermal.md index 14805812..8dce1843 100644 --- a/docs/zh_CN/unit/thermal.md +++ b/docs/zh_CN/unit/thermal.md @@ -1,4 +1,4 @@ -**# THERMAL - 人体红外成像Unit +# THERMAL - 人体红外成像Unit