Skip to content

Commit

Permalink
mPython to MicroPython
Browse files Browse the repository at this point in the history
  • Loading branch information
junhuanchen committed May 28, 2019
1 parent afad614 commit 48776d4
Show file tree
Hide file tree
Showing 58 changed files with 265 additions and 265 deletions.
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

[micropython 官方](http://docs.micropython.org/en/latest/esp32/quickref.html)

[mPython 中文](https://mpython.readthedocs.io/zh/master/)
[MicroPython 中文](https://MicroPython.readthedocs.io/zh/master/)

## python

Expand All @@ -32,7 +32,7 @@ pip install sphinx, sphinx_rtd_theme, recommonmark

```unix
git submodule add https://github.com/micropython/micropython
git submodule add https://github.com/labplus-cn/mPython
git submodule add https://github.com/labplus-cn/MicroPython
git submodule update --init --recursive
```
6 changes: 3 additions & 3 deletions source/contents.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ BPI-BIT 是一款基于 ESP32 高性能芯片且兼容 micro:bit 设计的开源
bpi-dev/mpy-tutorials
bpi-dev/mpy-release

mPython/docs/library/pythonStd/index.rst
mPython/docs/library/micropython/index.rst
MicroPython/docs/library/pythonStd/index.rst
MicroPython/docs/library/micropython/index.rst
micropython/docs/index

用户可以通过烧写 Webduino 固件,就能够使用面向全世界的 Webduino Blockly 积木化在线编程。
Expand All @@ -61,7 +61,7 @@ BPI-BIT 是一款基于 ESP32 高性能芯片且兼容 micro:bit 设计的开源
.. toctree::
:maxdepth: 2
:caption: 引用区域
mPython/docs/index
MicroPython/docs/index
micropython/docs/index
..

Expand Down
6 changes: 3 additions & 3 deletions source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ BPI-BIT 是一款基于 ESP32 高性能芯片且兼容 micro:bit 设计的开源
bpi-dev/mpy-tutorials
bpi-dev/mpy-release

mPython/docs/library/pythonStd/index.rst
mPython/docs/library/micropython/index.rst
MicroPython/docs/library/pythonStd/index.rst
MicroPython/docs/library/micropython/index.rst
micropython/docs/index

用户可以通过烧写 Webduino 固件,就能够使用面向全世界的 Webduino Blockly 积木化在线编程。
Expand All @@ -61,7 +61,7 @@ BPI-BIT 是一款基于 ESP32 高性能芯片且兼容 micro:bit 设计的开源
.. toctree::
:maxdepth: 2
:caption: 引用区域
mPython/docs/index
MicroPython/docs/index
micropython/docs/index
..

Expand Down
2 changes: 1 addition & 1 deletion source/mPython/docs/board/flashburn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.. image:: /images/flashburn/flashDownload_1.png

选择 **SPIDownload** ,然后浏览并选中刚下载的板子固件mpython_v1.3.0.bin,并设置地址是0x00。浏览并选中字库Noto_Sans_CJK_SC_Light16.xbf,并设置0x300000。
选择 **SPIDownload** ,然后浏览并选中刚下载的板子固件MicroPython_v1.3.0.bin,并设置地址是0x00。浏览并选中字库Noto_Sans_CJK_SC_Light16.xbf,并设置0x300000。
将CrystallFreq设为40M,SPI SPEED 设为40MHz,SPI MODE设为DIO,FLASH SIZE改为64MBit,串口号设置为实际串口,波特率1152000。

.. Caution:: v1.1.1以后的固件版本,firmware烧录起始地址改为0x00!
Expand Down
10 changes: 5 additions & 5 deletions source/mPython/docs/board/hardware.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
硬件概述
====================

mPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Python软件上功能。
MicroPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Python软件上功能。

.. image:: /images/掌控-立2.png

Expand Down Expand Up @@ -58,7 +58,7 @@ mPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Py
.. image:: /images/布局-背面.png
:width: 800px

.. _mpython_pinout:
.. _MicroPython_pinout:

引脚定义
--------------
Expand All @@ -72,7 +72,7 @@ mPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Py
.. image:: /images/板子-pinout_wroom.png
:width: 800px

.. _mPythonPindesc:
.. _MicroPythonPindesc:

板子接口引脚说明
++++++++++++++++
Expand Down Expand Up @@ -118,7 +118,7 @@ mPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Py
原理图
++++++

* :download:`mPython板子V0.9原理图 </../docs/hardware/labplus_mPython_V0.9.pdf>`
* :download:`MicroPython板子V0.9原理图 </../docs/hardware/labplus_MicroPython_V0.9.pdf>`

主要数据手册
+++++++
Expand All @@ -132,4 +132,4 @@ mPython掌控是一块MicroPython微控制器板,很好的支持MicroPython/Py
外观规格图
+++++++

* :download:`mPython板子外观规格图 </../docs/hardware/掌控-外观规格图20190218..rar>`
* :download:`MicroPython板子外观规格图 </../docs/hardware/掌控-外观规格图20190218..rar>`
4 changes: 2 additions & 2 deletions source/mPython/docs/board/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
introduction.rst
hardware.rst
drive.rst
mpythonX.rst
mpython2.rst
MicroPythonX.rst
MicroPython2.rst
flashburn.rst
2 changes: 1 addition & 1 deletion source/mPython/docs/board/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

MicroPython是Python 3编程语言的精简高效实现 ,包括Python标准库的一小部分,并且经过优化,可在微控制器和受限环境中运行。

mPython掌控是一块MicroPython微控制器板。专为物联网设计,板载ESP-WROOM-32双核芯片,支持WiFi和蓝牙双模通信。
MicroPython掌控是一块MicroPython微控制器板。专为物联网设计,板载ESP-WROOM-32双核芯片,支持WiFi和蓝牙双模通信。
板上集成1.3英寸OLED显示屏、加速度计、声、光传感器、蜂鸣器、2个物理按键、5个触摸按键。除此外,还有一个阻性输入接口,方便接入各种阻性传感器。
丰富多样的传感器和小体积的尺寸、结合蓝牙和WiFi双无线通讯,可现实不同的物联网应用场景。

Expand Down
26 changes: 13 additions & 13 deletions source/mPython/docs/board/mpython2.rst
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
mPython2 IDE
MicroPython2 IDE
====================

软件安装
-----------

目前有三个下载地址(for Windows 64位、Windows 32位、MacOS):

http://static.steamaker.cn/files/mPython2_0.2.5_win64.exe
http://static.steamaker.cn/files/MicroPython2_0.2.5_win64.exe

http://static.steamaker.cn/files/mPython2_0.2.5_win32.exe
http://static.steamaker.cn/files/MicroPython2_0.2.5_win32.exe

http://static.steamaker.cn/files/mPython2_0.2.5_macos.zip
http://static.steamaker.cn/files/MicroPython2_0.2.5_macos.zip


根据操作系统选择不同的版本下载,目前支持Win 7 / 8 / 10、MacOS,不支持XP系统。

.. Attention::

因为Python调用路径的原因,程序不可以安装在中文目录下。
程序默认会安装在Windows用户目录下,如:C:\\Users\\{用户名}\\AppData\\Local\\mPython2
程序默认会安装在Windows用户目录下,如:C:\\Users\\{用户名}\\AppData\\Local\\MicroPython2
有的用户名为中文,使用默认路径会导致安装后的快捷方式无法正确打开
请修改路径,如下图,修改为:D:\\mPython2
请修改路径,如下图,修改为:D:\\MicroPython2


.. image:: /images/software/software_1.png
Expand All @@ -40,12 +40,12 @@ http://static.steamaker.cn/files/mPython2_0.2.5_macos.zip
接入硬件
-----------

点击桌面快捷方式mPython2,打开软件主界面。
点击桌面快捷方式MicroPython2,打开软件主界面。

.. image:: /images/software/software_3.png

用USB线接入板子。如果是初次接入,Windows可能要花费比较多的时间才能识别出板子,正确识别后,
软件会自动弹出提示,提示切换到:掌控(mPython)模式,如下图:
软件会自动弹出提示,提示切换到:掌控(MicroPython)模式,如下图:

.. image:: /images/software/software_4.png

Expand Down Expand Up @@ -83,14 +83,14 @@ http://static.steamaker.cn/files/mPython2_0.2.5_macos.zip

写入基础库
````````
板子文件区菜单自带基础库mpython.py,初次使用需要先把基础库写入板子。
如图,在板子文件区任意地方,鼠标右键点击“写入基础库(mpython.py)”
板子文件区菜单自带基础库MicroPython.py,初次使用需要先把基础库写入板子。
如图,在板子文件区任意地方,鼠标右键点击“写入基础库(MicroPython.py)”

.. image:: /images/software/software_9.png

.. Note::

写入基础库的目的是:以后在程序中可以使用 from mpython import * 的语句
写入基础库的目的是:以后在程序中可以使用 from MicroPython import * 的语句

向板子写入代码文件
````````
Expand Down Expand Up @@ -260,7 +260,7 @@ http://static.steamaker.cn/files/mPython2_0.2.5_macos.zip

.. image:: /images/software/software_24.png

文件系统出现boot.py及mpython.py即恢复固件成功。
文件系统出现boot.py及MicroPython.py即恢复固件成功。

.. image:: /images/software/software_25.png

Expand All @@ -273,6 +273,6 @@ http://static.steamaker.cn/files/mPython2_0.2.5_macos.zip

.. image:: /images/software/software_27.png

写入成功即可见板子文件增加了mpython.py。
写入成功即可见板子文件增加了MicroPython.py。

.. image:: /images/software/software_28.png
50 changes: 25 additions & 25 deletions source/mPython/docs/board/mpythonX.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
mPython X IDE
MicroPython X IDE
====================

软件安装
-----------

目前最新版本为0.2.4,支持Windows 7/8/10、Windows XP、Macos、树莓派、虚谷号:

http://static.steamaker.cn/files/mPythonXSetup0.2.4.exe
http://static.steamaker.cn/files/MicroPythonXSetup0.2.4.exe
(Win 7 / 8 / 10)

http://static.steamaker.cn/files/mPythonXSetup0.2.4_XP.exe
http://static.steamaker.cn/files/MicroPythonXSetup0.2.4_XP.exe
(Win XP)

http://static.steamaker.cn/files/mpythonx-0.2.4-mac.zip
http://static.steamaker.cn/files/MicroPythonx-0.2.4-mac.zip
(Mac OS)

http://static.steamaker.cn/files/mpythonx-0.2.4-arm.tar.gz
http://static.steamaker.cn/files/MicroPythonx-0.2.4-arm.tar.gz
(树莓派)

http://static.steamaker.cn/files/mpythonx-0.2.4-arm64.tar.gz
http://static.steamaker.cn/files/MicroPythonx-0.2.4-arm64.tar.gz
(虚谷号,待测试)

附:板子的Mac驱动
Expand All @@ -39,14 +39,14 @@ https://www.silabs.com/documents/public/software/Mac_OSX_VCP_Driver.zip
接入硬件
-----------

点击桌面快捷方式mPythonX,打开软件主界面。
点击桌面快捷方式MicroPythonX,打开软件主界面。

.. image:: /images/software/mPythonX/mPythonX_1.png
.. image:: /images/software/MicroPythonX/MicroPythonX_1.png


用USB线接入板子。正确识别后,“连接串口”处会出现COM口,如下图:

.. image:: /images/software/mPythonX/mPythonX_2.png
.. image:: /images/software/MicroPythonX/MicroPythonX_2.png



Expand All @@ -61,63 +61,63 @@ https://www.silabs.com/documents/public/software/Mac_OSX_VCP_Driver.zip

“保存代码”只保存程序对应的代码,后缀为py:

.. image:: /images/software/mPythonX/mPythonX_3.png
.. image:: /images/software/MicroPythonX/MicroPythonX_3.png

点击“本机读取”,加载保存的py文件:

.. image:: /images/software/mPythonX/mPythonX_5.png
.. image:: /images/software/MicroPythonX/MicroPythonX_5.png

读取效果如图:

.. image:: /images/software/mPythonX/mPythonX_4.png
.. image:: /images/software/MicroPythonX/MicroPythonX_4.png

“保存模块”保存程序对应的代码及图形化模块,后缀为xml:

.. image:: /images/software/mPythonX/mPythonX_6.png
.. image:: /images/software/MicroPythonX/MicroPythonX_6.png

点击“本机读取”,加载保存的xml文件,读取效果如图:

.. image:: /images/software/mPythonX/mPythonX_7.png
.. image:: /images/software/MicroPythonX/MicroPythonX_7.png

模块提示
````````
鼠标停留在模块上会有提示:

.. image:: /images/software/mPythonX/mPythonX_8.png
.. image:: /images/software/MicroPythonX/MicroPythonX_8.png

帮助文档
````````
在模块上,点击鼠标右键:

.. image:: /images/software/mPythonX/mPythonX_9.png
.. image:: /images/software/MicroPythonX/MicroPythonX_9.png

点击帮助,即可跳转至帮助文档:

.. image:: /images/software/mPythonX/mPythonX_10.png
.. image:: /images/software/MicroPythonX/MicroPythonX_10.png

切换图形/代码模式
````````

点击“代码模式”/“图形模式”,即可实现对应切换:

.. image:: /images/software/mPythonX/mPythonX_11.png
.. image:: /images/software/MicroPythonX/MicroPythonX_11.png

.. image:: /images/software/mPythonX/mPythonX_12.png
.. image:: /images/software/MicroPythonX/MicroPythonX_12.png

改变图形区/代码区大小
````````

鼠标停留在圈红的灰色三角上,按住左键左右拖动即可:

.. image:: /images/software/mPythonX/mPythonX_13.png
.. image:: /images/software/MicroPythonX/MicroPythonX_13.png


代码编辑区
-----------

代码联想:

.. image:: /images/software/mPythonX/mPythonX_14.png
.. image:: /images/software/MicroPythonX/MicroPythonX_14.png


运行/刷入
Expand All @@ -130,7 +130,7 @@ https://www.silabs.com/documents/public/software/Mac_OSX_VCP_Driver.zip

点击“连接串口”,按钮字样变成“断开连接”,即可开始运行/刷入:

.. image:: /images/software/mPythonX/mPythonX_15.png
.. image:: /images/software/MicroPythonX/MicroPythonX_15.png

.. Note::

Expand All @@ -141,11 +141,11 @@ https://www.silabs.com/documents/public/software/Mac_OSX_VCP_Driver.zip

圈红处是反馈的信息,包括硬件信息、代码报错信息等:

.. image:: /images/software/mPythonX/mPythonX_16.png
.. image:: /images/software/MicroPythonX/MicroPythonX_16.png

比如,红字为代码报错信息:

.. image:: /images/software/mPythonX/mPythonX_17.png
.. image:: /images/software/MicroPythonX/MicroPythonX_17.png

读出上一次刷入的代码
````````
Expand All @@ -158,7 +158,7 @@ https://www.silabs.com/documents/public/software/Mac_OSX_VCP_Driver.zip

点击“恢复固件”,按照提示操作:

.. image:: /images/software/mPythonX/mPythonX_18.png
.. image:: /images/software/MicroPythonX/MicroPythonX_18.png

.. Hint::

Expand Down

0 comments on commit 48776d4

Please sign in to comment.