diff --git a/docs/assets/img/product_pics/atom_base/echo/EchoSTT.webp b/docs/assets/img/product_pics/atom_base/echo/EchoSTT.webp new file mode 100644 index 00000000..b1323509 Binary files /dev/null and b/docs/assets/img/product_pics/atom_base/echo/EchoSTT.webp differ diff --git a/docs/assets/img/product_pics/atom_base/echo/EchoSTT_burner.webp b/docs/assets/img/product_pics/atom_base/echo/EchoSTT_burner.webp new file mode 100644 index 00000000..0290a06d Binary files /dev/null and b/docs/assets/img/product_pics/atom_base/echo/EchoSTT_burner.webp differ diff --git a/docs/assets/img/product_pics/module/module_lorawan_02.webp b/docs/assets/img/product_pics/module/module_lorawan_02.webp index 907dd27f..7514fa9b 100644 Binary files a/docs/assets/img/product_pics/module/module_lorawan_02.webp and b/docs/assets/img/product_pics/module/module_lorawan_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_dac.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_dac.webp index d94bd7ae..789fd861 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_dac.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_dac.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_dac_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_dac_02.webp index 62e8030f..a4c8086f 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_dac_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_dac_02.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_ncir.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_ncir.webp index 1246c560..bec7a8a5 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_ncir.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_ncir.webp differ diff --git a/docs/assets/img/product_pics/unit/M5GO_Unit_ncir_02.webp b/docs/assets/img/product_pics/unit/M5GO_Unit_ncir_02.webp index 0be6e179..971ff105 100644 Binary files a/docs/assets/img/product_pics/unit/M5GO_Unit_ncir_02.webp and b/docs/assets/img/product_pics/unit/M5GO_Unit_ncir_02.webp differ diff --git a/docs/assets/img/product_pics/unit/accel/accel_01.webp b/docs/assets/img/product_pics/unit/accel/accel_01.webp index d457763e..0e4a02eb 100644 Binary files a/docs/assets/img/product_pics/unit/accel/accel_01.webp and b/docs/assets/img/product_pics/unit/accel/accel_01.webp differ diff --git a/docs/assets/img/product_pics/unit/accel/accel_02.webp b/docs/assets/img/product_pics/unit/accel/accel_02.webp index d61f6d04..5a841b9c 100644 Binary files a/docs/assets/img/product_pics/unit/accel/accel_02.webp and b/docs/assets/img/product_pics/unit/accel/accel_02.webp differ diff --git a/docs/assets/img/product_pics/unit/op180/unit_op180_01.webp b/docs/assets/img/product_pics/unit/op180/unit_op180_01.webp index 6cc08679..a6583c01 100644 Binary files a/docs/assets/img/product_pics/unit/op180/unit_op180_01.webp and b/docs/assets/img/product_pics/unit/op180/unit_op180_01.webp differ diff --git a/docs/assets/img/product_pics/unit/op180/unit_op180_02.webp b/docs/assets/img/product_pics/unit/op180/unit_op180_02.webp index 3ca5ceaf..9d3476e0 100644 Binary files a/docs/assets/img/product_pics/unit/op180/unit_op180_02.webp and b/docs/assets/img/product_pics/unit/op180/unit_op180_02.webp differ diff --git a/docs/assets/img/product_pics/unit/op90/unit_op90_01.webp b/docs/assets/img/product_pics/unit/op90/unit_op90_01.webp index c6262f9b..caa52f7e 100644 Binary files a/docs/assets/img/product_pics/unit/op90/unit_op90_01.webp and b/docs/assets/img/product_pics/unit/op90/unit_op90_01.webp differ diff --git a/docs/assets/img/product_pics/unit/op90/unit_op90_02.webp b/docs/assets/img/product_pics/unit/op90/unit_op90_02.webp index 2ea04a3d..9ea54e65 100644 Binary files a/docs/assets/img/product_pics/unit/op90/unit_op90_02.webp and b/docs/assets/img/product_pics/unit/op90/unit_op90_02.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_extio_01.webp b/docs/assets/img/product_pics/unit/unit_extio_01.webp index b003c9a1..200f295a 100644 Binary files a/docs/assets/img/product_pics/unit/unit_extio_01.webp and b/docs/assets/img/product_pics/unit/unit_extio_01.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_extio_02.webp b/docs/assets/img/product_pics/unit/unit_extio_02.webp index ec70934b..b8834877 100644 Binary files a/docs/assets/img/product_pics/unit/unit_extio_02.webp and b/docs/assets/img/product_pics/unit/unit_extio_02.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_finger_01.webp b/docs/assets/img/product_pics/unit/unit_finger_01.webp index 5cf2ed7e..0a10e21b 100644 Binary files a/docs/assets/img/product_pics/unit/unit_finger_01.webp and b/docs/assets/img/product_pics/unit/unit_finger_01.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_finger_02.webp b/docs/assets/img/product_pics/unit/unit_finger_02.webp index 9c904d2b..ad075a56 100644 Binary files a/docs/assets/img/product_pics/unit/unit_finger_02.webp and b/docs/assets/img/product_pics/unit/unit_finger_02.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_weight_01.webp b/docs/assets/img/product_pics/unit/unit_weight_01.webp index c18edbce..acde61d0 100644 Binary files a/docs/assets/img/product_pics/unit/unit_weight_01.webp and b/docs/assets/img/product_pics/unit/unit_weight_01.webp differ diff --git a/docs/assets/img/product_pics/unit/unit_weight_02.webp b/docs/assets/img/product_pics/unit/unit_weight_02.webp index 5c8a36bc..35d02b1f 100644 Binary files a/docs/assets/img/product_pics/unit/unit_weight_02.webp and b/docs/assets/img/product_pics/unit/unit_weight_02.webp differ diff --git a/docs/en/accessory/servo_holder.md b/docs/en/accessory/servo_holder.md index ba8962e8..eb68797b 100644 --- a/docs/en/accessory/servo_holder.md +++ b/docs/en/accessory/servo_holder.md @@ -14,7 +14,7 @@ - Weight： 9g - Size： 23mm x 12.2mm x 29mm - Torque： 1.6kg•cm/4.8V;1.8kg•cm/6.0V -- Speed： 0.1sec/60°/4.8V;0.09sec/60°/6.0V +- Speed： 0.1sec/60°/4.8V;0.09sec/60°/6.0v - Cable length： 3cm - dead zone： 4μm - Spline： 21Teeth diff --git a/docs/en/atom/atomecho.md b/docs/en/atom/atomecho.md index 6c0f6db9..18885de7 100644 --- a/docs/en/atom/atomecho.md +++ b/docs/en/atom/atomecho.md @@ -155,7 +155,7 @@ ## Usage -The factory default firmware is Bluetooth speaker, which uses A2DP protocol to transmit audio data（call reception is not supported). After power on, the red LED will be displayed. When the connection with Bluetooth device is established, the LED will turn green. At this time, the sound can be output through atom echo. The LED turns red when disconnected. The firmware is compiled on the esp-idf platform. If senior users need to develop other functions by themselves, they can build the environment according to the official documents of Lexin. See the following links for the source code of factory firmware and bin file, where the BIN file burning address is 0x0000. (for the esp-idf source code modified by the user, m5stack does not provide technical support.) +The factory default firmware is Bluetooth speaker, which uses A2DP protocol to transmit audio data（call reception is not supported). After power on, the red LED will be displayed. When the connection with Bluetooth device is established, the LED will turn green. At this time, the sound can be output through atom echo. The LED turns red when disconnected. The firmware is compiled on the esp-idf platform. If senior users need to develop other functions by themselves, they can build the environment according to the official documents of Lexin. See the following links for the source code of factory firmware and bin file, where the BIN file burning address is 0x0000. ## Example diff --git a/docs/en/quick_start/atom/atom_echo_quick_start.md b/docs/en/quick_start/atom/atom_echo_quick_start.md index 71f9ae36..6daae8ea 100644 --- a/docs/en/quick_start/atom/atom_echo_quick_start.md +++ b/docs/en/quick_start/atom/atom_echo_quick_start.md @@ -1,6 +1,6 @@ # ATOM ECHO Quick Start {docsify-ignore-all} -## Firmware Flash +## Factory Firmware Flash The factory firmware is configured as a Bluetooth speaker by default. Users can connect devices such as mobile phones, tablets, PCs and so on with ATOM ECHO to output audio to ATOM ECHO for playback.To burn the firmware, download the corresponding easyloader according to the operating system. @@ -16,17 +16,50 @@ The factory firmware is configured as a Bluetooth speaker by default. Users can -## Usage +## Use of factory firmware Turn on the power, and the indicator light is red. Turn on the Bluetooth device and search for nearby devices. The Bluetooth device with the name of M5_SPEAKER_T1 is ATOM ECHO. Click connect or pairing, ATOM ECHO will send Bluetooth pairing request, confirm pairing to establish Bluetooth connection, at this time, the indicator light turns green to indicate that the connection is normal. Once the connection is established successfully, atom echo can be used as an audio playback device. (currently, the firmware does not support answering and calling as a handsfree device) -As**G19/G22/G23/G33**is used as I2S, it can not be reused as other function pins, otherwise it will cause the risk of equipment damage.**G21/G25** is only used as a General I/O pin and cannot be mapped to I2C and UART. To use I2C or UART functions, please connect to the grove port.The firmware is compiled on the esp-idf platform, and ordinary users can directly download easyloader for burning.If senior users need to develop other functions by themselves, they can build according to the official documents of ESPRESSIF[ESP-IDF Software Development Environment](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html),Factory firmware source code and BIN file[Click here to download](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Factory_BT_SPEAKER_Firmware),where BIN file burning address is 0x0000.（For the ESP-IDF source code modified by users, m5stack does not provide technical support） +As**G19/G22/G23/G33**is used as I2S, it can not be reused as other function pins, otherwise it will cause the risk of equipment damage.**G21/G25** is only used as a General I/O pin and cannot be mapped to I2C and UART. To use I2C or UART functions, please connect to the grove port.The firmware is compiled on the esp-idf platform, and ordinary users can directly download easyloader for burning.If senior users need to develop other functions by themselves, they can build according to the official documents of ESPRESSIF[ESP-IDF Software Development Environment](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html),Factory firmware source code and BIN file[Click here to download](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Factory_BT_SPEAKER_Firmware),where BIN file burning address is 0x0000. -## Example +## EchoSTT service - \ No newline at end of file +- Connect the ECHO to the USB port of the computer, select the corresponding COM port, the baud rate is 750000 by default, input your WiFi SSID and password, and click "Erase" to erase the flash. + +- Find the **ATOM** option, select EchoSTT, click download to download the firmware, and select English firmware or Chinese firmware according to the language you want to recognition. + +- Click "Burn" to flash firmware, and wait for the "COM Monitor" to display the burn completion prompt. + +- Click "Get token" to get the token needed to connect to STT server, record the token, which will be used in your subsequent programming. + + + +## UIFlow example for EchoSTT services + +Before running this example, make sure that you have completed the above steps to get the token. + + + +## Arduino example for EchoSTT services + +When using this example, you need to rest.settoken("your_Token"); fill in the acquired token. + +- [EchoSTT services](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/EchoSTT) + +## Arduino Example + +1. This example is used to test whether the LED, microphone and loudspeaker work normally. If you press the key when power is on, the music will play all the time. Otherwise, you will enter the test microphone link. You can check it through the serial monitor. + +- [FactoryTest](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/Factory_Test) + +2. This is an example of recording and playback. When you press and hold the button, the recording starts. The recording time is no more than 6 seconds. When you release the key, the recorded content will be played back. + +- [Recoder&Replay](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/Repeater) + +3. This example can play music through URL. Because the buffer memory is small, continuous noise will appear when the network condition is not good. Please choose the URL and your WiFi network reasonably. + +- [StreamHttpMP3](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/StreamHttpClient_ECHO) \ No newline at end of file diff --git a/docs/zh_CN/atom/atomecho.md b/docs/zh_CN/atom/atomecho.md index 09eabc07..4c373af8 100644 --- a/docs/zh_CN/atom/atomecho.md +++ b/docs/zh_CN/atom/atomecho.md @@ -141,7 +141,7 @@ ## 使用方法 -出厂默认固件为蓝牙音箱，采用A2DP协议传输音频数据（暂不支持接打电话）。通电后显示红色LED，当与蓝牙设备建立连接后LED变为绿色，此时可以将声音通过ATOM ECHO进行输出。断开连接后LED变回红色。该固件在ESP-IDF平台下进行编译，普通用户可直接通过下载EasyLoader进行烧录。高级用户如需自行开发其他功能，可根据乐鑫官方文档进行ESP-IDF环境搭建，出厂固件源码及BIN文件见以下链接,其中BIN文件烧录地址为0x0000。（对于用户自行修改的ESP-IDF源码，M5Stack不做技术支持） +出厂默认固件为蓝牙音箱，采用A2DP协议传输音频数据（暂不支持接打电话）。通电后显示红色LED，当与蓝牙设备建立连接后LED变为绿色，此时可以将声音通过ATOM ECHO进行输出。断开连接后LED变回红色。该固件在ESP-IDF平台下进行编译，普通用户可直接通过下载EasyLoader进行烧录。高级用户如需自行开发其他功能，可根据乐鑫官方文档进行ESP-IDF环境搭建，出厂固件源码及BIN文件见以下链接,其中BIN文件烧录地址为0x0000。 [ECHO_Bluetooth_Speaker](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Factory_BT_SPEAKER_Firmware) @@ -155,6 +155,8 @@ - [流媒体播放](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/StreamHttpClient_ECHO) +- [EchoSTT服务](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/EchoSTT) + ## 相关视频 diff --git a/docs/zh_CN/quick_start/atom/atom_echo_quick_start.md b/docs/zh_CN/quick_start/atom/atom_echo_quick_start.md index 977ace65..ac4ad7e9 100644 --- a/docs/zh_CN/quick_start/atom/atom_echo_quick_start.md +++ b/docs/zh_CN/quick_start/atom/atom_echo_quick_start.md @@ -1,6 +1,6 @@ # ATOM ECHO 快速上手 {docsify-ignore-all} -## 固件烧录 +## 出厂固件烧录 出厂固件默认配置为蓝牙音箱，用户可将手机、平板电脑、PC等设备与ATOM ECHO进行连接，将音频输出至ATOM ECHO播放。 @@ -18,17 +18,50 @@ -## 使用方法 +## 出厂固件使用方法 接通电源，此时指示灯为红色，打开设备蓝牙，搜索附近设备，名称为M5_SPEAKER_T1的蓝牙设备即为ATOM ECHO。点击连接或配对后，ATOM ECHO会发出蓝牙配对请求，确认配对即可建立蓝牙连接，此时指示灯变为绿色表示连接正常。一旦建立连接成功，ATOM ECHO就可以作为音频播放设备来使用。(目前固件暂不支持作为免提设备接打电话) -由于**G19/G22/G23/G33**被用作I2S，不可作为其他功能引脚复用，否则将产生设备损坏的风险。**G21/G25**仅作为通用I/O引脚使用，无法映射为I2C与UART,如需使用I2C或UART功能，请连接至GROVE端口。该固件在ESP-IDF平台下进行编译，普通用户可直接通过下载EasyLoader进行烧录。高级用户如需自行开发其他功能，可根据乐鑫官方文档进行[ESP-IDF环境搭建](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/get-started/index.html#id2)，出厂固件源码及BIN文件[点击此处下载](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Factory_BT_SPEAKER_Firmware),其中BIN文件烧录地址为0x0000。（对于用户自行修改的ESP-IDF源码，M5Stack不做技术支持） +由于**G19/G22/G23/G33**被用作I2S，不可作为其他功能引脚复用，否则将产生设备损坏的风险。**G21/G25**仅作为通用I/O引脚使用，无法映射为I2C与UART,如需使用I2C或UART功能，请连接至GROVE端口。该固件在ESP-IDF平台下进行编译，普通用户可直接通过下载EasyLoader进行烧录。高级用户如需自行开发其他功能，可根据乐鑫官方文档进行[ESP-IDF环境搭建](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/get-started/index.html#id2)，出厂固件源码及BIN文件[点击此处下载](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Factory_BT_SPEAKER_Firmware),其中BIN文件烧录地址为0x0000。 -## 案例程序 +## EchoSTT服务Token获取步骤 - \ No newline at end of file +- 将ECHO连接电脑USB端口，选择对应的COM端口，波特率默认选择750000，填写您的WiFi SSID和密码，点击Erase擦除原有固件 + +- 找到**ATOM**选项，选择EchoSTT点击download下载固件，根据您想识别的语言选择英文固件或中文固件 + +- 点击burn进行烧录，等待串口监视器出现烧录完成提示 + +- 点击Get Token获取连接STT服务器所需要的Token，记录此Token，它将在您的后续编程中会用到 + + + +## EchoSTT服务的UIFlow案例程序 + +在运行此示例前确保您已通过上述步骤完成Token的获取 + + + +## EchoSTT服务的Arduino案例程序 + +使用该案例时您需要在rest.settoken("your_token");中填入获取的Token + +- [EchoSTT服务](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/EchoSTT) + +## Arduino示例程序 + +1. 这个示例用于测试LED、麦克风和扬声器是否正常工作，如果在通电同时按下按键，则扬声器会一直播放音乐，否则只播放一次然后进入测试麦克风环节，您可以通过串口监视器查看。 + +- [FactoryTest](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/Factory_Test) + +2. 这是一个录音与回放的示例，当您按住按键时开始录音，录音时间不多于6秒，松开按键后将播放您录制的内容。 + +- [Recoder&Replay](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/Repeater) + +3. 这个示例可以通过url播放音乐，由于缓冲区内存较小，因此网络状况不好的情况下会出现持续性的噪声，请合理选择url链接与您的wifi网络。 + +- [StreamHttpMP3](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/AtomEcho/Arduino/StreamHttpClient_ECHO)