【同步】SDK 至 1.1.0 版本。

Signed-off-by: armink <armink.ztl@gmail.com>
RT-Thread · Apr 15, 2019 · db10ae8 · db10ae8
1 parent 39f46ae
commit db10ae8
Show file tree

Hide file tree

Showing 1,533 changed files with 152,710 additions and 21,749 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ IoT Board 开发板核心芯片资源如下：
 例程列表如下所示：
 
 | 编号 | 类别   | 例程名           | 说明                                                         |
-| ---- | ------ | ---------------- | ----------------------------------------------------- |
+| ---- | ------ | ---------------- | ------------------------------------------------------------ |
 | 01   | 基础   | led_blink        | 红色 LED 不间断闪烁                                          |
 | 02   | 基础   | rgb_led          | RGB LED 变色                                                 |
 | 03   | 基础   | key              | 板载按键                                                     |
@@ -56,8 +56,9 @@ IoT Board 开发板核心芯片资源如下：
 | 26   | 物联网 | cloud_onenet     | 接入中国移动 OneNET 云平台                                   |
 | 27   | 物联网 | cloud_ali_iotkit | 接入阿里云物联网平台                                         |
 | 28   | 物联网 | cloud_ms_azure   | 接入微软 Azure 物联网平台                                    |
-| 29   | 物联网 | web_server       | 创建一个 Web 服务器|
+| 29   | 物联网 | web_server       | 创建一个 Web 服务器                                          |
 | 30   | 综合   | demo             | 综合性示例演示                                               |
+| 31   |        | micropython      | MicroPython 例程                                             |
 
 ## 文档说明
 
@@ -108,4 +109,5 @@ docs 文件夹下的文档列表如下所示：
 - RT-Thread 基本知识
 - RT-Thread 开发环境
 
-学习 RT-Thread 基本知识可以从文档中心的 [《RT-Thread 入门指南》](https://www.RT-Thread.org/document/site/rtthread-tutorial/gd0001-rtthread-introducing/) 开始，深入开发 RT-Thread 可以阅读 [《RT-Thread 开发指南》](https://www.RT-Thread.org/document/site/rtthread-development-guide/README/) 。
+学习 RT-Thread 基本知识可以从文档中心的 [《RT-Thread 入门指南》](https://www.RT-Thread.org/document/site/rtthread-tutorial/gd0001-rtthread-introducing/) 开始，深入开发 RT-Thread 可以阅读 [《RT-Thread 开发指南》](https://www.RT-Thread.org/document/site/rtthread-development-guide/README/) 。
+
diff --git a/README.pdf b/README.pdf
diff --git a/docs/AN0009-RT-Thread_使用 SystemView 分析工具.pdf → docs/AN0009-RT-Thread-使用 SystemView 分析工具.pdf b/docs/AN0009-RT-Thread_使用 SystemView 分析工具.pdf → docs/AN0009-RT-Thread-使用 SystemView 分析工具.pdf
diff --git a/docs/UM3001-RT-Thread-IoT Board WIFI 模块固件下载手册.pdf b/docs/UM3001-RT-Thread-IoT Board WIFI 模块固件下载手册.pdf
diff --git a/docs/UM3002-RT-Thread-IoT Board 发布说明.pdf b/docs/UM3002-RT-Thread-IoT Board 发布说明.pdf
diff --git a/docs/UM3003-RT-Thread-IoT Board 介绍.pdf b/docs/UM3003-RT-Thread-IoT Board 介绍.pdf
diff --git a/docs/UM3004-RT-Thread-IoT Board 快速上手.pdf b/docs/UM3004-RT-Thread-IoT Board 快速上手.pdf
diff --git a/docs/UM3005-RT-Thread-IoT Board 开发手册.pdf b/docs/UM3005-RT-Thread-IoT Board 开发手册.pdf
diff --git a/docs/figures/09_driver_axis/icm20608-sample-log.png b/docs/figures/09_driver_axis/icm20608-sample-log.png
diff --git a/docs/figures/10_component_usb_mouse/log.png b/docs/figures/10_component_usb_mouse/log.png
diff --git a/docs/figures/19_iot_mqtt/wifi_join.png b/docs/figures/19_iot_mqtt/wifi_join.png
diff --git a/docs/figures/22_iot_ota_ymodem/ymodem_ota_success.png b/docs/figures/22_iot_ota_ymodem/ymodem_ota_success.png
diff --git a/docs/figures/23_iot_ota_http/download_allbin-http.png b/docs/figures/23_iot_ota_http/download_allbin-http.png
diff --git a/docs/figures/23_iot_ota_http/http_ota.png b/docs/figures/23_iot_ota_http/http_ota.png
diff --git a/docs/figures/23_iot_ota_http/http_ota_success.png b/docs/figures/23_iot_ota_http/http_ota_success.png
diff --git a/docs/figures/26_iot_cloud_onenet/data_strem.png b/docs/figures/26_iot_cloud_onenet/data_strem.png
diff --git a/docs/figures/26_iot_cloud_onenet/device_info1.png b/docs/figures/26_iot_cloud_onenet/device_info1.png
diff --git a/docs/figures/26_iot_cloud_onenet/device_info2.png b/docs/figures/26_iot_cloud_onenet/device_info2.png
diff --git a/docs/figures/26_iot_cloud_onenet/ledon.png b/docs/figures/26_iot_cloud_onenet/ledon.png
diff --git a/docs/figures/26_iot_cloud_onenet/send_cmd.png b/docs/figures/26_iot_cloud_onenet/send_cmd.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopDbgConsole.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopDbgConsole.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpenDbgConsole.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpenDbgConsole.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_log.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_log.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_receiver.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_receiver.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_send.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopOpen_send.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopViewDev1.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopViewDev1.png
diff --git a/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopViewMQTTMsg.png b/docs/figures/27_iot_cloud_ali_iotkit/AliLinkDevelopViewMQTTMsg.png
diff --git a/docs/figures/31_micropython/python_grammer_function.png b/docs/figures/31_micropython/python_grammer_function.png
diff --git a/docs/figures/31_micropython/python_hello.png b/docs/figures/31_micropython/python_hello.png
diff --git a/docs/figures/31_micropython/use_rtthread_module.png b/docs/figures/31_micropython/use_rtthread_module.png
diff --git a/docs/figures/31_micropython/use_time_module.png b/docs/figures/31_micropython/use_time_module.png
diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -135,10 +135,21 @@ menu "Hardware Drivers Config"
             select RT_USING_HOOK
             default n
 
-        config BSP_USING_INFRARED
-            bool "Enable INFRARED"
+        config BSP_USING_PWM3_CH3
+            bool "Enable PWM3_CH3"
+            select RT_USING_PWM
             default n
-
+
+        config BSP_USING_TIM15
+            bool "Enable HWTIMER_15"
+            select RT_USING_HWTIMER
+            default n
+
+        config BSP_USING_TIM16
+            bool "Enable HWTIMER_16"
+            select RT_USING_HWTIMER
+            default n
+
         config BSP_USING_USBD
             bool "Enable USBD"
             default n

diff --git a/drivers/SConscript b/drivers/SConscript
@@ -62,10 +62,14 @@ if GetDepend('BSP_USING_WIFI'):
 if GetDepend('BSP_USING_PM'):
     src = src + ['drv_pm.c', 'drv_pmtimer.c', 'drv_wakeup.c']
 
+# add hwtimer driver code
+if GetDepend('BSP_USING_PWM3_CH3'):
+    src = src + ['drv_pwm.c']
+
 # add infrared driver code
-if GetDepend('BSP_USING_INFRARED'):
-    src = src + ['drv_infrared.c']
-    
+if GetDepend('BSP_USING_TIM15') or GetDepend('BSP_USING_TIM16'):
+    src = src + ['drv_hwtimer.c']
+
 # add HID USB driver code
 if GetDepend('BSP_USING_USBD'):
     src = src + ['drv_usbd.c']

diff --git a/drivers/board.h b/drivers/board.h
@@ -27,7 +27,7 @@ extern char __ICFEDIT_region_IRAM1_end__;
 #define STM32_SRAM_END          (0x20000000 + STM32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__