diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2017-05-11 12:15:54 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2017-05-16 23:24:12 +0200 |
| commit | ce168959907bc922875902a703a1aebe2296ad2c (patch) | |
| tree | af29c1d4465841981b7fcbbc9b044d64d938272e | |
| parent | 4d8f75c97b8f384f8452d27b50b68cf594bc779a (diff) | |
| download | radio-controller-ce168959907bc922875902a703a1aebe2296ad2c.tar.gz radio-controller-ce168959907bc922875902a703a1aebe2296ad2c.tar.bz2 radio-controller-ce168959907bc922875902a703a1aebe2296ad2c.tar.xz radio-controller-ce168959907bc922875902a703a1aebe2296ad2c.zip | |
o Cleaning up generated files, removing space at end of line.
| -rwxr-xr-x | fix-stm32cubemx-files | 2 | ||||
| -rw-r--r-- | stm32cubemx/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h | 6 | ||||
| -rw-r--r-- | stm32cubemx/Inc/usb_device.h | 2 | ||||
| -rw-r--r-- | stm32cubemx/Src/usbd_conf.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/fix-stm32cubemx-files b/fix-stm32cubemx-files index 141d4a1..da25c95 100755 --- a/fix-stm32cubemx-files +++ b/fix-stm32cubemx-files @@ -2,7 +2,7 @@ find stm32cubemx -type f |while read file do - cat $file | dos2unix | sed 's, *$,,g' > $file.tmp + cat $file | dos2unix | sed -e 's,[\t ]*$,,g' > $file.tmp cnt=$(diff $file.tmp $file | wc -l) if [[ $cnt -gt 0 ]] diff --git a/stm32cubemx/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/stm32cubemx/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h index 8b2bd1c..ef1a2bb 100644 --- a/stm32cubemx/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h +++ b/stm32cubemx/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h @@ -2616,7 +2616,7 @@ #define SdioClockSelection Sdmmc1ClockSelection #define RCC_PERIPHCLK_SDIO RCC_PERIPHCLK_SDMMC1 #define __HAL_RCC_SDIO_CONFIG __HAL_RCC_SDMMC1_CONFIG -#define __HAL_RCC_GET_SDIO_SOURCE __HAL_RCC_GET_SDMMC1_SOURCE +#define __HAL_RCC_GET_SDIO_SOURCE __HAL_RCC_GET_SDMMC1_SOURCE #endif #if defined(STM32F7) @@ -2858,8 +2858,8 @@ #define __HAL_SD_SDMMC_CLEAR_FLAG __HAL_SD_SDIO_CLEAR_FLAG #define __HAL_SD_SDMMC_GET_IT __HAL_SD_SDIO_GET_IT #define __HAL_SD_SDMMC_CLEAR_IT __HAL_SD_SDIO_CLEAR_IT -#define SDMMC_STATIC_FLAGS SDIO_STATIC_FLAGS -#define SDMMC_CMD0TIMEOUT SDIO_CMD0TIMEOUT +#define SDMMC_STATIC_FLAGS SDIO_STATIC_FLAGS +#define SDMMC_CMD0TIMEOUT SDIO_CMD0TIMEOUT #define SD_SDMMC_SEND_IF_COND SD_SDIO_SEND_IF_COND /* alias CMSIS */ #define SDMMC1_IRQn SDIO_IRQn diff --git a/stm32cubemx/Inc/usb_device.h b/stm32cubemx/Inc/usb_device.h index da3349c..323ff0c 100644 --- a/stm32cubemx/Inc/usb_device.h +++ b/stm32cubemx/Inc/usb_device.h @@ -55,7 +55,7 @@ extern USBD_HandleTypeDef hUsbDeviceFS; -/* USB_Device init function */ +/* USB_Device init function */ void MX_USB_DEVICE_Init(void); #ifdef __cplusplus diff --git a/stm32cubemx/Src/usbd_conf.c b/stm32cubemx/Src/usbd_conf.c index 36db934..858fb0c 100644 --- a/stm32cubemx/Src/usbd_conf.c +++ b/stm32cubemx/Src/usbd_conf.c @@ -167,7 +167,7 @@ void HAL_PCD_ResetCallback(PCD_HandleTypeDef *hpcd) case PCD_SPEED_FULL: speed = USBD_SPEED_FULL; break; - + default: speed = USBD_SPEED_FULL; break; @@ -741,7 +741,7 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) if (state == 1) { /* Configure Low Connection State */ - + } else { |