fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 08:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

nuttx-configs fix code style

Browse Source
This commit is contained in:
Daniel Agar
2015-03-19 23:49:36 +01:00
committed by Lorenz Meier
parent b55fe24161
commit c147424fe7
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx-configs/aerocore/include/board.h
+2 -2
View File
@@ -145,7 +145,7 @@
#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY)
/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx
* otherwise frequency is 2xAPBx. * otherwise frequency is 2xAPBx.
* Note: TIM1,8 are on APB2, others on APB1 * Note: TIM1,8 are on APB2, others on APB1
*/ */
@@ -203,7 +203,7 @@
/* /*
* SPI * SPI
*/ */
/* PA[4-7] SPI1 broken out on J12 */ /* PA[4-7] SPI1 broken out on J12 */
#define GPIO_SPI1_NSS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4) /* should be GPIO_SPI1_NSS_2 but use as a GPIO */ #define GPIO_SPI1_NSS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4) /* should be GPIO_SPI1_NSS_2 but use as a GPIO */
#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_50MHz) #define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_50MHz)
#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1|GPIO_SPEED_50MHz) #define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1|GPIO_SPEED_50MHz)
nuttx-configs/aerocore/src/empty.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* There are no source files here, but libboard.a can't be empty, so * There are no source files here, but libboard.a can't be empty, so
* we have this empty source file to keep it company. * we have this empty source file to keep it company.
*/ */
nuttx-configs/px4fmu-v1/include/board.h
+1 -1
View File
@@ -209,7 +209,7 @@
/* UART DMA configuration for USART1/6 */ /* UART DMA configuration for USART1/6 */
#define DMAMAP_USART1_RX DMAMAP_USART1_RX_2 #define DMAMAP_USART1_RX DMAMAP_USART1_RX_2
#define DMAMAP_USART6_RX DMAMAP_USART6_RX_2 #define DMAMAP_USART6_RX DMAMAP_USART6_RX_2
/* /*
* CAN * CAN
* *
nuttx-configs/px4fmu-v1/src/empty.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* There are no source files here, but libboard.a can't be empty, so * There are no source files here, but libboard.a can't be empty, so
* we have this empty source file to keep it company. * we have this empty source file to keep it company.
*/ */
nuttx-configs/px4fmu-v2/include/board.h
+7 -7
View File
@@ -146,21 +146,21 @@
#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) #define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY)
/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx
* otherwise frequency is 2xAPBx. * otherwise frequency is 2xAPBx.
* Note: TIM1,8 are on APB2, others on APB1 * Note: TIM1,8 are on APB2, others on APB1
*/ */
#define STM32_TIM18_FREQUENCY (2*STM32_PCLK2_FREQUENCY) #define STM32_TIM18_FREQUENCY (2*STM32_PCLK2_FREQUENCY)
#define STM32_TIM27_FREQUENCY (2*STM32_PCLK1_FREQUENCY) #define STM32_TIM27_FREQUENCY (2*STM32_PCLK1_FREQUENCY)
/* SDIO dividers. Note that slower clocking is required when DMA is disabled /* SDIO dividers. Note that slower clocking is required when DMA is disabled
* in order to avoid RX overrun/TX underrun errors due to delayed responses * in order to avoid RX overrun/TX underrun errors due to delayed responses
* to service FIFOs in interrupt driven mode. These values have not been * to service FIFOs in interrupt driven mode. These values have not been
* tuned!!! * tuned!!!
* *
* HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz * HCLK=72MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(178+2)=400 KHz
*/ */
#define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT) #define SDIO_INIT_CLKDIV (178 << SDIO_CLKCR_CLKDIV_SHIFT)
/* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(2+2)=18 MHz
@@ -168,9 +168,9 @@
*/ */
#ifdef CONFIG_SDIO_DMA #ifdef CONFIG_SDIO_DMA
# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT) # define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT)
#else #else
# define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT) # define SDIO_MMCXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT)
#endif #endif
/* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz /* DMA ON: HCLK=72 MHz, SDIOCLK=72MHz, SDIO_CK=HCLK/(1+2)=24 MHz
@@ -227,10 +227,10 @@
#define DMAMAP_USART1_RX DMAMAP_USART1_RX_2 #define DMAMAP_USART1_RX DMAMAP_USART1_RX_2
#define DMAMAP_USART6_RX DMAMAP_USART6_RX_2 #define DMAMAP_USART6_RX DMAMAP_USART6_RX_2
/* /*
* CAN * CAN
* *
* CAN1 is routed to the onboard transceiver. * CAN1 is routed to the onboard transceiver.
* CAN2 is routed to the expansion connector. * CAN2 is routed to the expansion connector.
*/ */
#define GPIO_CAN1_RX GPIO_CAN1_RX_3 #define GPIO_CAN1_RX GPIO_CAN1_RX_3
nuttx-configs/px4fmu-v2/src/empty.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* There are no source files here, but libboard.a can't be empty, so * There are no source files here, but libboard.a can't be empty, so
* we have this empty source file to keep it company. * we have this empty source file to keep it company.
*/ */
nuttx-configs/px4io-v1/include/board.h
+1 -1
View File
@@ -143,7 +143,7 @@ extern "C" {
************************************************************************************/ ************************************************************************************/
EXTERN void stm32_boardinitialize(void); EXTERN void stm32_boardinitialize(void);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
nuttx-configs/px4io-v1/src/empty.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* There are no source files here, but libboard.a can't be empty, so * There are no source files here, but libboard.a can't be empty, so
* we have this empty source file to keep it company. * we have this empty source file to keep it company.
*/ */
nuttx-configs/px4io-v2/include/board.h
+1 -1
View File
@@ -138,7 +138,7 @@ extern "C" {
************************************************************************************/ ************************************************************************************/
EXTERN void stm32_boardinitialize(void); EXTERN void stm32_boardinitialize(void);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
nuttx-configs/px4io-v2/src/empty.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* /*
* There are no source files here, but libboard.a can't be empty, so * There are no source files here, but libboard.a can't be empty, so
* we have this empty source file to keep it company. * we have this empty source file to keep it company.
*/ */