From b909a110cdf8b07761c15f8c6a3e21f43af6492e Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Tue, 24 May 2022 16:20:17 +0200 Subject: [PATCH] AP_HAL_ChibiOS: fix executable permission and trailing whitespace --- .../AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm | 0 .../AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat | 0 .../AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat | 14 +++++++------- libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat | 16 ++++++++-------- .../hwdef/H757I_EVAL_intf/hwdef-bl.dat | 2 +- .../hwdef/H757I_EVAL_intf/hwdef.dat | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat mode change 100755 => 100644 libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm old mode 100755 new mode 100644 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat old mode 100755 new mode 100644 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat old mode 100755 new mode 100644 index bfb42fe0cb..ee5d9f2304 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat @@ -63,7 +63,7 @@ PG13 SPI6_SCK SPI6 PG12 SPI6_MISO SPI6 PA7 SPI6_MOSI SPI6 -# sensor +# sensor PF10 ADIS16470_CS CS PF2 RM3100_CS CS @@ -144,7 +144,7 @@ PD0 UART4_RX UART4 NODMA PD1 UART4_TX UART4 NODMA # USART6 is telem2 -PG9 USART6_RX USART6 +PG9 USART6_RX USART6 PG14 USART6_TX USART6 PG15 USART6_CTS USART6 PG8 USART6_RTS USART6 @@ -155,7 +155,7 @@ PE8 UART7_TX UART7 NODMA # SBUS, DSM port PE0 UART8_RX UART8 -PE1 UART8_TX UART8 +PE1 UART8_TX UART8 # USART3 PD8 USART3_TX USART3 NODMA @@ -232,7 +232,7 @@ SPIDEV bmi088_a SPI4 DEVID2 BMI088_A_CS MODE3 10*MHZ 10*MHZ SPIDEV bmi088_g SPI4 DEVID3 BMI088_G_CS MODE3 10*MHZ 10*MHZ SPIDEV ms5611_imu SPI4 DEVID1 MS5611_IMU_CS MODE3 20*MHZ 20*MHZ SPIDEV ms5611_board SPI6 DEVID1 MS5611_BOARD_CS MODE3 20*MHZ 20*MHZ -SPIDEV ramtron SPI2 DEVID1 FRAM_CS MODE3 8*MHZ 8*MHZ +SPIDEV ramtron SPI2 DEVID1 FRAM_CS MODE3 8*MHZ 8*MHZ SPIDEV rm3100 SPI2 DEVID2 RM3100_CS MODE3 2*MHZ 8*MHZ #Mount icm20649 or icm20689 on SPI6 @@ -261,8 +261,8 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES COMPASS IST8310 I2C:ALL_EXTERNAL:0x0E true ROTATION_ROLL_180_YAW_90 COMPASS IST8310 I2C:ALL_INTERNAL:0x0E false ROTATION_ROLL_180_YAW_90 -COMPASS RM3100 SPI:rm3100 false ROTATION_NONE - +COMPASS RM3100 SPI:rm3100 false ROTATION_NONE + # microSD support PC8 SDMMC1_D0 SDMMC1 @@ -304,4 +304,4 @@ define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" DMA_PRIORITY ADC* SPI1* TIM*UP* -DMA_NOSHARE SPI1* TIM*UP* +DMA_NOSHARE SPI1* TIM*UP* diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat old mode 100755 new mode 100644 index 933f94e2cd..ab3897d07b --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat @@ -1,5 +1,5 @@ # hw definition file for processing by chibios_hwdef.py -# for F4BY v2.1.5 board description http://swift-flyer.com/?page_id=83 +# for F4BY v2.1.5 board description http://swift-flyer.com/?page_id=83 # MCU class and specific type MCU STM32F4xx STM32F407xx @@ -8,8 +8,8 @@ MCU STM32F4xx STM32F407xx APJ_BOARD_ID 20 # USB setup -USB_VENDOR 0x27AC # Swift-Flyer -USB_PRODUCT 0x0201 # fmu usb driver +USB_VENDOR 0x27AC # Swift-Flyer +USB_PRODUCT 0x0201 # fmu usb driver USB_STRING_MANUFACTURER "Swift-Flyer" FLASH_SIZE_KB 1024 @@ -61,7 +61,7 @@ PD8 USART3_TX USART3 NODMA PD9 USART3_RX USART3 PC10 UART4_TX UART4 NODMA -PC11 UART4_RX UART4 +PC11 UART4_RX UART4 # SHARE dma with I2C2_TX PC12 UART5_TX UART5 NODMA @@ -85,7 +85,7 @@ PB12 FRAM_CS CS SPEED_VERYLOW PE15 FLASH_CS CS SPIDEV mpu6000 SPI1 DEVID1 MPU_CS MODE3 1*MHZ 8*MHZ -SPIDEV ramtron SPI2 DEVID2 FRAM_CS MODE3 8*MHZ 8*MHZ +SPIDEV ramtron SPI2 DEVID2 FRAM_CS MODE3 8*MHZ 8*MHZ SPIDEV sdcard SPI2 DEVID3 FLASH_CS MODE0 400*KHZ 25*MHZ # one IMU @@ -106,8 +106,8 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" # this defines the default maximum clock on I2C devices. define HAL_I2C_MAX_CLOCK 100000 I2C_ORDER I2C2 I2C1 -PB8 I2C1_SCL I2C1 -PB9 I2C1_SDA I2C1 +PB8 I2C1_SCL I2C1 +PB9 I2C1_SDA I2C1 PB10 I2C2_SCL I2C2 PB11 I2C2_SDA I2C2 @@ -152,7 +152,7 @@ PC1 RSSI_IN ADC1 PC2 BATT_CURRENT_SENS ADC1 SCALE(2) PC3 BATT_VOLTAGE_SENS ADC1 SCALE(2) PC4 VDD_5V_SENS ADC1 SCALE(2) -PC5 FMU_SERVORAIL_VCC_SENS ADC1 SCALE(2) +PC5 FMU_SERVORAIL_VCC_SENS ADC1 SCALE(2) PE5 TIM9_CH1 TIM9 ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat old mode 100755 new mode 100644 index a335710110..8a023dc939 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat @@ -73,4 +73,4 @@ PB13 VBUS INPUT OPENDRAIN define CAN_APP_NODE_NAME "org.cubepilot.H757" -define BOOTLOADER_DEBUG SD1 \ No newline at end of file +define BOOTLOADER_DEBUG SD1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat old mode 100755 new mode 100644 index 6fe1266038..337fbbfa6d --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef.dat @@ -72,7 +72,7 @@ define DISABLE_SERIAL_ESC_COMM TRUE PB13 VBUS INPUT OPENDRAIN # QSPI Flash -# we only declare this so that initialisation +# we only declare this so that initialisation # doesn't reset these pins PF8 QUADSPI_BK1_IO0 QUADSPI1 PF9 QUADSPI_BK1_IO1 QUADSPI1