Skip to content

Commit 991c919

Browse files
committed
Sync from master (aa1e41d)
1 parent b7996af commit 991c919

File tree

1,214 files changed

+282640
-742331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,214 files changed

+282640
-742331
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## 拉取/合并请求描述:(PR description)
22

33
[
4-
这段方括号里的内容是您必须填写并替换掉的,否则PR不可能被合并。方括号外面的内容不需要修改,但请仔细阅读。
4+
这段方括号里的内容是您**必须填写并替换掉**,否则PR不可能被合并。**方括号外面的内容不需要修改,但请仔细阅读。**
55
The content in this square bracket must be filled in and replaced, otherwise PR can not be merged. The contents outside square brackets need not be changed, but please read them carefully.
66

77
请在这里填写您的PR描述,可以包括以下之一的内容:为什么提交这份PR;解决的问题是什么,你的解决方案是什么;
@@ -11,8 +11,8 @@ Please fill in your PR description here, which can include one of the following
1111
And confirm in which case or board have been tested.
1212
]
1313

14-
以下的内容请在提交PR后,一项项进行check,没问题后逐条在页面上打钩。
15-
The following contents should be checked item by item after submitted PR, and ticked on the browser one by one after no problem.
14+
以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
15+
The following content must not be changed in submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use web browser to visit PR, and check items one by one, and ticked them if no problem.
1616

1717
### 当前拉取/合并请求的状态 Intent for your PR
1818

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
- RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'
2929
- RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'
3030
- RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'
31-
- RTT_BSP='imxrt1052-evk' RTT_TOOL_CHAIN='sourcery-arm'
31+
- RTT_BSP='imxrt/imxrt1050-evk' RTT_TOOL_CHAIN='sourcery-arm'
3232
# - RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'
3333
# - RTT_BSP='bf533' # no scons
3434
- RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'
@@ -74,9 +74,7 @@ env:
7474
- RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'
7575
- RTT_BSP='stm32f40x' RTT_TOOL_CHAIN='sourcery-arm'
7676
- RTT_BSP='stm32f4xx-HAL' RTT_TOOL_CHAIN='sourcery-arm'
77-
- RTT_BSP='stm32f411-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
7877
- RTT_BSP='stm32f429-apollo' RTT_TOOL_CHAIN='sourcery-arm'
79-
# - RTT_BSP='stm32f429-armfly' RTT_TOOL_CHAIN='sourcery-arm'
8078
- RTT_BSP='stm32f429-disco' RTT_TOOL_CHAIN='sourcery-arm'
8179
- RTT_BSP='stm32l475-iot-disco' RTT_TOOL_CHAIN='sourcery-arm'
8280
- RTT_BSP='stm32l476-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
@@ -97,6 +95,7 @@ env:
9795
- RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
9896
- RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
9997
- RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
98+
- RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
10099
- RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
101100
- RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'
102101
# - RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ RT-Thread is Open Source software under the Apache License 2.0 since RT-Thread v
5353

5454
Since 9th of September 2018, PRs submitted by the community may be merged into the main line only after signing the Contributor License Agreement(CLA).
5555

56-
NOTE:
57-
58-
RT-Thread using the Apache license v2.0 is only launched after the release of v3.1.1, and is still in preparation right now.
59-
6056
## Usage ##
6157

6258
RT-Thread RTOS uses [scons](http://www.scons.org) as building system. Therefore, please install scons and Python 2.7 firstly.

0 commit comments

Comments
 (0)