diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index a7ef788f..73e1d972 100755 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -953,12 +953,21 @@ mark { } + +.anchor-box img { + + width: 30px; + height: 31px; + margin-left: 10px; + margin-top: 2px; +} + .anchor-box > a { display: -webkit-flex; display: flex; flex-direction: row; - height: 33px; - width: 160px; + height: 40px; + width: 180px; padding: 2px 10px; text-decoration: none; outline: none; @@ -969,37 +978,38 @@ mark { line-height: 1.2; transition: all .3s ease; background-color: #333; - box-shadow: 0 10px 30px 0 rgba(51,51,51,.5); - -moz-box-shadow: 0 10px 30px 0 rgba(51,51,51,.5); - -webkit-box-shadow: 0 10px 30px 0 rgba(51,51,51,.5); + box-shadow: 4px 4px 8px 0px #837878; + -moz-box-shadow: 4px 4px 8px 0px #837878; + -webkit-box-shadow: 4px 4px 8px 0px #837878; margin-top: 12px; } .anchor-box > a:hover { - background-color: #ff4b5a !important; - box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; - -moz-box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; - -webkit-box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; + background-color: #007aff !important; + box-shadow: 4px 4px 8px 0px #aeaeae !important; + -moz-box-shadow: 4px 4px 8px 0px #aeaeae !important; + -webkit-box-shadow: 4px 4px 8px 0px #aeaeae !important; } .anchor-box span { width: 100px; text-align: center; + margin-left: 6px; } .anchor-active { - background-color: #ff4b5a !important; - box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; - -moz-box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; - -webkit-box-shadow: 0 10px 30px 0 rgba(255,75,90,.5) !important; + background-color: #007aff !important; + box-shadow: 4px 4px 8px 0px #aeaeae !important; + -moz-box-shadow: 4px 4px 8px 0px #aeaeae !important; + -webkit-box-shadow: 4px 4px 8px 0px #aeaeae !important; } .anchor-quiet { background-color: #333 !important; - box-shadow: 0 10px 30px 0 rgba(51,51,51,.5) !important; - -moz-box-shadow: 0 10px 30px 0 rgba(51,51,51,.5) !important; - -webkit-box-shadow: 0 10px 30px 0 rgba(51,51,51,.5) !important; + box-shadow: 4px 4px 8px 0px #837878 !important; + -moz-box-shadow: 4px 4px 8px 0px #837878 !important; + -webkit-box-shadow: 4px 4px 8px 0px #837878 !important; } diff --git a/docs/assets/img/product_pics/accessory/SG90_servo/servo_p1.jpg b/docs/assets/img/product_pics/accessory/SG90_servo/servo_p1.jpg index 6f3be588..52ac64ef 100644 Binary files a/docs/assets/img/product_pics/accessory/SG90_servo/servo_p1.jpg and b/docs/assets/img/product_pics/accessory/SG90_servo/servo_p1.jpg differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/apikey.png b/docs/assets/img/product_pics/core/minicore/atom/apikey.png new file mode 100644 index 00000000..8a0afa87 Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/apikey.png differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_01.jpg b/docs/assets/img/product_pics/core/minicore/atom/atom_01.jpg new file mode 100644 index 00000000..00ad15a4 Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_01.jpg differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_02.jpg b/docs/assets/img/product_pics/core/minicore/atom/atom_02.jpg new file mode 100644 index 00000000..de631d2f Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_02.jpg differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_03.jpg b/docs/assets/img/product_pics/core/minicore/atom/atom_03.jpg new file mode 100644 index 00000000..2eae19ec Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_03.jpg differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_04.jpg b/docs/assets/img/product_pics/core/minicore/atom/atom_04.jpg new file mode 100644 index 00000000..943852f2 Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_04.jpg differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_lite_example.png b/docs/assets/img/product_pics/core/minicore/atom/atom_lite_example.png new file mode 100644 index 00000000..a0c638f4 Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_lite_example.png differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/atom_matrix_example.png b/docs/assets/img/product_pics/core/minicore/atom/atom_matrix_example.png new file mode 100644 index 00000000..8d75c121 Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/atom_matrix_example.png differ diff --git a/docs/assets/img/product_pics/core/minicore/atom/serialtool.png b/docs/assets/img/product_pics/core/minicore/atom/serialtool.png new file mode 100644 index 00000000..967f84fb Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/atom/serialtool.png differ diff --git a/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_01.jpg b/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_01.jpg index e77631ee..9f2fe59c 100644 Binary files a/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_01.jpg and b/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_01.jpg differ diff --git a/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_03.jpg b/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_03.jpg index 5fa7fca9..85b99bae 100644 Binary files a/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_03.jpg and b/docs/assets/img/product_pics/hat/ncir_hat/hat_ncir_03.jpg differ diff --git a/docs/assets/img/product_pics/tool/usb_downloader_01.png b/docs/assets/img/product_pics/tool/usb_downloader_01.png index f2838afb..f2a824d1 100644 Binary files a/docs/assets/img/product_pics/tool/usb_downloader_01.png and b/docs/assets/img/product_pics/tool/usb_downloader_01.png differ diff --git a/docs/assets/img/product_pics/tool/usb_downloader_02.png b/docs/assets/img/product_pics/tool/usb_downloader_02.png index c297aee6..dae4c3fb 100644 Binary files a/docs/assets/img/product_pics/tool/usb_downloader_02.png and b/docs/assets/img/product_pics/tool/usb_downloader_02.png differ diff --git a/docs/assets/img/product_pics/tool/usb_downloader_03.png b/docs/assets/img/product_pics/tool/usb_downloader_03.png index 6bda4df3..769fbe07 100644 Binary files a/docs/assets/img/product_pics/tool/usb_downloader_03.png and b/docs/assets/img/product_pics/tool/usb_downloader_03.png differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_color.png b/docs/assets/img/product_pics/unit/M5GO_Unit_color.png index 6a00aa42..e4541e8a 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_color.png and b/docs/assets/img/product_pics/unit/M5GO_Unit_color.png differ diff --git a/docs/en/core/atom_lite.md b/docs/en/core/atom_lite.md index 9dd957c6..e5fb6cf2 100644 --- a/docs/en/core/atom_lite.md +++ b/docs/en/core/atom_lite.md @@ -27,7 +27,7 @@ - 2.4G Antenna: Proant 440 - 6* GPIO (Dupont Pins) - GROVE/4P PH2.0 interface -- Program Platform: [Arduino](http://www.arduino.cc) +- Program Platform: [Arduino](http://www.arduino.cc) [UIFlow](http://flow.m5stack.com) - Product Size：24 * 24 * 10mm - Product weight：1g diff --git a/docs/en/core/atom_matrix.md b/docs/en/core/atom_matrix.md index fec9abed..4ae3daea 100644 --- a/docs/en/core/atom_matrix.md +++ b/docs/en/core/atom_matrix.md @@ -31,7 +31,7 @@ - MPU6886 Inertial Sensor - 6* GPIO (Dupont Pins) - GROVE/4Pin PH2.0 interface -- Program Platform:[Arduino](http://www.arduino.cc) +- Program Platform:[Arduino](http://www.arduino.cc) [UIFlow](http://flow.m5stack.com) - Product Size：24 * 24 * 14mm - Product weight：1g diff --git a/docs/en/core/m5stick.md b/docs/en/core/m5stick.md index dc9ba275..be9ba715 100644 --- a/docs/en/core/m5stick.md +++ b/docs/en/core/m5stick.md @@ -83,8 +83,8 @@ M5stick is one of the core devices in M5Stack product series which is built in a **OLED Screen** - - + +
ESP32GPIO14GPIO27GPIO33
OLED CSDCRST
ESP32GPIO14GPIO27GPIO33GPIO18GPIO23
OLED CSDCRSTD0D1
**GROVE Port** diff --git a/docs/en/core/m5stickv.md b/docs/en/core/m5stickv.md index 8b4715ca..d020dd43 100644 --- a/docs/en/core/m5stickv.md +++ b/docs/en/core/m5stickv.md @@ -13,7 +13,6 @@ M5StickV AI Camera features its integration with machine vision capabilities, fe The module comes with the OmniVision OV7740 sensor, using the OmniPixel®3-HS technology, providing a best-in-class low light sensitivity, making it ideal for machine vision. In addition to an OV7740 sensor, M5StickV features more hardware resources such as a speaker with built-in I2S Class-D DAC, IPS screen, 6-axis IMU, 200mAh Li-po battery, and more.

-Note: M5StickV does not support microphone function, the microphone function will be added in the updated WiFi version M5StickV+.         diff --git a/docs/en/quick_start/atom/atom_quick_start.md b/docs/en/quick_start/atom/atom_quick_start.md index a26d0fcd..d9b4520b 100644 --- a/docs/en/quick_start/atom/atom_quick_start.md +++ b/docs/en/quick_start/atom/atom_quick_start.md @@ -2,13 +2,13 @@ ## Menu -**[1. Menu option introduction](#Menu option introduction)** +**[1. Menu option introduction](#Menu-option-introduction)** -**[2. Meaning of light status](#Meaning of light status)** +**[2. Meaning of light status](#Meaning-of-light-status)** -**[3. Menu Usage](#Menu Usage)** +**[3. Menu Usage](#Menu-Usage)** -**[4. UIFlow Example](#UIFlow Example)** +**[4. UIFlow Example](#UIFlow-Example)** ## Menu option introduction @@ -16,17 +16,29 @@ The breathing light changes color every second in this state - YELLOW Light + **Configure WIFI Mode** + + - GREEN Light + **UIFlow Online Program Mode** + + - PURPLE Light + **APP Run Mode** + + - BLUE Light + **USB Mode** + + ## Meaning of light status - Breathing red-light means the WIFI network is connecting @@ -47,6 +59,25 @@ The breathing light changes color every second in this state
2. The device enters the last selected mode by default upon power-on. If you need to change the mode, just press and hold the middle button during power-on (or restart). The menu mode will automatically scroll in the form of lights until the lights change to the desired mode Release the color. For example, you need to reconfigure WIFI. When the device is powered on or restarted, press and hold the middle button until it is released when the yellow-light breathing is displayed, and then enter WIFI configuration mode. + +3. API key can be seen through web configuration page or serial port tool + + +
-### UIFlow示例 \ No newline at end of file +### UIFlow Example + +- AtomMatrix + + + +- [Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) + +
+ +- AtomLite + + + +- [Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite) \ No newline at end of file diff --git a/docs/en/unit/weight.md b/docs/en/unit/weight.md index b2da9bba..70b778c8 100644 --- a/docs/en/unit/weight.md +++ b/docs/en/unit/weight.md @@ -48,6 +48,11 @@ power supply regulator: - 1x WEIGHT Unit - 1x Grove Cable +## Size and Weight + +- Package Size:67mm x 53mm x 12mm +- Package Weight:20g + ## Applications - Micro weight meter diff --git a/docs/index.html b/docs/index.html index 6a17cd37..2c5a6dc9 100755 --- a/docs/index.html +++ b/docs/index.html @@ -38,7 +38,7 @@ if(test.indexOf(/ja/)!=-1){change_title('ja');}} function page_move(divId){var t=$("#"+divId).offset().top;$('html, body').animate({scrollTop:(t-100)},500);} window.onhashchange=page_loading page_loading(); \ No newline at end of file diff --git a/docs/zh_CN/core/atom_lite.md b/docs/zh_CN/core/atom_lite.md index bd9b1933..e88afd0d 100644 --- a/docs/zh_CN/core/atom_lite.md +++ b/docs/zh_CN/core/atom_lite.md @@ -23,7 +23,7 @@ - GPIO *6 杜邦接口 - GROVE/4P PH2.0接口 - 2.4G天线：Proant 440 -- 开发平台: [Arduino](http://www.arduino.cc) +- 开发平台: [Arduino](http://www.arduino.cc) [UIFlow](http://flow.m5stack.com) - 产品尺寸：24 * 24 * 10mm - 产品重量：1g diff --git a/docs/zh_CN/core/atom_matrix.md b/docs/zh_CN/core/atom_matrix.md index 933f2876..8e310aa1 100644 --- a/docs/zh_CN/core/atom_matrix.md +++ b/docs/zh_CN/core/atom_matrix.md @@ -28,7 +28,7 @@ - GPIO *6 杜邦接口 - GROVE/4P PH2.0接口 - 2.4G天线：Proant 440 -- 开发平台: [Arduino](http://www.arduino.cc) +- 开发平台: [Arduino](http://www.arduino.cc) [UIFlow](http://flow.m5stack.com) - 产品尺寸：24 * 24 * 14mm - 产品重量：1g diff --git a/docs/zh_CN/core/m5stick.md b/docs/zh_CN/core/m5stick.md index 14fa2217..4ca98b15 100644 --- a/docs/zh_CN/core/m5stick.md +++ b/docs/zh_CN/core/m5stick.md @@ -85,8 +85,8 @@ M5stick 是 M5Stack 产品系列中的核心设备之一，该产品系列建立 **OLED屏幕** - - + +
ESP32芯片GPIO14GPIO27GPIO33
OLED屏幕CSDCRST
ESP32芯片GPIO14GPIO27GPIO33GPIO18GPIO23
OLED屏幕CSDCRSTD0D1
**GROVE接口** diff --git a/docs/zh_CN/core/m5stickv.md b/docs/zh_CN/core/m5stickv.md index 737a2984..4b52ea98 100644 --- a/docs/zh_CN/core/m5stickv.md +++ b/docs/zh_CN/core/m5stickv.md @@ -16,8 +16,6 @@ M5stickV AI 摄像头具备机器视觉能力，支持多种视觉识别能力

配备OmniVision OV7740图像传感器，采用OmniPixel®3-HS技术，提供相比同类最佳的低光灵敏度，是机器视觉项目的理想选择. -注意: M5StickV当前版本不支持麦克风功能， 该功能将会在WIFI版的M5StickV+中集成. -


        diff --git a/docs/zh_CN/quick_start/atom/atom_quick_start.md b/docs/zh_CN/quick_start/atom/atom_quick_start.md index 72bd3f5f..be7f0357 100644 --- a/docs/zh_CN/quick_start/atom/atom_quick_start.md +++ b/docs/zh_CN/quick_start/atom/atom_quick_start.md @@ -14,17 +14,39 @@ ## 菜单选项介绍 - 黄灯 + **配置WIFI模式** + + + + + - 绿灯 + **UIFlow在线模式** + + + + - 紫灯 + **APP运行模式** + + + + - 蓝灯 + **USB模式** + + + + + ## 灯光状态含义 - 红灯闪烁表示WIFI网络正在连接 @@ -45,10 +67,27 @@
2. 设备通电默认进入最后一次选择的模式，如需改变模式，只需在上电时（或重启时）按住中间按键不要松开，菜单模式以灯光的形式自动滚动，等到灯光变换为所需模式颜色时再松开。例如需要重新配置WIFI，设备上电或重启时按住中间按键不放，直到显示黄色呼吸灯时松开，此时即进入WIFI配置模式。 + +3. 通过Web配置页面和串口工具可以看到APIkey + + +
### UIFlow示例 +- AtomMatrix + + +- [Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) + +
+ +- AtomLite + + + +- [Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite)