Skip to content

Commit 849c99d

Browse files
authored
Merge pull request #26 from RT-Thread/master
update
2 parents 6f32f7c + 550f342 commit 849c99d

File tree

183 files changed

+464
-489
lines changed

Some content is hidden

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

183 files changed

+464
-489
lines changed

bsp/lpc1114/rtconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
PLATFORM = 'gcc'
1818
EXEC_PATH = r'/usr/bin'
1919
else:
20-
print 'Please make sure your toolchains is GNU GCC!'
20+
print ('Please make sure your toolchains is GNU GCC!')
2121
exit(0)
2222

2323
if os.getenv('RTT_EXEC_PATH'):

bsp/lpc43xx/M4/SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
3030
print('build M0 code first')
3131
if sys.platform.startswith('linux'):
3232
import glob
33-
ocwd = os.getcwdu()
33+
ocwd = os.getcwd()
3434
os.chdir('../M0')
3535
res = os.system('scons')
3636
if res:
@@ -41,7 +41,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
4141
os.chdir(ocwd)
4242
else:
4343
# Assume Windows.
44-
ocwd = os.getcwdu()
44+
ocwd = os.getcwd()
4545
os.chdir('..\M0')
4646
os.system('scons.bat')
4747
os.chdir(ocwd)

bsp/stm32/libraries/HAL_Drivers/config/f0/adc_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

bsp/stm32/libraries/HAL_Drivers/config/f0/dma_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -27,7 +27,7 @@ extern "C" {
2727
#define UART1_RX_DMA_INSTANCE DMA1_Channel3
2828
#define UART1_RX_DMA_IRQ DMA1_Ch2_3_DMA2_Ch1_2_IRQn
2929
#elif defined(BSP_SPI1_RX_USING_DMA) && !defined(SPI1_RX_DMA_INSTANCE)
30-
#define SPI1_DMA_RX_TX_IRQHandler DMA1_Ch2_3_DMA2_Ch1_2_IRQHandler
30+
#define SPI1_DMA_RX_TX_IRQHandler DMA1_Ch2_3_DMA2_Ch1_2_IRQHandler
3131
#define SPI1_RX_DMA_RCC RCC_AHBENR_DMA1EN
3232
#define SPI1_RX_DMA_INSTANCE DMA1_Channel2
3333
#define SPI1_RX_DMA_IRQ DMA1_Ch2_3_DMA2_Ch1_2_IRQn

bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

bsp/stm32/libraries/HAL_Drivers/config/f0/spi_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -27,7 +27,7 @@ extern "C" {
2727
}
2828
#endif /* SPI1_BUS_CONFIG */
2929
#endif /* BSP_USING_SPI1 */
30-
30+
3131
#ifdef BSP_SPI1_TX_USING_DMA
3232
#ifndef SPI1_TX_DMA_CONFIG
3333
#define SPI1_TX_DMA_CONFIG \
@@ -59,7 +59,7 @@ extern "C" {
5959
}
6060
#endif /* SPI2_BUS_CONFIG */
6161
#endif /* BSP_USING_SPI2 */
62-
62+
6363
#ifdef BSP_SPI2_TX_USING_DMA
6464
#ifndef SPI2_TX_DMA_CONFIG
6565
#define SPI2_TX_DMA_CONFIG \

bsp/stm32/libraries/HAL_Drivers/config/f0/tim_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

bsp/stm32/libraries/HAL_Drivers/config/f0/uart_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -49,7 +49,7 @@ extern "C" {
4949
}
5050
#endif /* UART2_CONFIG */
5151
#endif /* BSP_USING_UART2 */
52-
52+
5353
#if defined(BSP_UART2_RX_USING_DMA)
5454
#ifndef UART2_DMA_RX_CONFIG
5555
#define UART2_DMA_RX_CONFIG \

bsp/stm32/libraries/HAL_Drivers/config/f1/adc_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -29,7 +29,7 @@ extern "C" {
2929
.Init.DiscontinuousConvMode = DISABLE, \
3030
.Init.NbrOfDiscConversion = 1, \
3131
.Init.ExternalTrigConv = ADC_SOFTWARE_START, \
32-
}
32+
}
3333
#endif /* ADC1_CONFIG */
3434
#endif /* BSP_USING_ADC1 */
3535

@@ -45,7 +45,7 @@ extern "C" {
4545
.Init.DiscontinuousConvMode = DISABLE, \
4646
.Init.NbrOfDiscConversion = 1, \
4747
.Init.ExternalTrigConv = ADC_SOFTWARE_START, \
48-
}
48+
}
4949
#endif /* ADC2_CONFIG */
5050
#endif /* BSP_USING_ADC2 */
5151

@@ -61,7 +61,7 @@ extern "C" {
6161
.Init.DiscontinuousConvMode = DISABLE, \
6262
.Init.NbrOfDiscConversion = 1, \
6363
.Init.ExternalTrigConv = ADC_SOFTWARE_START, \
64-
}
64+
}
6565
#endif /* ADC3_CONFIG */
6666
#endif /* BSP_USING_ADC3 */
6767

bsp/stm32/libraries/HAL_Drivers/config/f1/dma_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

0 commit comments

Comments
 (0)