diff --git a/docs/assets/img/product_pics/app/app_flir_02.png b/docs/assets/img/product_pics/app/app_flir_02.png index 0f43839b..68cb2a55 100644 Binary files a/docs/assets/img/product_pics/app/app_flir_02.png and b/docs/assets/img/product_pics/app/app_flir_02.png differ diff --git a/docs/assets/img/product_pics/app/app_flir_04.png b/docs/assets/img/product_pics/app/app_flir_04.png new file mode 100644 index 00000000..2280cf5b Binary files /dev/null and b/docs/assets/img/product_pics/app/app_flir_04.png differ diff --git a/docs/assets/img/product_pics/core/basic/basic_04.png b/docs/assets/img/product_pics/core/basic/basic_04.png index 61c703c7..8c44c5a9 100644 Binary files a/docs/assets/img/product_pics/core/basic/basic_04.png and b/docs/assets/img/product_pics/core/basic/basic_04.png differ diff --git a/docs/en/app/flir.md b/docs/en/app/flir.md index f51f80e4..23cadbc5 100644 --- a/docs/en/app/flir.md +++ b/docs/en/app/flir.md @@ -1,4 +1,4 @@ -# FLIR - LWIR MICRO THERMAL CAMERA {docsify-ignore-all} +# Application FLIR {docsify-ignore-all} @@ -10,11 +10,17 @@ ## Description -**FLIR** is a module which integrates lwir micro thermal camera (**Lepton 3.0**) supplied by FLIR company. Real-time access to non-contact temperature measurement data. Easy to use because it integrates a digital thermal image processing unit. Lepton is equipped in M5 standard size 3D printing housing, after stacking M5Core, communicate with the master via SPI. +**FLIR** is a module which integrates lwir micro thermal camera (**Lepton 3.0**) supplied by FLIR company. + + + +Real-time access to non-contact temperature measurement data. Easy to use because it integrates a digital thermal image processing unit. Lepton is equipped in M5 standard size 3D printing housing, after stacking M5Core, communicate with the master via IIC. + +The effective pixels obtained by the Lepton sensor are 160×120, but you can display the image size of different resolutions on the M5Core through the Arduino program. The image sizes for different resolutions are 80x60, 160x120, 240x320. **Note:** If working long hours, Lepton will heat up. But the output image is not affected by the camera temperature. - + ## Feature @@ -26,7 +32,7 @@ ## Parameter -| *Parameter item* | *Parameter value* | +| *Lepton Parameter item* | *Parameter value* | | :-----------: | :------: | | Effective Frame Rate | 8.7Hz | | Input Clock | 25-MHz| @@ -51,10 +57,11 @@ ## Related Link - **[Offical Video](https://www.youtube.com/channel/UCozgFVglWYQXbvTmGyS739w)** - - **[Forum](http://forum.m5stack.com/)** - - **[Lepton Info (FLIR Website)](https://www.flir.com/products/lepton/)** +- **Datasheet** - [Lepton 2.5](https://www.flir.cn/globalassets/imported-assets/document/lepton-2.5-family-datasheet.pdf) - [Lepton 3&3.5](https://www.flir.cn/globalassets/imported-assets/document/lepton-3-3.5-datasheet.pdf) +- **[Lepton Engineering Datasheet](https://www.flir.cn/globalassets/imported-assets/document/flir-lepton-engineering-datasheet.pdf)** +- **[Lepton Software Interface Description](https://www.flir.cn/globalassets/imported-assets/document/flir-lepton-software-interface-description-document.pdf)** ## Example diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index 3d952a73..3a885e50 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -8,16 +8,49 @@ ## Description -**The M5Stack BASIC** is a black development kit based on **ESP32** chip composed of a black M5Core and a Bottom Base board. You can even program The M5Stack BASIC through Blockly, Arduino or MicroPython. The black core is a basic kit and **it does not own any MEMS chip(like MPU9250...)**. +**M5Stack BASIC Kit** is one of the M5Stack development kit series, with friendly price and full-featured resources makes it a good starter kit for you to explore IoT. -This is a [Bottom board](en/base/core_bottom) on the back of M5Core. It's designed for expanding gpio on M-Bus besides I2S Pins(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34)for DIY. Each gpio on M-Bus is expanded as pin and port for convenience and flexibility. +*Ever wanted to explore the fastest way of IoT prototyping, M5Stack development board is the perfect solution. Not like others, M5Stack development board is highly productlized, covered with industrial grade case, and **ESP32-based** development board. **ESP32** is a hybid Wi-Fi & Bluetooth chip contains a dual-core and 4MB of SPI Flash . Together with 30+ M5Stack [stackable modules](https://docs.m5stack.com/#/en/?id=module) , 40+ [extendable units](https://docs.m5stack.com/#/en/?id=unit), and different levels of program language, you can create and verify your IoT product in a very short time. +Supported development platforms and program languages: Arduino, Blockly language with [UIFlow](http://flow.m5stack.com), [Micropython](http://www.micropython.org). Regardless of what level program skill you have, M5Stack would guide you in every step of the way to realize your idea as well as to the final productilization.* - +*If you ever played with ESP8266, you would realize that ESP32 is a perfect upgrade from ESP8266. In comparison, ESP32 is full-feathered with more GPIO, plenty of analog inputs and two analog outputs, multiple extra perpherials( like a spare UART ). Official development platform ESP-IDF have planted with FreeRTOS. With dual-core and real time OS you can get more organized code and much high speed processor.* -## Feature +M5Stack Basic is consist with two separable parts. the upside part has all kinds of processor, chips and some other slot components. The [bottom](https://docs.m5stack.com/#/en/base/core_bottom) part has a lithium battery, [M-BUS](https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_schematic/M-BUS.png) socket and extendable pins on both sides. -- Programming Support: [UIFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/) and [Arduino](http://www.arduino.cc) -- TF Card Support(Up to 16GB) + + +**Notice: +1)Basic kit have no IMU sensor inside +2)GPIO0, GPIO12, GPIO13, GPIO15, GPIO34, pins that related to I2S are not extended out +3)GPIO34-39 are input-only** + +### Product Features + +- 5V DC power supply +- USB Type-C +- ESP32-based +- 4 MByte flash +- Speaker, 3 Buttons, LCD(320*240), 1 Reset +- 2.4G Antenna: Proant 440 +- TF card slot (16G Maximum size) +- Battery Socket & 150 mAh Lipo Battery +- Extendable Pins & Holes +- Grove Port +- M-Bus Socket & Pins +- Development Platform [UIFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/), [Arduino](http://www.arduino.cc) + +### ESP32 Features + +- 240 MHz dual core Tensilica LX6 microcontroller with 600 DMIPS +- Integrated 520 KB SRAM +- Integrated 802.11b/g/n HT40 Wi-Fi transceiver, baseband, stack and LWIP +- Integrated dual mode Bluetooth (classic and BLE) +- Hall sensor +- 10x capactive touch interface +- 32 kHz crystal oscillator +- PWM/timer input/output available on every GPIO pin +- SDIO master/salve 50MHz +- SD-card interface support ## Source PinMap @@ -114,12 +147,12 @@ This is a [Bottom board](en/base/core_bottom) on the back of M5Core. It's design -## Include +### Kit includes -- 1x M5Stack BASIC -- 1x M5Stack BASIC Bottom -- 10x Proto Wire -- Type-C USB Cable +- 1x M5Stack BASIC Controller +- 1x Basic Base +- 8x Dupont +- Type-C USB cable - User Manual basic_04 diff --git a/docs/en/module/gps.md b/docs/en/module/gps.md index 0269e40e..aad98b4b 100644 --- a/docs/en/module/gps.md +++ b/docs/en/module/gps.md @@ -18,6 +18,8 @@ The NEO-M8N which integrates a 72-channel [u-blox](https://www.u-blox.com) M8 GN The GPS internal default is to communicate with M5Core via **UART2 (GPIO16, GPIO17)** ( Change to other baud rate communication via [u-center-just-for-Windows](https://www.u-blox.com/en/product/u-center-windows) ) +*The parameter of UART: Baudrate(**default: 9600bps**), Start bits(1 bit), Stop bits(1 bit), Parity(no)* + If GPIO16, GPIO17 is used for other purposes, you can use a cutter to cut the TXD and RXD that are connected by default on the GPS module and connect them to another port (GPIO3, GPIO13, GPIO1, GPIO5) using solder or 0Ω resistors. *The parameter of UART: baud rate (default is 9600bps), data bit (8 bits), start bit (1 bit), stop bit (1 bit), Parity (none)* diff --git a/docs/en/module/lora.md b/docs/en/module/lora.md index 34e57281..f3159871 100644 --- a/docs/en/module/lora.md +++ b/docs/en/module/lora.md @@ -43,12 +43,12 @@ account the distance, anti-interference and power consumption - **[LoRa Info](http://wiki.ai-thinker.com/lora) (LoRa)** -?> If your board LCD can't display or has some other problem, we suggest you to add the two statements code followed by ``m5.begin();`` as shown below. Because GPIO5 who has connected NSS pin of LoRa module need be pull-up at the moment your board(or system) power on to prevent system's LCD can't display. + ## Example diff --git a/docs/ja/module/lora.md b/docs/ja/module/lora.md index e0fd73cf..243a7bfa 100644 --- a/docs/ja/module/lora.md +++ b/docs/ja/module/lora.md @@ -38,13 +38,14 @@ LoRa™は少ない消費電力で広いエリア(1~2km)をカバーする無線 - **データシート** - [LoRa](http://wiki.ai-thinker.com/lora) -?> **メモ** もしあなたのLCD画面が表示されない場合は、以下のソースのように``m5.begin()``の前にGPIO5をプルアップする２行を追加してみてください。GPIO5がLoRaモジュールのNSSピンに接続されている為、GPIO５をプルアップする必要があります。 + + ## サンプルコード ### Arduino IDE diff --git a/docs/zh_CN/app/flir.md b/docs/zh_CN/app/flir.md index c027de31..3a6eec9f 100644 --- a/docs/zh_CN/app/flir.md +++ b/docs/zh_CN/app/flir.md @@ -1,32 +1,35 @@ -# FLIR - 微型长波红外热像仪 {docsify-ignore-all} +# Application FLIR {docsify-ignore-all} - + * * * :memo:**[描述](#描述)**      :octocat:**[例程](#例程)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.405c425eyfkKSu&id=583291687617)** - - ## 描述 -**FLIR** 是一款集成 FLIR 公司的微型长波红外热像仪 (**Lepton 3.0**) 的模块。能实时获得传感器非接触式温度测量数据。因为集成了数字热图像处理单元，所以使用起来更简单。装配在 M5 标准尺寸的 3D 打印外壳中，堆叠了 M5Core 之后，通过 SPI 与主控通信。 +**FLIR** 是一款集成 FLIR 公司的微型长波红外热像仪 (**Lepton 3.0**) 的应用模块。 + + + + +能实时获得传感器非接触式温度测量数据。因为集成了数字热图像处理单元，所以使用起来更简单。装配在 M5 标准尺寸的 3D 打印外壳中，堆叠了 M5Core 之后，通过 IIC 与主控通信。Lepton 传感器获取得到的有效像素是 160×120，可是您可以通过 Arduino 程序配置在 M5Core 上显示不同分辨率的图像大小。不同分辨率的图像大小分别是 80x60, 160x120, 240x320。 **注意：** 工作时间长了热像仪 Lepton 会升温，可是输出图像不受热像仪温度影响。 - + ## 特性 - 160×120 有效像素 -- Lepton 模块运行功率较低 — 典型值为 140 mW、使用快门期间为 650 mW +- Lepton 传感器运行功率较低 — 典型值为 140 mW、使用快门期间为 650 mW - 56° 视觉范围，带快门 -- Lepton 输入电压范围：1.2V，2.8V，2.5V 至 3.1V IO +- Lepton 传感器输入电压范围：1.2V，2.8V，2.5V 至 3.1V IO - 成像时间快 (< 0.5 秒) ## 参数 -| *参数项* | *参数值* | +| *Lepton 参数项* | *参数值* | | :-----------: | :------: | | 有效帧频 | 8.7Hz | | 输入时钟 | 25-MHz| @@ -51,10 +54,11 @@ ## 相关链接 - **[官方频道视频](https://i.youku.com/i/UNjE1ODA2MzE0OA==?spm=a2hzp.8253869.0.0)** - - **[官方论坛](http://forum.m5stack.com/)** - - **[FLIR 官网的 Lepton 信息](https://www.flir.cn/products/lepton/)** +- **数据手册** - [Lepton 2.5](https://www.flir.cn/globalassets/imported-assets/document/lepton-2.5-family-datasheet.pdf) - [Lepton 3&3.5](https://www.flir.cn/globalassets/imported-assets/document/lepton-3-3.5-datasheet.pdf) +- **[Lepton 工程版数据手册](https://www.flir.cn/globalassets/imported-assets/document/flir-lepton-engineering-datasheet.pdf)** +- **[Lepton 传感器的接口文档](https://www.flir.cn/globalassets/imported-assets/document/flir-lepton-software-interface-description-document.pdf)** ## 例程 diff --git a/docs/zh_CN/module/gps.md b/docs/zh_CN/module/gps.md index c8fbc132..006b0834 100644 --- a/docs/zh_CN/module/gps.md +++ b/docs/zh_CN/module/gps.md @@ -21,6 +21,8 @@ NEO-M8N 集成了 72 通道的 [u-blox](https://www.u-blox.com) M8 GNSS 引擎 GPS 内部默认是通过 **UART2(GPIO16, GPIO17)** 与 M5Core 通讯 (可通过 [u-center-just-for-Windows](https://www.u-blox.com/en/product/u-center-windows) 更改为其他波特率通信)。 +*串口参数：波特率 ( 默认为 9600bps ), 起始位 ( 1位 ), 停止位 ( 1位 ), 校验位 ( 无 )* + 如果 GPIO16, GPIO17 用作了其他用途，那么您可以使用切割器切割 GPS 模块上默认连接的 TXD 和 RXD ，并使用焊接或 0Ω 电阻将它们连接到另一个端口 ( GPIO3, GPIO13, GPIO1, GPIO5 )。 *串口参数：波特率 ( 默认为 9600bps ), 数据位 ( 8 位 ), 起始位 ( 1 位 ), 停止位 ( 1 位 ), 校验位 ( 无 )* @@ -29,8 +31,6 @@ GPS 内部默认是通过 **UART2(GPIO16, GPIO17)** 与 M5Core 通讯 (可通过 !> **M5Stack Fire** 默认使用 GPIO16/17 连接到 PSRAM，它与 GPS 模块的 TXD/RXD（GPIO16，GPIO17） 重叠。因此，当使用 M5Stack Fire 中的 GPS 模块时，需要使用切割器切割 GPS 模块上默认连接的 TXD 和 RXD ，并使用焊接或 0Ω 电阻将它们连接到另一个端口。 - - ## 特性 - 工作电压：2.7 ~ 3.6 diff --git a/docs/zh_CN/module/lora.md b/docs/zh_CN/module/lora.md index 5f52bad6..ec9a51f6 100644 --- a/docs/zh_CN/module/lora.md +++ b/docs/zh_CN/module/lora.md @@ -37,13 +37,13 @@ M5Stack LoRa模块适用于长距离通信，结合多个LoRa模块，能组成 - **[LoRa模块信息](http://wiki.ai-thinker.com/lora) (LoRa)** -?> 如果堆叠了LoRa模块之后，上电，可是M5Core不能正常显示或者有其他显示问题时，建议在`m5.begin();`语句之前加入如下语句。因为GPIO5连接到LoRa模块的NSS引脚，该引脚在系统上电的时候需要上拉，从而避免LCD不能显示。 + ## 例程 diff --git a/docs/zh_CN/unit/dac.md b/docs/zh_CN/unit/dac.md index 9f55f462..7f0f0067 100644 --- a/docs/zh_CN/unit/dac.md +++ b/docs/zh_CN/unit/dac.md @@ -6,18 +6,16 @@ :memo:**[描述](#描述)**      :octocat:**[例程](#例程)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.28.312f425eRDFbqp&id=580257615943)** - - ## 描述 **DAC** 是一款集成数字信号转模拟信号芯片的Unit，能够实现输出模拟信号，如电压、声音等，内置的DAC芯片型号是**MCP4725**，并且不带EEPROM。 ## 特性 -- 高达12位的转换精度 -- 0~3.3V幅度的电压输出 - -- Unit内置两个Lego插件孔，方便与Lego件结合 +- 高达12位的转换精度 +- 0~3.3V幅度的电压输出 +- GROVE接口，支持[UIFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- Unit内置两个Lego插件孔，方便与Lego件结合 ## 包含 diff --git a/docs/zh_CN/unit/tof.md b/docs/zh_CN/unit/tof.md index 8170ad34..0d70615a 100644 --- a/docs/zh_CN/unit/tof.md +++ b/docs/zh_CN/unit/tof.md @@ -17,7 +17,7 @@ - 高精度 - 测量距离最大2m - 激光波长: 940nm - +- GROVE接口，支持[UIFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 包含