diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd2946a --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 51bb16f..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 M5Stack - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index cbc4dfa..421bf4a 100644 --- a/README.md +++ b/README.md @@ -462,7 +462,8 @@ adc.read() ```python from machine import I2C -i2c = I2C(freq=400000) # create I2C peripheral at frequency of 400kHz +i2c = I2C(freq=400000, sda=21, scl=22) + # create I2C peripheral at frequency of 400kHz # depending on the port, extra parameters may be required # to select the peripheral and/or pins to use diff --git a/README_CN.md b/README_CN.md index e598f07..7de30fa 100644 --- a/README_CN.md +++ b/README_CN.md @@ -406,7 +406,7 @@ adc.read() ```python from machine import I2C -i2c = I2C(freq=400000) # create I2C peripheral at frequency of 400kHz +i2c = I2C(freq=400000, sda=21, scl=22) # create I2C peripheral at frequency of 400kHz # depending on the port, extra parameters may be required # to select the peripheral and/or pins to use @@ -447,3 +447,15 @@ uart2.write('abc') # write the 3 characters 更详细文档: https://github.com/loboris/MicroPython_ESP32_psRAM_LoBo/wiki + +## 更新日志 + +- v0.3.5 + + 更新至最新 Loboris 的版本 + + 修复 SDCard SPI 与 屏幕 SPI冲突问题 + + I2C 模块代码重构,支持 SLAVE mode + + machine 支持获取 ESP32 内部温度传感器 + + 添加 MPU9250 frozen module + + 重写按键驱动,支持多种按键事件的回调 + + 将 beep 改为 speaker,tone 为非阻塞模式 + + 优化 Web IDE 文件同步协议,使更加稳定 \ No newline at end of file diff --git a/firmwares/m5cloud-20180302-v0.3.5.bin b/firmwares/m5cloud-20180302-v0.3.5.bin new file mode 100644 index 0000000..8945f19 Binary files /dev/null and b/firmwares/m5cloud-20180302-v0.3.5.bin differ diff --git a/firmwares/m5cloud-psram-20180302-v0.3.5.bin b/firmwares/m5cloud-psram-20180302-v0.3.5.bin new file mode 100644 index 0000000..a9606fd Binary files /dev/null and b/firmwares/m5cloud-psram-20180302-v0.3.5.bin differ