diff --git a/docs/assets/img/quick_start/m5paper/todo_01.webp b/docs/assets/img/quick_start/m5paper/todo_01.webp new file mode 100644 index 00000000..76161765 Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_01.webp differ diff --git a/docs/assets/img/quick_start/m5paper/todo_02.webp b/docs/assets/img/quick_start/m5paper/todo_02.webp new file mode 100644 index 00000000..f8084397 Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_02.webp differ diff --git a/docs/assets/img/quick_start/m5paper/todo_03.webp b/docs/assets/img/quick_start/m5paper/todo_03.webp new file mode 100644 index 00000000..6040e659 Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_03.webp differ diff --git a/docs/assets/img/quick_start/m5paper/todo_04.webp b/docs/assets/img/quick_start/m5paper/todo_04.webp new file mode 100644 index 00000000..ba982d99 Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_04.webp differ diff --git a/docs/assets/img/quick_start/m5paper/todo_05.webp b/docs/assets/img/quick_start/m5paper/todo_05.webp new file mode 100644 index 00000000..485138b4 Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_05.webp differ diff --git a/docs/assets/img/quick_start/m5paper/todo_06.webp b/docs/assets/img/quick_start/m5paper/todo_06.webp new file mode 100644 index 00000000..c091764e Binary files /dev/null and b/docs/assets/img/quick_start/m5paper/todo_06.webp differ diff --git a/docs/en/accessory/cable/24awg_cable.md b/docs/en/accessory/cable/24awg_cable.md new file mode 100644 index 00000000..2a77a43e --- /dev/null +++ b/docs/en/accessory/cable/24awg_cable.md @@ -0,0 +1,68 @@ +# 24AWG 4-CORE Shielded Cable + +SKU:A088 + +## Description + +**24AWG 4-CORE Shielded Cable** A twisted pair shielded cable of M5Stack, often used for data communication line construction. The aluminum foil and woven layer wrapped inside can effectively reduce signal interference and enhance the stability of communication lines. It is suitable for ordinary serial communication, and standard communication bus construction such as RS485, RS232, CAN, etc. + +## Product Features + +- Electrical characteristics + - Working voltage: 2.5~9V + - Working current: <1800mA + - Loop voltage drop: less than 0.5V + - Contact resistance: 5mΩ + - Contact rated current: 1.8A + - Withstand voltage: AC 250V + - Data transfer rate: minimum 425mb/S + +- Environmental requirements + - Working temperature: -10℃～+50℃ + - Storage temperature: -10～+35℃ + - Working humidity: <55% + - Humidity range: 25%R.H~90%R.H + +- Wire description + - Wire, L: 205mm: + - Conductor: (11/0.16+4C), bare copper + aluminum foil + braid + - Insulation TPE OD=0.90±0.05mm, core wire color: black, white, green, red + - Wire: Outer diameter 5.0 + - Composition of each bare copper wire + - Outer cover: TPE, black, OD: 5.0 + - Wire, plug and mechanical characteristics requirements MAX; contact pull-out force: 50g MIN + +## Specification + + + + + + + + + + + + + + + + + + + + + + +
ResourcesParameter
0.2m4.66g
0.5m11.89g
1m24.44g
5m114.55g
+ + + \ No newline at end of file diff --git a/docs/en/api/m5paper/epd_canvas.md b/docs/en/api/m5paper/epd_canvas.md index 15f5b0a7..a1d3970d 100644 --- a/docs/en/api/m5paper/epd_canvas.md +++ b/docs/en/api/m5paper/epd_canvas.md @@ -180,49 +180,68 @@ typedef enum // Typical ## JPG/BMP/PNG - **Function: Drawing images with Bmp file data** -- `bool drawBmpFile(fs::FS &fs, const char *path, uint16_t x, uint16_t y); -- `bool drawBmpFile(fs::FS &fs, String path, uint16_t x, uint16_t y);` + +``` +bool drawBmpFile(fs::FS &fs, const char *path, uint16_t x, uint16_t y); +bool drawBmpFile(fs::FS &fs, String path, uint16_t x, uint16_t y); +``` - **Function: Draw images using Jpg file data**. -- `bool drawJpgFile(fs::FS &fs, const char *path, uint16_t x = 0, + +``` +bool drawJpgFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` - -- `bool drawJpgFile(fs::FS &fs, String path, uint16_t x = 0, + jpeg_div_t scale = JPEG_DIV_NONE); + +bool drawJpgFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` + jpeg_div_t scale = JPEG_DIV_NONE); +``` - **Function: Draw images using Png file data**. -- `bool drawPngFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, + + +``` +bool drawPngFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` - -- `bool drawPngFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, + double scale = 1.0, uint8_t alphaThreshold = 127); + +bool drawPngFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` + double scale = 1.0, uint8_t alphaThreshold = 127); +``` - **Function: Draw images using memory Jpg data**. -- `bool drawJpg(const uint8_t *jpg_data, size_t jpg_len, uint16_t x = 0, + +``` +bool drawJpg(const uint8_t *jpg_data, size_t jpg_len, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` + jpeg_div_t scale = JPEG_DIV_NONE); +``` - **Function: Draw images using Jpg's Url/Network resource data**. -- `bool drawJpgUrl(String url, uint16_t x = 0, + +``` +bool drawJpgUrl(String url, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, - uint16_t offX = 0, uint16_t offY = 0, jpeg_div_t scale = JPEG_DIV_NONE);` + uint16_t offX = 0, uint16_t offY = 0, jpeg_div_t scale = JPEG_DIV_NONE); +``` - **Functions: Draw images using Png's Url/Network resource data**. -- `bool drawPngUrl(const char *url, uint16_t x = 0, uint16_t y = 0, + +``` +bool drawPngUrl(const char *url, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` + double scale = 1.0, uint8_t alphaThreshold = 127); +``` **Example：** diff --git a/docs/en/atom/atomhub_switch.md b/docs/en/atom/atomhub_switch.md index 1a9cda89..a0d271ad 100644 --- a/docs/en/atom/atomhub_switch.md +++ b/docs/en/atom/atomhub_switch.md @@ -23,11 +23,12 @@ - 1x ATOM SWITCH - 1x ATOM Lite - 4x Magnet -- 1x Magnet double-side tape +- 1x double-side tape - 1x DIN Rail - 1x 3.96*4P plug - 3x 3.96*3P plug - 1x M4 Hex Key +- 1x M2 Hex Key - 2x M4*10mm Hexagon countersunk screw - 1x M2*20mm Hexagon socket cup head machine screw @@ -56,7 +57,7 @@ Interface - 1x HY2.0(PORT A)， 1x VH3.96 4P(RS485), 2x VH3.96 3P(Relay), 1x VH3.96 3P(AC/DC IN) + 1x HY2.0(PORT A)， 1x HT3.96R 4P(RS485), 2x HT3.96R 3P(Relay), 1x HT3.96R 3P(AC/DC IN) Net weight diff --git a/docs/en/atom/atomhub_switch_d.md b/docs/en/atom/atomhub_switch_d.md new file mode 100644 index 00000000..42d5f94e --- /dev/null +++ b/docs/en/atom/atomhub_switch_d.md @@ -0,0 +1,140 @@ +# ATOM HUB SWITCH D + +SKU:K042-D + +
+ +## Description + +**ATOM SWITCH** is a bi-directional control programable switch for the M5ATOM. It can be connected to bi-directional AC circuits for simultaneous on-off control. The on-board relay can support up to 250V / 10A AC(Instantaneous current 16A). Built in step-down module can provide 5V / 1A DC power supply for ATOM. In order to ensure safe use, its DC circuit has overheating and short circuit protection functions. In order to facilitate the use of users in industrial scenarios, an SP485EE level-conversion IC is built in. There are also a set of RS485 interfaces provided for the user to connect RS485 equipment.RS485 has the ability to supply power to ATOM, the support voltage is 9-24V. In addition, a set of HY2.0 interfaces is also provided for connecting I2C peripheral equipment or general I/O equipment. With the Bluetooth and WiFi functions of M5ATOM, you can easily setup a remote control switch. If you have multiple M5ATOM HUB SWITCH modules, you can set them up in parallel through the RS485 interface. + +## Product Features + +- Compatible ATOM Matrix/ATOM Lite +- Built-in AC-DC circuit +- 2-way relay +- Built-in RS485 level-conversion, supporting Modbus +- HY2.0-4P port extend +- Short circuit protection +- Remote control via Bluetooth, WiFi and RS485 + +## Include + +- 1x ATOM SWITCH +- 1x ATOM Lite +- 4x Magnet +- 1x double-side tape +- 1x DIN Rail +- 1x 3.96*4P plug +- 3x 3.96*3P plug +- 1x M4 Hex Key +- 1x M2 Hex Key +- 2x M4*10mm Hexagon countersunk screw +- 1x M2*20mm Hexagon socket cup head machine screw + +## Applications + +- Intelligent switch + +## Specification + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SpecificationParameter
RelayAC 250V/10A(Instantaneous current 16A), DC 5V/1A
Switch power supply(AC-DC)AC 250V-DC 5V
RS485 supply voltage9V-24V
Interface1x HY2.0(PORT A)， 1x HT3.96R 4P(RS485), 2x HT3.96R 3P(Relay), 1x HT3.96R 3P(AC/DC IN)
Net weight134g
Gross weight158g
Product Size72*40*30mm
Package Size104*77*35mm
Case materialPlastic ( PC )
+ +## EasyLoader + +>EasyLoader is a concise and fast program writer, which has a built-in case program related to the product. It can be burned to the main control by simple steps to perform a series of function verification. Please install the corresponding driver according to the device type. M5Core host [Please click here to view the CP210X driver installation tutorial](en/arduino/arduino_development), M5StickC/V/T/ATOM series can be used without driver) + +
+
+
+
+ Windows + MacOS +
+
+
+ +
+ + +

Description:

+

Press the key to control the switch. The status of breathing light indicates the relay serial number and switch status. When the red light or green light is on, press the key to switch the status

+
+
+
+ +## Related Link + +- **Datasheet** + - [SP485EE](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/hat/SP485EEN_en.pdf) + +### Pin Map + + + + +
ATOM221933232521
ATOM HUB SWITCHRelay1Relay2RXTXSDASCL
+ +## Schematic + + + +## Example + +- Arduino Example [Click Here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/AtomBase/AtomHubSwitch/AtomHubSwitch) + +- UIFlow Example [Click Here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/AtomBase/AtomHubSwitch/UIFlow) + + + + \ No newline at end of file diff --git a/docs/en/core/coreink.md b/docs/en/core/coreink.md index e7d98bf0..5c1191b0 100644 --- a/docs/en/core/coreink.md +++ b/docs/en/core/coreink.md @@ -261,7 +261,7 @@ For more info on specific pin functions refer to the official ESP32 Docs[ESP32 d var purchase_link = 'https://m5stack.com/products/m5stack-esp32-core-ink-development-kit1-54-elnk-display'; - var quickstart_link = '#/en/quick_start/coreink/quick_start_arduino'; + var quickstart_link = '#/en/quick_start/coreink/quick_start_list'; anchor_search(purchase_link,quickstart_link); scrollFunc(); diff --git a/docs/en/core/m5paper.md b/docs/en/core/m5paper.md index 5f0cd74b..53a24abe 100644 --- a/docs/en/core/m5paper.md +++ b/docs/en/core/m5paper.md @@ -9,6 +9,7 @@ Choose the development platform you want to use, view the corresponding tutorial&quick-Start. Arduino +ToDo List ## Description diff --git a/docs/en/quick_start/coreink/quick_start_list.md b/docs/en/quick_start/coreink/quick_start_list.md new file mode 100644 index 00000000..14b19c64 --- /dev/null +++ b/docs/en/quick_start/coreink/quick_start_list.md @@ -0,0 +1,19 @@ +
+
+ +
+
+ + +

UIFlow

+
+ +
+
+ + +

Arduino

+
+ +
+
diff --git a/docs/en/quick_start/m5paper/quick_start_todo.md b/docs/en/quick_start/m5paper/quick_start_todo.md index e69de29b..48bed758 100644 --- a/docs/en/quick_start/m5paper/quick_start_todo.md +++ b/docs/en/quick_start/m5paper/quick_start_todo.md @@ -0,0 +1,111 @@ +# M5Paper ToDo Guide + +?>This tutorial is for M5Paper + +## USB Driver + +>Before the program is burned, CoreInk users, please click the button below to download the corresponding CP210X driver compressed package according to your operating system. After decompressing the compressed package, select the installation package corresponding to the number of operating systems to install. + +__Download CP210X USB Driver__ + +
+

+ + + Windows10 + +

+ +

+ + + MacOS + +

+ +

+ + + Linux + +

+
+ +> + + +## Burning tool + +>Please click the button below to download the corresponding M5Burner firmware burning tool according to the operating system you are using. Unzip and open the application. + +
+

+ + + Windows10 + +

+ +

+ + + MacOS + +

+ +

+ + + Linux + +

+
+ + + +?>Note: After installation for MacOS users, please put the application into the Application folder, as shown in the figure below. + +> + +?>Note: For Linux users, please switch to the decompressed file path and run `./M5Burner` in the terminal to run the application. + + +## Firmware burning + +>1. Double-click to open the Burner burning tool, ①Select the corresponding device type `M5Paper` in the left menu, select the `TODO` firmware, and click the download button to download. + + + +>2. Then connect the M5 device to the computer through the Type-C data cable, select the corresponding COM port, the baud rate can use the default configuration in M5Burner, and click "Burn" to start burning. When the burning log prompts `Burn Successfully`, it means that the firmware has been burned. + + + +>3. After the burning is completed, the device will automatically restart. The first time it starts, the introduction page will be displayed, which contains the precautions. Click on the screen to enter the next language configuration. Both languages other than English need to load font files from the TF card (the font file name must be `Font.ttf`). [Example ttf file download address](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/example/Font.ttf). Time zone configuration. Click `Exit` in the upper left corner to enter the next page. . + + + +>4. Select the WiFi network to be connected and enter the password to connect. After the connection is successful, the device code will be automatically generated. + + + +>5. Visit [mircrosoft.com/devicelogin](mircrosoft.com/devicelogin), fill in the device code and bind the personal Microsoft account, and wait for the binding to complete. + + + + +>6. After the binding is successful, you can add tasks through the official todo application of Microsoft, and synchronize them to M5Paper. (After M5Paper enters the list, press the center button of the trackwheel to refresh the list.)[Download Microsoft ToDo App](https://to-do.microsoft.com/tasks/) + + + +## Code + +- **Arduino** + - [M5EPD_Todo](https://github.com/m5stack/M5EPD_Todo) + - [M5EPD-Lib](https://github.com/m5stack/M5EPD) + + \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 32095a6e..7c046c0a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,7 +9,7 @@ {a:"/#/en/core/fire", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_fire_01.webp", p:"FIRE", sku:"K007", qs:"#en/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO MICPHONE"}, {a:"/#/en/core/m5go_lite", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/kit_m5go_lite_01.webp", p:"M5GO Lite", sku:"K022", qs:"#en/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO"}, {a:"/#/en/core/m5go", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/kit_m5go_01.webp", p:"M5GO Kit", sku:"K006", qs:"#en/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO MICPHONE"}, - {a:"/#/en/core/coreink", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/coreink_01.webp", p:"CoreInk", sku:"K048", qs:"#en/quick_start/coreink/quick_start_arduino" ,kw:"ESP32 E-Ink"}, + {a:"/#/en/core/coreink", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/coreink_01.webp", p:"CoreInk", sku:"K048", qs:"#en/quick_start/coreink/quick_start_list" ,kw:"ESP32 E-Ink"}, {a:"/#/en/core/m5paper", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/m5paper_01.webp", p:"M5paper", sku:"K049", qs:"#en/quick_start/m5paper/quick_start_arduino" ,kw:"ESP32 E-Ink SHT30"} ]; const face_list = [ diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index bc1ff6ff..05f876ed 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -9,7 +9,7 @@ {a:"/#/zh_CN/core/fire", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_fire_01.webp", p:"FIRE", sku:"K007", qs:"#zh_CN/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO MICPHONE"}, {a:"/#/zh_CN/core/m5go_lite", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/kit_m5go_lite_01.webp", p:"M5GO Lite", sku:"K022", qs:"#zh_CN/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO"}, {a:"/#/zh_CN/core/m5go", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/kit_m5go_01.webp", p:"M5GO Kit", sku:"K006", qs:"#zh_CN/quick_start/m5core/m5stack_core_quick_start" ,kw:"ESP32 IP5306 MPU6886 BMM150 LEGO MICPHONE"}, - {a:"/#/zh_CN/core/coreink", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/coreink_01.webp", p:"CoreInk", sku:"K048", qs:"#zh_CN/quick_start/coreink/quick_start_arduino" ,kw:"ESP32 E-Ink"}, + {a:"/#/zh_CN/core/coreink", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/coreink_01.webp", p:"CoreInk", sku:"K048", qs:"#zh_CN/quick_start/coreink/quick_start_list" ,kw:"ESP32 E-Ink"}, {a:"/#/zh_CN/core/m5paper", img:"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/m5paper_01.webp", p:"M5paper", sku:"K049", qs:"#zh_CN/quick_start/m5paper/quick_start_arduino" ,kw:"ESP32 E-Ink SHT30"}, ]; const face_list = [ diff --git a/docs/zh_CN/accessory/cable/24awg_cable.md b/docs/zh_CN/accessory/cable/24awg_cable.md index 1d5f9bad..464e7681 100644 --- a/docs/zh_CN/accessory/cable/24awg_cable.md +++ b/docs/zh_CN/accessory/cable/24awg_cable.md @@ -1,10 +1,10 @@ # 24AWG 4-CORE Shielded Cable -SKU:A034 +SKU:A088 ## 描述 -**24AWG 4-CORE Shielded Cable**M5Stack的一款对绞线屏蔽线缆，常用于数据通信线路搭建。内部包裹的铝箔与编织层能够有效减少信号干扰，增强通信线路的稳定性。适用于普通串行通信，以及RS485，RS232, CAN等标准的通信总线搭建。 +**24AWG 4-CORE Shielded Cable**是一款对绞线屏蔽线缆，常用于数据通信线路搭建。内部包裹的铝箔与编织层能够有效减少信号干扰，增强通信线路的稳定性。适用于普通串行通信，以及RS485，RS232, CAN等标准的通信总线搭建。 ## 产品特性 @@ -40,8 +40,20 @@ 参数 - / - / + 0.2m + 4.66g + + + 0.5m + 11.89g + + + 1m + 24.44g + + + 5m + 114.55g diff --git a/docs/zh_CN/api/m5paper/epd_canvas.md b/docs/zh_CN/api/m5paper/epd_canvas.md index af5ec2cf..7dc535df 100644 --- a/docs/zh_CN/api/m5paper/epd_canvas.md +++ b/docs/zh_CN/api/m5paper/epd_canvas.md @@ -181,50 +181,67 @@ typedef enum // Typical ## JPG/BMP/PNG - **功能：使用Bmp文件数据绘制图像** -- `bool drawBmpFile(fs::FS &fs, const char *path, uint16_t x, uint16_t y); -- `bool drawBmpFile(fs::FS &fs, String path, uint16_t x, uint16_t y);` + +``` +bool drawBmpFile(fs::FS &fs, const char *path, uint16_t x, uint16_t y); +bool drawBmpFile(fs::FS &fs, String path, uint16_t x, uint16_t y); +``` - **功能：使用Jpg文件数据绘制图像** -- `bool drawJpgFile(fs::FS &fs, const char *path, uint16_t x = 0, + +``` +bool drawJpgFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` - -- `bool drawJpgFile(fs::FS &fs, String path, uint16_t x = 0, + jpeg_div_t scale = JPEG_DIV_NONE); + +bool drawJpgFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` + jpeg_div_t scale = JPEG_DIV_NONE); +``` - **功能：使用Png文件数据绘制图像** -- `bool drawPngFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, + +``` +bool drawPngFile(fs::FS &fs, const char *path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` - -- `bool drawPngFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, + double scale = 1.0, uint8_t alphaThreshold = 127); + +bool drawPngFile(fs::FS &fs, String path, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` + double scale = 1.0, uint8_t alphaThreshold = 127); +``` - **功能：使用内存Jpg数据绘制图像** -- `bool drawJpg(const uint8_t *jpg_data, size_t jpg_len, uint16_t x = 0, + +``` +bool drawJpg(const uint8_t *jpg_data, size_t jpg_len, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - jpeg_div_t scale = JPEG_DIV_NONE);` + jpeg_div_t scale = JPEG_DIV_NONE); +``` - **功能：使用Jpg的Url/网络资源数据绘制图像** -- `bool drawJpgUrl(String url, uint16_t x = 0, + +``` +bool drawJpgUrl(String url, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, - uint16_t offX = 0, uint16_t offY = 0, jpeg_div_t scale = JPEG_DIV_NONE);` + uint16_t offX = 0, uint16_t offY = 0, jpeg_div_t scale = JPEG_DIV_NONE); +``` - **功能：使用Png的Url/网络资源数据绘制图像** -- `bool drawPngUrl(const char *url, uint16_t x = 0, uint16_t y = 0, + +``` +bool drawPngUrl(const char *url, uint16_t x = 0, uint16_t y = 0, uint16_t maxWidth = 0, uint16_t maxHeight = 0, uint16_t offX = 0, uint16_t offY = 0, - double scale = 1.0, uint8_t alphaThreshold = 127);` - + double scale = 1.0, uint8_t alphaThreshold = 127); +``` **例程：** diff --git a/docs/zh_CN/app/lidarbot.md b/docs/zh_CN/app/lidarbot.md index 295b2995..5602c418 100644 --- a/docs/zh_CN/app/lidarbot.md +++ b/docs/zh_CN/app/lidarbot.md @@ -126,7 +126,7 @@ **例程目录** -├─LidarBot_CarMain_V1.1 - LidarBot主控程序 +├─LidarBot_CarMain_V1.1 - LidarBot主控程序 ├─LidarBot_RemoteController_V1.0 - 控制器程序 V1.0 diff --git a/docs/zh_CN/atom/atomhub_switch.md b/docs/zh_CN/atom/atomhub_switch.md index f3715aaf..0b03ddb3 100644 --- a/docs/zh_CN/atom/atomhub_switch.md +++ b/docs/zh_CN/atom/atomhub_switch.md @@ -28,6 +28,7 @@ - 1x 3.96*4P 公头 - 3x 3.96*3P 公头 - 1x M4内六角扳手 +- 1x M2内六角扳手 - 2x M4*10mm 内六角沉头螺丝 - 1x M2*20mm 内六角杯头机械牙螺丝 @@ -56,7 +57,7 @@ 接口 - 1x HY2.0(PORT A)， 1x VH3.96 4P(RS485), 2x VH3.96 3P(Relay), 1x VH3.96 3P(AC/DC IN) + 1x HY2.0(PORT A)， 1x HT3.96R 4P(RS485), 2x HT3.96R 3P(Relay), 1x HT3.96R 3P(AC/DC IN) 净重 diff --git a/docs/zh_CN/atom/atomhub_switch_d.md b/docs/zh_CN/atom/atomhub_switch_d.md index f3715aaf..f4f32519 100644 --- a/docs/zh_CN/atom/atomhub_switch_d.md +++ b/docs/zh_CN/atom/atomhub_switch_d.md @@ -1,12 +1,14 @@ -# ATOM HUB SWITCH +# ATOM HUB SWITCH D -SKU:K042 +SKU:K042-D
## 描述 -**ATOM HUB SWITCH** 是一款支持ATOM的双路控制可编程开关，可同时接入两路交流/直流电路进行通断控制。内置降压模块可为ATOM提供5V/1A的直流电源，板载继电器最高支持250V/10A市电（16A瞬时电流），为了保障使用安全，其直流电路具备过热与短路保护功能，当电流过大或发生短路时能有效断开电路。为了方便用户在工业场景中使用，我们内置了一颗SP485EE电平转换芯片，提供一组RS485接口供用户连接RS485设备，RS485具备为ATOM供电的能力，支持电压为9-24V。此外还提供了一组HY2.0接口用于连接I2C外设或通用I/O设备。借助于ATOM的蓝牙与WIFI功能，您可以轻松实现远程遥控开关设备，如果您有多个ATOM HUB SWITCH，可以通过RS485接口进行并联。 +**ATOM HUB SWITCH D** 是一款专为ATOM主控适配的双路继电器电源控制开关，其中D表示着Directly(直接), 在设计上Switch D采用了电源输入直连继电器的方案。交流/直流电源直接流向两路继电器的NO(常开)触点，由ATOM进行通断控制。使用时，用户只需要将用电负载接入继电器既可，无需另外连接电源线路。与以往的继电器控制方案相比，这一款模块在控制用电负载上，会更加的简洁高效。 + +输入电源除了用于继电器负载供电，同时还将经过内置降压模块可为ATOM提供5V/1A的直流电源，为了保障使用安全，该电源输入电路具备过热与短路保护功能，当电流过大或发生短路时能有效断开电路，防止元器件损坏。内置SP485EE电平转换芯片，提供RS485通信接口支持多设备挂载通信，集成9-24V降压5V电路适应工业场景上的取电需求，拓展供电能力。引出了一组HY2.0-4P接口用于连接I2C外设或通用I/O设备。结合ATOM自带蓝牙与WIFI功能，ATOM HUB SWITCH D可以快速搭建远程设备开关应用。 ## 产品特性 @@ -14,20 +16,21 @@ - 内置AC-DC电路供电 - 2路继电器 - 内置RS485电平转换，支持Modbus -- HY2.0扩展 +- HY2.0-4P扩展接口 - 短路过热保护 -- 可通过蓝牙、WIFI、RS485进行遥控 +- 可通过蓝牙、WIFI、RS485进行控制 ## 包含 -- 1x ATOM HUB SWITCH +- 1x ATOM HUB SWITCH D - 1x ATOM Lite - 4x 强力磁铁 - 1x 双面胶 - 1x 轨道夹具 - 1x 3.96*4P 公头 -- 3x 3.96*3P 公头 +- 3x 3.96*2P 公头 - 1x M4内六角扳手 +- 1x M2内六角扳手 - 2x M4*10mm 内六角沉头螺丝 - 1x M2*20mm 内六角杯头机械牙螺丝 @@ -35,6 +38,32 @@ - 智能开关 +## Switch & Switch-D + + + + + + + + + + + + + + + + + + + + + + +
/SwitchSwitch-D
继电器电流AC 250V/10AAC 250V/5A
电源输入接口HT3.96R 2PHT3.96R 3P
继电器接口(NO,NC,COM) x2(NO(直连AC电源), COM) x2
+ + ## 规格参数 @@ -44,11 +73,11 @@ - + - + @@ -56,7 +85,7 @@ - + @@ -114,7 +143,7 @@
继电器参数AC 250V/10A(瞬时16A)AC 250V/5A
Switch电源(AC-DC)AC 250V-DC 5VAC 110~250V -> DC 5V
RS485供电电压
接口1x HY2.0(PORT A)， 1x VH3.96 4P(RS485), 2x VH3.96 3P(Relay), 1x VH3.96 3P(AC/DC IN)1x HY2.0(PORT A), 1x HT3.96R 4P(RS485), 2x HT3.96R 2P(Relay), 1x HT3.96R 2P(AC/DC IN)
净重
- +
ATOM221933232521
ATOM HUB SWITCHRelay1Relay2RXTXSDASCL
ATOM HUB SWITCH DRelay1Relay2RXTXSDASCL
## 原理图 diff --git a/docs/zh_CN/core/coreink.md b/docs/zh_CN/core/coreink.md index dacf05e6..8ae541ce 100644 --- a/docs/zh_CN/core/coreink.md +++ b/docs/zh_CN/core/coreink.md @@ -258,7 +258,7 @@ var purchase_link = 'https://m5stack.com/products/m5stack-esp32-core-ink-development-kit1-54-elnk-display'; - var quickstart_link = '#/zh_CN/quick_start/coreink/quick_start_arduino'; + var quickstart_link = '#/zh_CN/quick_start/coreink/quick_start_list'; anchor_search(purchase_link,quickstart_link); scrollFunc(); diff --git a/docs/zh_CN/core/m5paper.md b/docs/zh_CN/core/m5paper.md index 8500208d..0d222125 100644 --- a/docs/zh_CN/core/m5paper.md +++ b/docs/zh_CN/core/m5paper.md @@ -9,6 +9,7 @@ 选择你想使用的开发平台，查看对应的教程&快速上手。 Arduino +ToDo List ## 描述 diff --git a/docs/zh_CN/quick_start/coreink/quick_start_list.md b/docs/zh_CN/quick_start/coreink/quick_start_list.md new file mode 100644 index 00000000..b248b7e0 --- /dev/null +++ b/docs/zh_CN/quick_start/coreink/quick_start_list.md @@ -0,0 +1,19 @@ +
+
+ +
+
+ + +

UIFlow

+
+ +
+
+ + +

Arduino

+
+ +
+
diff --git a/docs/zh_CN/quick_start/m5paper/quick_start_todo.md b/docs/zh_CN/quick_start/m5paper/quick_start_todo.md index 78503b1b..0f5428da 100644 --- a/docs/zh_CN/quick_start/m5paper/quick_start_todo.md +++ b/docs/zh_CN/quick_start/m5paper/quick_start_todo.md @@ -73,15 +73,38 @@ __下载CP210X驱动程序__ >1.双击打开Burner烧录工具，①在左侧菜单中选择对应的设备类型`M5Paper`，选择`TODO`固件，点击下载按钮进行下载。 - + ->2.然后将M5设备通过Type-C数据线连接到电脑，选择对应的COM口，波特率可使用M5Burner中的默认配置，点击"Burn"开始烧录。 +>2.然后将M5设备通过Type-C数据线连接到电脑，选择对应的COM口，波特率可使用M5Burner中的默认配置，点击"Burn"开始烧录。当烧录日志提示`Burn Successfully`时，则表示固件已经烧录完成。 - + ->3.当烧录日志提示`Burn Successfully`时，则表示固件已经烧录完成。 +>3.烧录完成后，设备将自动重启。首次启动，将会显示介绍页面，其中包含的注意事项。 点击屏幕进入下一步语言配置, 除了英文以外的两种语言均需要从TF卡加载字体文件(字体文件命名必须为`Font.ttf`)。 [示例ttf文件下载地址](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/example/Font.ttf). 时区配置。点击左上角`Exit`进入下一页。。 - + +>4.选择将要连接的WiFi网络，输入密码进行连接。连接成功后，将会自动生成设备码。 + +>5.访问[mircrosoft.com/devicelogin](mircrosoft.com/devicelogin)，填入设备码并绑定个人microsoft账号，等待绑定完成。 + + + + +>6.绑定成功后，就可以通过microsoft官方todo应用添加任务，并同步到M5Paper上显示了。(M5Paper进入列表后，按下拨轮中心按钮，可刷新列表。) [下载Microsoft ToDo App](https://to-do.microsoft.com/tasks/) + + + +## Code + +- **Arduino** + - [M5EPD_Todo](https://github.com/m5stack/M5EPD_Todo) + - [M5EPD-Lib](https://github.com/m5stack/M5EPD) + + \ No newline at end of file