diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_adc.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_adc.webp index ad147d52..982eadb2 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_adc.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_adc.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_adc_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_adc_02.webp index c2cd9283..63d642f8 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_adc_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_adc_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_button.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_button.webp index 36372baf..c5f7719c 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_button.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_button.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_color.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_color.webp index 8eb96168..06e4e3c9 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_color.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_color.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_color_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_color_02.webp index 272e5509..a0ba8534 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_color_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_color_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_light.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_light.webp index cb8b7fa9..a89f69f6 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_light.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_light.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_light_01.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_light_01.webp index 6d60d4ca..7af34b7a 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_light_01.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_light_01.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_light_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_light_02.webp index e60e5ce7..1c89e733 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_light_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_light_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_pir.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_pir.webp index 222a9598..5376781f 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_pir.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_pir.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal.webp index 0a44b092..00571cc5 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_02.webp index af4e3018..c2046320 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_03.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_03.webp index b4db60c8..7a3012fa 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_03.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_03.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_04.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_04.webp index 381d9bf9..22ec9c28 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_04.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_thermal_04.webp differ diff --git a/docs/assets/img/product_pics/unit/tof/unit_tof_01.webp b/docs/assets/img/product_pics/unit/tof/unit_tof_01.webp index de39a324..bf1f913e 100644 Binary files a/docs/assets/img/product_pics/unit/tof/unit_tof_01.webp and b/docs/assets/img/product_pics/unit/tof/unit_tof_01.webp differ diff --git a/docs/assets/img/product_pics/unit/tof/unit_tof_02.webp b/docs/assets/img/product_pics/unit/tof/unit_tof_02.webp index d31e8622..138dff8f 100644 Binary files a/docs/assets/img/product_pics/unit/tof/unit_tof_02.webp and b/docs/assets/img/product_pics/unit/tof/unit_tof_02.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_heart_01.webp b/docs/assets/img/product_pics/unit/unit_heart_01.webp index 54b34f19..6b2b19ed 100644 Binary files a/docs/assets/img/product_pics/unit/unit_heart_01.webp and b/docs/assets/img/product_pics/unit/unit_heart_01.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_heart_02.webp b/docs/assets/img/product_pics/unit/unit_heart_02.webp index 895ae04b..606bef59 100644 Binary files a/docs/assets/img/product_pics/unit/unit_heart_02.webp and b/docs/assets/img/product_pics/unit/unit_heart_02.webp differ diff --git a/docs/en/atom/atomecho.md b/docs/en/atom/atomecho.md index c41c24ef..46fb9b2d 100644 --- a/docs/en/atom/atomecho.md +++ b/docs/en/atom/atomecho.md @@ -61,7 +61,7 @@ Speaker - 1W/NS4168 I2S + 0.5W/NS4168 I2S Micphone diff --git a/docs/en/atom/atomhub.md b/docs/en/atom/atomhub.md index 680ab74e..2c29b15a 100644 --- a/docs/en/atom/atomhub.md +++ b/docs/en/atom/atomhub.md @@ -6,7 +6,7 @@ ## Description -**ATOMHUB** is a DIY proto board suite that adapts to ATOM series. Users can build circuits or connect peripherals according to their own needs to satisfy the functions and requirements of specific scenarios. Considering the various possibilities of user connection, atomhub provides a wealth of interfaces, including VH3.96 Interface, DC5V power interface, grove interface, and all kinds of openings are reserved on the shell to facilitate user wiring。A variety of mounting holes are designed on the back of the fuselage, which not only support the traditional hanging holes and screw fixing holes, but also support the fixation of slide rail clamps.Built in proto circuit board, main circuit space layout 45x35x20mm.With atomhub, you can make your own hardware devices at will, such as connecting batteries by yourself, or integrating micro air pump + air pressure sensor to make a blood pressure meter, or even building a positioning and tracking system with GPS + NB-IoT module. +**ATOMHUB** is a DIY proto board module designed for use with the ATOM series. Users can build circuits or connect peripherals according to their own needs to satisfy the functions and requirements of specific scenarios. Considering the various possibilities of user connection, atomhub provides a wealth of interfaces, including VH3.96 Interface, DC5V power interface, grove interface, and all kinds of openings are reserved on the shell to facilitate user wiring。A variety of mounting holes are designed on the back of the fuselage, which not only support the traditional hanging holes and screw fixing holes, but also support the fixation of slide rail clamps.Built in proto circuit board, main circuit space layout 45x35x20mm.With atomhub, you can make your own hardware devices at will, such as connecting batteries by yourself, or integrating micro air pump + air pressure sensor to make a blood pressure meter, or even building a positioning and tracking system with GPS + NB-IoT module. ## Product Features @@ -15,10 +15,10 @@ - Compact design - Industrial applications - Multiple interface output -- Multiple mounting holes reserved +- Multiple mounting holes - Creative DIY -## Include +## Includes - 1x Proto board(include GROVE port) - 1x 3.96*4P Plug & Plug Base @@ -81,14 +81,16 @@ ## USAGE -According to your own needs to build the circuit prototype, welding the corresponding components,through the vh-3.96 interface to connect external electrical equipment.You can also choose to purchase round waterproof connector connecting cable by yourself.If you need to supply power through external power supply, you can choose to supply power directly to ATOM through USB; Or weld the DC 5V connector and connect the positive and negative poles to the corresponding pins of ATOM. If the input voltage is higher than 5V, you need to build your own voltage step-down circuit.If you need to use GROVE port, connect the padbreakpoint corresponding to the pin number you determined to use. +Depending on your use case you can design the circuit or prototype, soldering the corresponding components,through the vh-3.96 interface to connect external electrical equipment.You can also choose to purchase round waterproof connector connecting cable by yourself. + +If you need to supply power through an external power supply, you can choose to supply power directly to ATOM through USB, or solder the DC 5V connector and connect the positive and negative poles to the corresponding pins of the ATOM. If the input voltage is higher than 5V, you need to build your own voltage step-down circuit.If you need to use the GROVE port, connect the pad breakpoint corresponding to the pin number you decide to use. ## Example ### 1. Arduino A remote control circuit is built in AtomHUB by using the step-down circuit and relay. The control pin of the relay is GPIO21, which is powered by an external power supply. It is connected to Apple's Homekit application through WiFi for remote control. Open the Homekit for manual connection. The default password is 11111111. Use the Siri voice remote control or manual button for remote control. -[Click here](https://)to get example code. +[Click here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/AtomBase/AtomHub/Arduino_LED_Hap)to get example code. ## Video diff --git a/docs/en/quick_start/m5stickv/m5stickv_quick_start.md b/docs/en/quick_start/m5stickv/m5stickv_quick_start.md index 66873592..1bc8ab18 100644 --- a/docs/en/quick_start/m5stickv/m5stickv_quick_start.md +++ b/docs/en/quick_start/m5stickv/m5stickv_quick_start.md @@ -231,8 +231,9 @@ while True: ``` -## Library +## Example + diff --git a/docs/en/uiflow/advanced.md b/docs/en/uiflow/advanced.md index 9bd048ae..1e63f08d 100644 --- a/docs/en/uiflow/advanced.md +++ b/docs/en/uiflow/advanced.md @@ -776,4 +776,76 @@ Receive the specified packet and analyze the data, judge the data to respond and Set three variables to receive the address, function number and data sent by the Master, use the List-block to obtain data, judge and process the data, and report the status to the Master through (function number 2). Press the A / B button manually to report to the Master (via function number 2) while responding. -> \ No newline at end of file +> + +# BLE UART(support M5Stack Fire only) + +#### Function Description + +>Establish Bluetooth connection and enable Bluetooth passthrough service. + +> + +* __Init ble uart name__ +Initialize settings, configure Bluetooth device name. + +* __BLE UART Writre__ +Send data using BLE UART. + +* __BLE UART remain cache__ +Check the number of bytes of BLE UART data. + +* __BLE UART read all__ +Read all data in BLE UART cache. + +* __BLE UART read characters__ +Read n data in BLE UART cache. + +#### Instructions + +>Establish Bluetooth passthrough connection and send on / off control LED. + +> + +# Blynk(support M5Stack Fire only) + +>Connect with Blynk server, use BLE to connect Blynk App, and realize M5Stack Fire control on mobilephone + +> + +* __Init blynk name token type BLE__ +Initialize Blynk configuration, input device name and token of App. + +* __Virtual write number data__ +Write data to Virtual port number + +* __Notify message__ +Send system message notification to App + +* __Tweet message__ +Send message notifications to twitter client + +* __On event write get number message__ +Receive the data of the specified virtual port to be written from the app, if not specified, set to V* + +* __On event read get number__ +Read the virtual port number specified by the App + +* __On event__ +Callback function when Bluetooth is connected / disconnected + +#### Instructions + +>Use Blynk to control the color and brightness of the RGB light bar of M5StackFire and display it on the screen in real-time + +1.Download the blynk App and register your account. You can choose to use the official blynk server or build your own server. Here we provide a free server(120.24.58.30:9443) for you to test. + +2.Use the email to register the blynk account, and log in with the account after successful registration. + +3.Create a new project, select ESP32 Dev board, select BLE mode, and record the Auth Token. + +4.Follow the steps below to add components, BLE connections are required. + +> + +> \ No newline at end of file diff --git a/docs/image/Advanced module/ble_uart.webp b/docs/image/Advanced module/ble_uart.webp new file mode 100644 index 00000000..7fab912c Binary files /dev/null and b/docs/image/Advanced module/ble_uart.webp differ diff --git a/docs/image/Advanced module/ble_uart_user.webp b/docs/image/Advanced module/ble_uart_user.webp new file mode 100644 index 00000000..f32917e6 Binary files /dev/null and b/docs/image/Advanced module/ble_uart_user.webp differ diff --git a/docs/image/Advanced module/blynk.webp b/docs/image/Advanced module/blynk.webp new file mode 100644 index 00000000..0d1880d7 Binary files /dev/null and b/docs/image/Advanced module/blynk.webp differ diff --git a/docs/image/Advanced module/blynk_app_user1.webp b/docs/image/Advanced module/blynk_app_user1.webp new file mode 100644 index 00000000..f282ac89 Binary files /dev/null and b/docs/image/Advanced module/blynk_app_user1.webp differ diff --git a/docs/image/Advanced module/blynk_app_user2.webp b/docs/image/Advanced module/blynk_app_user2.webp new file mode 100644 index 00000000..11b832c3 Binary files /dev/null and b/docs/image/Advanced module/blynk_app_user2.webp differ diff --git a/docs/image/Advanced module/blynk_app_user3.webp b/docs/image/Advanced module/blynk_app_user3.webp new file mode 100644 index 00000000..398530df Binary files /dev/null and b/docs/image/Advanced module/blynk_app_user3.webp differ diff --git a/docs/image/Advanced module/blynk_app_user4.webp b/docs/image/Advanced module/blynk_app_user4.webp new file mode 100644 index 00000000..24289066 Binary files /dev/null and b/docs/image/Advanced module/blynk_app_user4.webp differ diff --git a/docs/image/Advanced module/blynk_app_user5.webp b/docs/image/Advanced module/blynk_app_user5.webp new file mode 100644 index 00000000..758fb7af Binary files /dev/null and b/docs/image/Advanced module/blynk_app_user5.webp differ diff --git a/docs/image/Advanced module/blynk_user.webp b/docs/image/Advanced module/blynk_user.webp new file mode 100644 index 00000000..f499a65f Binary files /dev/null and b/docs/image/Advanced module/blynk_user.webp differ diff --git a/docs/zh_CN/atom/atomecho.md b/docs/zh_CN/atom/atomecho.md index f9341396..52cb0ca7 100644 --- a/docs/zh_CN/atom/atomecho.md +++ b/docs/zh_CN/atom/atomecho.md @@ -62,7 +62,7 @@ SPEAKER - 1W/NS4168 I2S + 0.5W/NS4168 I2S MIC diff --git a/docs/zh_CN/atom/atomhub.md b/docs/zh_CN/atom/atomhub.md index 5afd8e40..881214cd 100644 --- a/docs/zh_CN/atom/atomhub.md +++ b/docs/zh_CN/atom/atomhub.md @@ -86,7 +86,7 @@ 在AtomHUB内使用降压电路和继电器搭建一个远程控制电路，继电器控制引脚为GPIO21，外接电源进行供电，通过WIFI连接苹果公司的HomeKit应用进行远程控制，打开HomeKit手动进行连接，默认密码11111111，使用Siri语音遥控或手动按键进行遥控。 -[点击此处](https://)获取完整代码 +[点击此处](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/AtomBase/AtomHub/Arduino_LED_Hap)获取完整代码 ## 相关视频 diff --git a/docs/zh_CN/quick_start/m5stickv/m5stickv_quick_start.md b/docs/zh_CN/quick_start/m5stickv/m5stickv_quick_start.md index 25d6c8bc..d6ccafd1 100644 --- a/docs/zh_CN/quick_start/m5stickv/m5stickv_quick_start.md +++ b/docs/zh_CN/quick_start/m5stickv/m5stickv_quick_start.md @@ -222,8 +222,9 @@ while True: a = class_ws2812.set_led(i,(0,0,r)) a=class_ws2812.display() ``` -## 程序库 +## 案例程序 + diff --git a/docs/zh_CN/uiflow/advanced.md b/docs/zh_CN/uiflow/advanced.md index 0a7a1783..3210e95c 100644 --- a/docs/zh_CN/uiflow/advanced.md +++ b/docs/zh_CN/uiflow/advanced.md @@ -32,6 +32,8 @@ **[Modbus Slave](#Modbus-Slave)** +**[BLE UART](#BLE-UART)** + # 远程控制 #### 功能说明 @@ -834,3 +836,77 @@ wifi重新连接 设置三个变量分别接收主机发送的地址、功能码、数据，使用列表获取数据，对数据进行判断处理，同时将状态通过（功能码2）上报主机。手动按A/B键在自身响应的同时也会上报主机(通过功能码2). > + + +# BLE UART(仅支持M5Stack Fire) + +#### 功能说明 + +>建立蓝牙连接，开启蓝牙透传服务 + +> + +* __Init ble uart name__ +初始化设置，配置蓝牙设备名称 + +* __BLE UART Writre__ +使用蓝牙发送数据 + +* __BLE UART remain cache__ +检查蓝牙串口缓存数据字节数 + +* __BLE UART read all__ +读取蓝牙串口缓存中所有数据 + +* __BLE UART read characters__ +读取蓝牙串口缓存中n个数据 + +#### 使用说明 + +>建立蓝牙透传连接，发送on/off控制LED + +> + +# Blynk(仅支持M5Stack Fire) + +>与Blynk服务器连接，使用BLE连接Blynk App，实现手机端控制M5Stack Fire + +> + +* __Init blynk name token type BLE__ +初始化blynk配置，输入设备名称与App端的token. + +* __Virtual write number data__ +向虚拟端口号写入数据 + +* __Notify message__ +向App发送系统级消息通知 + +* __Tweet message__ +向Twitter客户端发送消息通知 + +* __On event write get number message__ +从App端接收即将写入的指定虚拟端口的数据，如果不指定设为V* + +* __On event read get number__ +读取App端指定的虚拟端口号 + +* __On event__ +蓝牙连接/断开时的回调函数 + +#### 使用说明 + +>使用Blynk控制M5StackFire的RGB灯条颜色和亮度，并在屏幕上实时显示 + +1.下载移动端Blynk，注册账号，您可以选择使用Blynk官方服务器，或自行搭建服务器，这里我们提供一个免费服务器供您测试(120.24.58.30:9443)。 + +2.使用邮箱注册Blynk账号，注册成功后使用该账号登录。 + +3.创建新工程，选择ESP32 Dev Board，接入方式选择BLE，同时记录下AUTH TOKEN。 + +4.按照下图步骤添加组件，其中BLE连接为必要组件。 + +> + +> +