From 20ca37562f481b574f23941b17e77ea637266f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E4=B8=BE?= Date: Tue, 14 Sep 2021 16:38:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=9D=BF=E8=BD=BD?= =?UTF-8?q?=E9=BA=A6=E5=85=8B=E9=A3=8E=EF=BC=8C=E8=8C=83=E5=9B=B40~4095?= =?UTF-8?q?=E3=80=82(=E6=B5=8B=E8=AF=95=E6=B5=8B=E9=87=8F=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=E5=9C=A82600~3000)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh_CN/library/mPython/mpython.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh_CN/library/mPython/mpython.rst b/docs/zh_CN/library/mPython/mpython.rst index 2d57dae..fef913a 100644 --- a/docs/zh_CN/library/mPython/mpython.rst +++ b/docs/zh_CN/library/mPython/mpython.rst @@ -5,7 +5,7 @@ :synopsis: 掌控板板载相关功能函数 :mod:`mpython` --- 掌控板板载相关功能函数 -========================== +========================================= ``mpython`` 是基于掌控板封装的专有模块,内含掌控板板载资源相关功能函数。 详细代码实现可查阅 :ref:`mpython.py源码 ` 。 @@ -63,7 +63,7 @@ .. method:: sound.read() -读取板载麦克风，范围0~4095。 +读取板载麦克风，范围0~4095。(测试测量最大值在2600~3000) 加速度计 From f32480872a3029b02cc74ce4a8a168365f0a32c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=8B=E4=B8=BE?= Date: Tue, 14 Sep 2021 16:43:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=9D=BF=E8=BD=BD?= =?UTF-8?q?=E9=BA=A6=E5=85=8B=E9=A3=8E=EF=BC=8C=E8=8C=83=E5=9B=B40~4095?= =?UTF-8?q?=E3=80=82(=E6=B5=8B=E8=AF=95=E6=B5=8B=E9=87=8F=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=E5=9C=A82600~3000)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh_CN/tutorials/basics/sound.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh_CN/tutorials/basics/sound.rst b/docs/zh_CN/tutorials/basics/sound.rst index e64db60..808d0f1 100644 --- a/docs/zh_CN/tutorials/basics/sound.rst +++ b/docs/zh_CN/tutorials/basics/sound.rst @@ -28,7 +28,7 @@ .. Note:: - 麦克风使用 ``read()`` 函数来读取数据。返回的值为12bit的ADC采样数据，即最大值为十进制4095。 + 麦克风使用 ``read()`` 函数来读取数据。返回的值为12bit的ADC采样数据，即最大值为十进制4095。(测试测量最大值在2600~3000) 学会了如何收集周边环境的声音数据，我们可以结合其他功能做更多有趣的场景。 From 6011e707a365d2401ddeeeeaf1c690ab188342f6 Mon Sep 17 00:00:00 2001 From: lijutsang <957790617@qq.com> Date: Fri, 15 Apr 2022 11:04:19 +0800 Subject: [PATCH 3/6] up --- docs/en/board/hardware.rst | 2 +- docs/zh_CN/board/hardware.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/board/hardware.rst b/docs/en/board/hardware.rst index 0956bef..19acaf4 100644 --- a/docs/en/board/hardware.rst +++ b/docs/en/board/hardware.rst @@ -29,7 +29,7 @@ mPython Board had the following hardware features: - mPython Board integrated hardwares - 3-axis Accelerometer MSA300, Range: ±2/4/8/16G - - Deomagnetic Sensor MMC5983MA, Range: ±8 Gauss; Accuracy 0.4mGz, Electronic Compass error ±0.5° + - Deomagnetic Sensor MMC5983MA, Range: ±8 Gauss; Accuracy 0.4mGs, Electronic Compass error ±0.5° - Light Sensor - Microphone - 3x ws2812 LED, RGB diff --git a/docs/zh_CN/board/hardware.rst b/docs/zh_CN/board/hardware.rst index 6e204ea..f844b18 100644 --- a/docs/zh_CN/board/hardware.rst +++ b/docs/zh_CN/board/hardware.rst @@ -29,7 +29,7 @@ mPython掌控是一块MicroPython微控制器板，很好的支持MicroPython/Py - 掌控板载 - 三轴加速度计MSA300,测量范围:±2/4/8/16G - - 地磁传感器MMC5983MA,测量范围:±8 Gauss;精度0.4mGz,电子罗盘误差±0.5° + - 地磁传感器MMC5983MA,测量范围:±8 Gauss;精度0.4mGs,电子罗盘误差±0.5° - 光线传感器 - 麦克风 - 3 颗全彩ws2812灯珠 From 24ca4ce56d854f768c3ca45907be9a0542701b9a Mon Sep 17 00:00:00 2001 From: lijutsang <957790617@qq.com> Date: Fri, 15 Apr 2022 16:11:13 +0800 Subject: [PATCH 4/6] up --- docs/en/library/mPython/mpython.rst | 2 +- docs/zh_CN/library/mPython/mpython.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/library/mPython/mpython.rst b/docs/en/library/mPython/mpython.rst index e578a3e..f972770 100644 --- a/docs/en/library/mPython/mpython.rst +++ b/docs/en/library/mPython/mpython.rst @@ -671,7 +671,7 @@ Connect WiFi network - ``ssid`` -WiFi network ID - ``password`` -WiFi Password - - ``tiemout`` - Link timeout, default 10 seconds + - ``timeout`` - Link timeout, default 10 seconds .. method:: wifi.disconnectWiFi() diff --git a/docs/zh_CN/library/mPython/mpython.rst b/docs/zh_CN/library/mPython/mpython.rst index fef913a..8f84126 100644 --- a/docs/zh_CN/library/mPython/mpython.rst +++ b/docs/zh_CN/library/mPython/mpython.rst @@ -737,7 +737,7 @@ wifi类 - ``ssid`` -WiFi网络名称 - ``password`` -WiFi密码 - - ``tiemout`` -链接超时,默认10秒 + - ``timeout`` -链接超时,默认10秒 .. method:: wifi.disconnectWiFi() From 105379dca32ea8da63d1bc2a8c8f1d524904f41f Mon Sep 17 00:00:00 2001 From: Tonmoy-120 Date: Wed, 18 Dec 2024 18:14:26 +0600 Subject: [PATCH 5/6] Update ntptime.rst ntptime updated current version compatable code updated and deprecated parameters removed --- docs/en/library/micropython/ntptime.rst | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/docs/en/library/micropython/ntptime.rst b/docs/en/library/micropython/ntptime.rst index 8641291..476e22d 100644 --- a/docs/en/library/micropython/ntptime.rst +++ b/docs/en/library/micropython/ntptime.rst @@ -10,18 +10,13 @@ This module is used for time synchronization, providing accurate time, Internati .. admonition:: what is NTP Network Time Protocol (NTP) is a protocol used to synchronize the time of the computer. It can synchronize the computer to its server or clock source (such as quartz clock, GPS, etc.). It can provide highly precise time calibration. +Note: There's currently no timezone support in MicroPython, and the RTC is set in UTC time. + Method ------ - -.. method:: settime(timezone=8,server = 'ntp.ntsc.ac.cn') - -Synchronize local time - - - ``timezone`` - Time zone time difference, the default is East Eight District, compensation 8 hours - - ``server`` - You can specify the time server yourself, server is a string type. The default time server is "ntp.ntsc.ac.cn" . - +.. method:: settime() Example:: @@ -30,17 +25,14 @@ Example:: mywifi=wifi() mywifi.connectWiFi('tang','tang123456') - - print("Local time before synchronization：%s" %str(time.localtime())) + ntptime.host = 'ntp.ntsc.ac.cn' + timeout = 1 ntptime.settime() - print("Local time after synchronization：%s" %str(time.localtime())) + print("Success) 运行结果:: Connecting to network... WiFi Connection Successful,Network Config:('172.20.10.4', '255.255.255.240', '172.20.10.1', '172.20.10.1') - Local time before synchronization：(2000, 1, 1, 0, 40, 8, 5, 1) - Local time after synchronization：(2018, 12, 27, 12, 10, 7, 3, 361) - MicroPython v1.0.1-dirty on 2018-11-23; mPython with ESP32 - Type "help()" for more information. - >>> + Success + From 385b0d223268635f7c4e563393c050ebd7917bf5 Mon Sep 17 00:00:00 2001 From: Tonmoy-120 Date: Wed, 18 Dec 2024 18:20:12 +0600 Subject: [PATCH 6/6] Update ntptime.rst ntptime module current functionality added and deprecated functionalities removed --- docs/en/library/micropython/ntptime.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/library/micropython/ntptime.rst b/docs/en/library/micropython/ntptime.rst index 476e22d..f300dee 100644 --- a/docs/en/library/micropython/ntptime.rst +++ b/docs/en/library/micropython/ntptime.rst @@ -26,7 +26,7 @@ Example:: mywifi=wifi() mywifi.connectWiFi('tang','tang123456') ntptime.host = 'ntp.ntsc.ac.cn' - timeout = 1 + ntptime.timeout = 1 ntptime.settime() print("Success)