diff --git a/docs/assets/img/product_pics/core/fire/m5_fire_01.webp b/docs/assets/img/product_pics/core/fire/m5_fire_01.webp index 6d03f9ce..7a1fb872 100644 Binary files a/docs/assets/img/product_pics/core/fire/m5_fire_01.webp and b/docs/assets/img/product_pics/core/fire/m5_fire_01.webp differ diff --git a/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_01.webp b/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_01.webp new file mode 100644 index 00000000..efa8c37c Binary files /dev/null and b/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_01.webp differ diff --git a/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_02.webp b/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_02.webp new file mode 100644 index 00000000..5964bb99 Binary files /dev/null and b/docs/assets/img/product_pics/module/com_lorawan915/com.lorawan915_02.webp differ diff --git a/docs/en/atom/atom_socket.md b/docs/en/atom/atom_socket.md new file mode 100644 index 00000000..7c87c0c5 --- /dev/null +++ b/docs/en/atom/atom_socket.md @@ -0,0 +1,133 @@ +# ATOM Socket + +SKU:K052 + +
+ +## Description + +**ATOM Socket** is a smart power socket adapted to ATOM main control. Built-in HLW8032 high-precision energy metering IC, can read the electrical parameters (line voltage, current, active power, apparent power and power factor) of the socket through serial communication. The external jack adopts Japanese standard specifications, and the internal integrated single-circuit relay (AC-220V@10A) is used to control the power on and off of the socket. With the ATOM main control integrated with WIFI&Bluetooth module, the power socket can be easily connected to the network for remote control And energy metering. The extra socket integrates HY2.0-4P interface, which can interact with external equipment (relay signal input, key signal output). + +## Product Features + +-Single relay control socket power on and off (220V@10A) +-HLW8032 High Precision Energy Metering IC +-Support voltage and current detection power calculation, within 1000:1 dynamic range: + -The measurement error of active power reaches 0.2% + -The effective current measurement error reaches 0.5% + -The effective voltage measurement error reaches 0.5% +-UART communication (baud: 4800) +-∑-Δ ADC, high-precision energy metering core +-Japanese standard jack +-HY2.0-4P external control interface + +## Includes + +-1x ATOM Socket +-1x ATOM LITE + +## Application + +-Metering socket +-Smart WIFI socket +-Smart home appliance control + +## Specification + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SpecificationsParameters
HLW8032 serial port communication baud rate4800
Recommended load power<=1000W
Relay parametersAC-110V@10A
Net weight104g
Gross weight116.6g
Product size90*42*55mm
Package size92*62*42mm
+ +>Comparison of products of the same type in M5 system + + + < /tr> + + +
ProductJack standardPower measurement solutionCompatible equipmentCommunication method
AC SocketChina StandardNoneCORERS485
ATOM SocketJapanese standardHLW8032 energy measurement IC (serial communication)ATOMIO control relay /UART read energy information
+ +## EasyLoader + +>EasyLoader is a simple and fast program burner, which has a built-in product-related case program, which can be burned to the main control through simple steps to perform a series of functional verification. + +
+
+
+
+ Windows +
+
+
+ +
+ + +

Case description:

+

Remotely control the ATOM Socket on and off the power supply, and monitor the power status

+
+
+
+ + +## Related Links + +-**Datasheet** + -[HLW8032](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/atombase/atom_socket/DS_HLW8032_CN.pdf) + +### Pin mapping + + + + +
ATOMG22G23
ATOM SocketRXRelay
+ +## Schematic + + + + +## Example + +-[Arduino code example](https://github.com/m5stack/M5Atom/tree/master/examples/ATOM_BASE/ATOM_Socket) + + diff --git a/docs/en/core/atom_lite.md b/docs/en/core/atom_lite.md index c68973ad..2e4140bf 100644 --- a/docs/en/core/atom_lite.md +++ b/docs/en/core/atom_lite.md @@ -91,11 +91,11 @@ Choose the development platform you want to use, view the corresponding tutorial Product Size - 24 x 24 x 10 mm + 24*24*10mm Package Size - 24 x 24 x 10 mm + 43*43*13mm Case Material diff --git a/docs/en/core/atom_matrix.md b/docs/en/core/atom_matrix.md index edf37e23..b20c2190 100644 --- a/docs/en/core/atom_matrix.md +++ b/docs/en/core/atom_matrix.md @@ -98,11 +98,11 @@ Choose the development platform you want to use, view the corresponding tutorial Product Size - 24 x 24 x 14 mm + 24*24*14mm Package Size - 24 x 24 x 14 mm + 43*43*20mm Case Material diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index 52ddc487..3c7ff59a 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -342,6 +342,10 @@ TF card Maximum size 16GB +## M-BUS + +M_BUS + **Charging current measured value** diff --git a/docs/en/core/core2.md b/docs/en/core/core2.md index 5cfcb69f..124a8197 100644 --- a/docs/en/core/core2.md +++ b/docs/en/core/core2.md @@ -33,6 +33,9 @@ The development platform and programming language supported by M5Stack Core2: Ar Restart: Click the RST button at the bottom +>To stack M5Core2 with M5 modules, you need to remove/omit the battery bottom of Core2; If you need to keep I2S Mic, IMU and Battery functions, a [M5GO Bottom2](en/base/m5go_bottom2) is needed. + + ## Product Features - ESP32-based, built-in Bluetooth,WiFi diff --git a/docs/en/core/face_kit.md b/docs/en/core/face_kit.md index 0aa42ea7..1dcb6591 100644 --- a/docs/en/core/face_kit.md +++ b/docs/en/core/face_kit.md @@ -345,6 +345,11 @@ Key Int Values (Int values are the ASCII value of each key)
charging currentFully charged current(Power OFF)Fully charged current(Power ON）
+## M-BUS + +M_BUS + + For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf) diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md index 5fab1ff5..545c9343 100644 --- a/docs/en/core/fire.md +++ b/docs/en/core/fire.md @@ -335,6 +335,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + When using the RGB LED of gpio15, it is recommended to initialize,pinMode(15, OUTPUT_OPEN_DRAIN); For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf) diff --git a/docs/en/core/gray.md b/docs/en/core/gray.md index d23ce406..4368c182 100644 --- a/docs/en/core/gray.md +++ b/docs/en/core/gray.md @@ -317,6 +317,10 @@ BMM150 I2C address 0x10 1.069A-0.073A +## M-BUS + +M_BUS + For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf) diff --git a/docs/en/core/m5go.md b/docs/en/core/m5go.md index 2957aa34..efd9cf36 100644 --- a/docs/en/core/m5go.md +++ b/docs/en/core/m5go.md @@ -317,6 +317,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + When using the RGB LED of gpio15, it is recommended to initialize,pinMode(15, OUTPUT_OPEN_DRAIN); For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf) diff --git a/docs/en/core/m5go_lite.md b/docs/en/core/m5go_lite.md index a95d0be7..10c69f5a 100644 --- a/docs/en/core/m5go_lite.md +++ b/docs/en/core/m5go_lite.md @@ -317,6 +317,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + When using the RGB LED of gpio15, it is recommended to initialize,pinMode(15, OUTPUT_OPEN_DRAIN); For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf) diff --git a/docs/en/hat/hat_roverc_pro.md b/docs/en/hat/hat_roverc_pro.md index 6bd3a076..6c8e8866 100644 --- a/docs/en/hat/hat_roverc_pro.md +++ b/docs/en/hat/hat_roverc_pro.md @@ -30,7 +30,7 @@ The PRO version provides a gripping mechanism controlled by a servo for gripping ## Include -- 1x RoverC base(includes 18350(900mAh) Battery) +- 1x RoverC base(includes 16340(700mAh) Battery) - 1x Claw Kit ## Specification diff --git a/docs/en/module/comx_lorawan915.md b/docs/en/module/comx_lorawan915.md new file mode 100644 index 00000000..8024fb30 --- /dev/null +++ b/docs/en/module/comx_lorawan915.md @@ -0,0 +1,97 @@ +# COM.LoRaWAN915 + +SKU:M031-C + +
+ +## Description + +**COM.LoRaWAN915** is a LoRaWAN communication module suitable for 915MHz frequency launched by M5Stack. The module adopts the Ai-Thinker Ra-07H module solution, which supports long-distance communication and has both ultra-low power consumption and high sensitivity. The module integrates the LoRaWAN protocol stack and adopts a serial communication interface (using AT command set for control), and can be used as a collection node to access a large number of gateways for data collection and management. It is widely used in various IoT scenarios, such as the deployment of environmental monitoring nodes. + +## Product Features + +-Ai-Thinker Ra-07H module solution +-Operating frequency: 915MHz +-SMA antenna +-Communication interface: UART +-Command protocol: AT command + +## Includes + +-1x LoRaWAN915 Module +-1x SMA antenna + +## Application + +-Automatic remote meter reading +-Intelligent traffic intelligent parking lot +-Remote irrigation and environmental monitoring + +## Major countries and regions supported by AU915 + +**Argentina/Australia/Bolivia/Brazil/Canada/Chile/Colombia/Dominican Republic/Ecuador/Greece Guatemala/Honduras/Jamaica/Mexico/New-Zealand/Nicaragua/Panama/Paraguay/Peru/Papua New Guinea/Salvador/United States/Uruguay** + +## Specification + + + + + + + + + + + + + + + + + + + + + + + + + + +
SpecificationsParameters
UART baud rate115200
Net weight35g
Gross weight72g
Product size54.2*54.2*13.2mm
Package size165*60*36mm
+ +## Pin mapping + + + + +
CORERXTX
SW DIP-6 dip switchG17/G0/G13G16/G5/G15
+ +?>**M5Stack FIRE** GPIO 16/17 is connected to PSRAM by default. If the TXD/RXD of this module uses GPIO16, GPIO17 will conflict with it. Therefore, when using **M5Stack FIRE** to drive the module, you need to switch the DIP switch to any one of the remaining two sets of pins. + + + +## Related Links + +-**[COM.LoRaWAN915 AT Command Set](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/module/COM.LoRaWAN915.asr6501-asr6502-at-commands-introduction- v4.3.pdf)** + +-**[LoRaWAN Regional Parameters](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/module/lorawantm_regional_parameters_v1.1rb_-_final.pdf)** + +## Schematic + +-The module plugs into the base + + + +## Example + +-[Arduino code example](https://github.com/m5stack/M5Atom/tree/master/examples/ATOM_BASE/ATOM_Socket) + + diff --git a/docs/en/uiflow/uiflow_home_page.md b/docs/en/uiflow/uiflow_home_page.md index 9fcf7149..aaab71b7 100644 --- a/docs/en/uiflow/uiflow_home_page.md +++ b/docs/en/uiflow/uiflow_home_page.md @@ -112,8 +112,8 @@ const advanced = { 'BLE UART':'#/en/uiflow/advanced?id=ble-uartsupport-m5stack-fire-only', 'Blynk':'#/en/uiflow/advanced?id=blynksupport-m5stack-fire-only', 'Echo STT':'#/en/uiflow/advanced?id=echo-stt', - 'Pin Servo':'#/en/uiflow/advanced?id=echo-pin-servo', - 'NTP':'#/en/uiflow/advanced?id=echo-ntp' + 'Pin Servo':'#/en/uiflow/advanced?id=pin-servo', + 'NTP':'#/en/uiflow/advanced?id=ntp' } }; diff --git a/docs/zh_CN/core/atom_lite.md b/docs/zh_CN/core/atom_lite.md index c0f16e18..84704684 100644 --- a/docs/zh_CN/core/atom_lite.md +++ b/docs/zh_CN/core/atom_lite.md @@ -93,11 +93,11 @@ 主机尺寸 - 24 x 24 x 10 mm + 24*24*10mm 包装尺寸 - 24 x 24 x 10 mm + 43*43*13mm 外壳材质 diff --git a/docs/zh_CN/core/atom_matrix.md b/docs/zh_CN/core/atom_matrix.md index 2f4eab54..3509e80e 100644 --- a/docs/zh_CN/core/atom_matrix.md +++ b/docs/zh_CN/core/atom_matrix.md @@ -100,11 +100,11 @@ 产品尺寸 - 24 x 24 x 14 mm + 24*24*14mm 包装尺寸 - 24 x 24 x 14 mm + 43*43*20mm 外壳材质 diff --git a/docs/zh_CN/core/basic.md b/docs/zh_CN/core/basic.md index 0b663385..ba90de43 100644 --- a/docs/zh_CN/core/basic.md +++ b/docs/zh_CN/core/basic.md @@ -284,6 +284,10 @@ TF 卡最大支持 16GB 0.55A-0.066A +## M-BUS + +M_BUS + 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) diff --git a/docs/zh_CN/core/core2.md b/docs/zh_CN/core/core2.md index abca380c..987c8439 100644 --- a/docs/zh_CN/core/core2.md +++ b/docs/zh_CN/core/core2.md @@ -24,6 +24,8 @@ M5Stack Core2支持的开发平台和程序语言：Arduino，[UIFlow](http://fl * 复位: 单击底侧RST按键 +>M5Core2与M5模块进行堆叠的时候，您需要拆卸Core2的电池底部；如果需要保持底座的I2S麦克风，IMU和电池功能并同时堆叠其他模块，则建议使用[M5GO Bottom2](zh_CN/base/m5go_bottom2)。 + ## 产品特性 - 基于 ESP32 开发，支持WiFi、蓝牙 diff --git a/docs/zh_CN/core/face_kit.md b/docs/zh_CN/core/face_kit.md index adc3ba21..997d06f9 100644 --- a/docs/zh_CN/core/face_kit.md +++ b/docs/zh_CN/core/face_kit.md @@ -254,6 +254,10 @@ +## M-BUS + +M_BUS + 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) ## 相关链接 diff --git a/docs/zh_CN/core/fire.md b/docs/zh_CN/core/fire.md index a9cc386e..fcf40dde 100644 --- a/docs/zh_CN/core/fire.md +++ b/docs/zh_CN/core/fire.md @@ -337,6 +337,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + 在使用GPIO15的RGB LED时，建议初始化引脚pinMode(15, OUTPUT_OPEN_DRAIN); 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) diff --git a/docs/zh_CN/core/gray.md b/docs/zh_CN/core/gray.md index 7600e1ba..19c40a8b 100644 --- a/docs/zh_CN/core/gray.md +++ b/docs/zh_CN/core/gray.md @@ -313,6 +313,10 @@ BMM150 I2C 地址为 0x10 +## M-BUS + +M_BUS + 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) ## 相关链接 diff --git a/docs/zh_CN/core/m5go.md b/docs/zh_CN/core/m5go.md index aaf6f6c4..8df36a10 100644 --- a/docs/zh_CN/core/m5go.md +++ b/docs/zh_CN/core/m5go.md @@ -329,6 +329,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + 在使用GPIO15的RGB LED时，建议初始化引脚pinMode(15, OUTPUT_OPEN_DRAIN); 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) diff --git a/docs/zh_CN/core/m5go_lite.md b/docs/zh_CN/core/m5go_lite.md index 8a66b34a..cba7c8c1 100644 --- a/docs/zh_CN/core/m5go_lite.md +++ b/docs/zh_CN/core/m5go_lite.md @@ -330,6 +330,10 @@ BMM150 I2C address 0x10 +## M-BUS + +M_BUS + 在使用GPIO15的RGB LED时，建议初始化引脚pinMode(15, OUTPUT_OPEN_DRAIN); 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) diff --git a/docs/zh_CN/module/comx_lorawan915.md b/docs/zh_CN/module/comx_lorawan915.md index 3a7ae4e8..91a30c78 100644 --- a/docs/zh_CN/module/comx_lorawan915.md +++ b/docs/zh_CN/module/comx_lorawan915.md @@ -1,14 +1,12 @@ -# COM.LoRaWAN +# COM.LoRaWAN915 SKU:M031-C -
+
## 描述 -**COM.LoRaWAN915** 是M5Stack推出的适用于915MHz频率的LoRaWAN通讯模块, 模块采用Ai-Thinker Ra-07H模组方案 - -使用AT指令进行控制 +**COM.LoRaWAN915** 是M5Stack推出的适用于915MHz频率的LoRaWAN通讯模块。模块采用Ai-Thinker Ra-07H模组方案，支持远距离通信的同时兼具超低功耗与高灵敏度特性。模组集成LoRaWAN协议栈，采用串口通信接口(使用AT指令集进行控制)，使用时可作为采集节点大量接入网关进行数据收集管理。广泛应用于各种物联网场合，如环境监测节点部署等。 ## 产品特性 @@ -18,7 +16,6 @@ - 通信接口: UART - 指令协议：AT命令 - ## 包含 - 1x LoRaWAN915 Module @@ -32,7 +29,7 @@ ## AU915支持的主要国家及地区 -**Argentina/Australia/Bolivia/Brazil/Canada/Chile/Colombia/Dominican Republic/Ecuador/Greece Guatemala/Honduras/Jamaica/Mexico/New-Zealand/Nicaragua/Panama/Paraguay/Peru/Papua New Guinea/Salvador/United States/Uruguay** +**阿根廷/澳大利亚/玻利维亚/巴西/加拿大/智利/哥伦比亚/多米尼加共和国/厄瓜多尔/希腊危地马拉/洪都拉斯/牙买加/墨西哥/新西兰/尼加拉瓜/巴拿马/巴拿马/巴拉圭/秘鲁/巴布亚新几内亚/萨尔瓦多/美国 /乌拉圭** ## 规格参数 @@ -41,13 +38,17 @@ 规格 参数 + + UART波特率 + 115200 + 净重 - 40g + 35g 毛重 - 75g + 72g 产品尺寸 @@ -62,17 +63,17 @@ ## 管脚映射 - - + +
COREG22G23
COM.LoRaWAN915-RXRelay
CORERXTX
SW DIP-6拨码开关G17/G0/G13G16/G5/G15
-## MBUS引脚定义 +?>**M5Stack FIRE** 中的 GPIO 16 / 17 默认与PSRAM连接，若该模块的TXD/RXD使用GPIO16，GPIO17将与其产生冲突。因此，当使用**M5Stack FIRE**去驱动该模块时，你需要将拨码开关拨至剩余两组引脚中的任意一组. - + ## 相关链接 -- **[LoRaWAN 的 AT 指令集](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/module/CubeCell_Series_AT_Command_User_Manual_V0.5.pdf)** +- **[COM.LoRaWAN915 AT指令集](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/module/COM.LoRaWAN915.asr6501-asr6502-at-commands-introduction-v4.3.pdf)** - **[LoRaWAN 区域参数](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/module/lorawantm_regional_parameters_v1.1rb_-_final.pdf)** diff --git a/docs/zh_CN/uiflow/uiflow_home_page.md b/docs/zh_CN/uiflow/uiflow_home_page.md index 2abc5354..4e8163eb 100644 --- a/docs/zh_CN/uiflow/uiflow_home_page.md +++ b/docs/zh_CN/uiflow/uiflow_home_page.md @@ -112,8 +112,8 @@ const advanced = { 'BLE UART':'#/zh_CN/uiflow/advanced?id=ble-uartsupport-m5stack-fire-only', 'Blynk':'#/zh_CN/uiflow/advanced?id=blynksupport-m5stack-fire-only', 'Echo STT':'#/zh_CN/uiflow/advanced?id=echo-stt', - 'Pin Servo':'#/zh_CN/uiflow/advanced?id=echo-pin-servo', - 'NTP':'#/zh_CN/uiflow/advanced?id=echo-ntp' + 'Pin Servo':'#/zh_CN/uiflow/advanced?id=pin-servo', + 'NTP':'#/zh_CN/uiflow/advanced?id=ntp' } };