Stylistic improvements.

cmake/FindCMSIS.cmake

@@ -1,7 +1,9 @@
 if(NOT CMSIS_FIND_COMPONENTS)
-    set(CMSIS_FIND_COMPONENTS 
-        STM32F0 STM32G0 STM32L0 STM32F1 STM32L1 STM32F2 STM32F3 STM32F4 STM32G4 
-        STM32L4 STM32F7 STM32H7
+    set(CMSIS_FIND_COMPONENTS
+        STM32F0 STM32F1 STM32F2 STM32F3 STM32F4 STM32F7
+        STM32G0 STM32G4
+        STM32H7
+        STM32L0 STM32L1 STM32L4
     )
 endif()
 

cmake/FindHAL.cmake

@@ -1,17 +1,3 @@
-set(HAL_DRIVERS_F4
-    adc can cec cortex crc cryp dac dcmi dfsdm dma dma2d dsi eth exti flash
-    flash_ramfunc fmpi2c gpio hash hcd i2c i2s irda iwdg lptim ltdc mmc nand nor 
-    pccard pcd pwr qspi rcc rng rtc sai sd sdram smartcard smbus spdifrx spi 
-    sram tim uart usart wwdg
-)
-set(HAL_EX_DRIVERS_F4
-    adc cryp dac dcmi dma flash fmpi2c hash i2c i2s ltdc pcd pwr rcc rtc sai tim 
-)
-set(HAL_LL_DRIVERS_F4
-    adc crc dac dma dma2d exti fmc fsmc gpio i2c lptim pwr rcc rng rtc sdmmc spi 
-    tim usart usb utils 
-)
-
 set(HAL_DRIVERS_F0
     adc can cec comp cortex crc dac dma exti flash gpio i2c i2s irda iwdg pcd 
     pwr rcc rtc smartcard smbus spi tim tsc uart usart wwdg
@@ -23,31 +9,6 @@ set(HAL_LL_DRIVERS_F0
     adc comp crc crs dac dma exti gpio i2c pwr rcc rtc spi tim usart usb utils
 )
 
-set(HAL_DRIVERS_G0
-    adc cec comp cortex crc cryp dac dma exti flash gpio i2c i2s irda iwdg lptim 
-    pwr rcc rng rtc smartcard smbus spi tim uart usart wwdg
-)
-set(HAL_EX_DRIVERS_G0
-    adc crc cryp dac dma flash i2c pwr rcc rtc smartcard spi tim uart usart
-)
-set(HAL_LL_DRIVERS_G0
-    adc comp crc dac dma exti gpio i2c lptim lpuart pwr rcc rng rtc spi tim ucpd 
-    usart utils
-)
-
-set(HAL_DRIVERS_L0
-    adc comp cortex crc cryp dac dma firewall flash flash_ramfunc gpio i2c i2s 
-    irda iwdg lcd lptim pcd pwr rcc rng rtc smartcard smbus spi tim tsc uart 
-    usart wwdg
-)
-set(HAL_EX_DRIVERS_L0
-    adc comp crc cryp dac flash i2c pcd pwr rcc rtc smartcard tim uart
-)
-set(HAL_LL_DRIVERS_L0
-    adc comp crc crs dac dma exti gpio i2c lptim lpuart pwr rcc rng rtc spi tim 
-    usart usb utils
-)
-
 set(HAL_DRIVERS_F1
     adc can cec cortex crc dac dma eth exti flash gpio hcd i2c i2s irda iwdg 
     mmc nand nor pccard pcd pwr rcc rtc sd smartcard spi sram tim uart usart 
@@ -60,18 +21,6 @@ set(HAL_LL_DRIVERS_F1
     adc crc dac dma exti fsmc gpio i2c pwr rcc rtc sdmmc spi tim usart usb utils
 )
 
-set(HAL_DRIVERS_L1
-    adc comp cortex crc cryp dac dma flash flash_ramfunc gpio i2c i2s irda iwdg 
-    lcd nor opamp pcd pwr rcc rtc sd smartcard spi sram tim uart usart wwdg
-)
-set(HAL_EX_DRIVERS_L1
-    adc cryp dac flash opamp pcd pcd pwr rcc rtc tim
-)
-set(HAL_LL_DRIVERS_L1
-    adc comp crc dac dma exti fsmc gpio i2c opamp pwr rcc rtc sdmmc spi tim 
-    usart usb utils
-)
-
 set(HAL_DRIVERS_F2
     adc can cortex crc cryp dac dcmi dma eth exti flash gpio hash hcd i2c i2s 
     irda iwdg mmc nand nor pccard pcd pwr rcc rng rtc sd smartcard spi sram tim 
@@ -98,33 +47,18 @@ set(HAL_LL_DRIVERS_F3
     usb utils
 )
 
-set(HAL_DRIVERS_G4
-    adc comp cordic cortex crc cryp dac dma exti fdcan flash flash_ramfunc fmac 
-    gpio hrtim i2c i2s irda iwdg lptim nand nor opamp pcd pwr qspi rcc rng rtc 
-    sai smartcard smbus spi sram tim uart usart wwdg
-)
-set(HAL_EX_DRIVERS_G4
-    adc crc cryp dac dma flash i2c opamp pcd pwr rcc rtc sai smartcard spi tim 
-    uart usart
-)
-set(HAL_LL_DRIVERS_G4
-    adc comp cordic crc crs dac dma exti fmac fmc gpio hrtim i2c lptim lpuart 
-    opamp pwr rcc rng rtc spi tim ucpd usart usb utils
-)
-
-set(HAL_DRIVERS_L4
-    adc can comp cortex crc cryp dac dcmi dfsdm dma dma2d dsi exti firewall 
-    flash flash_ramfunc gfxmmu gpio hash hcd i2c irda iwdg lcd lptim ltdc mmc 
-    nand nor opamp ospi pcd pka pssi pwr qspi rcc rng rtc sai sd smartcard smbus 
-    spi sram swpmi tim tsc uart usart wwdg
+set(HAL_DRIVERS_F4
+    adc can cec cortex crc cryp dac dcmi dfsdm dma dma2d dsi eth exti flash
+    flash_ramfunc fmpi2c gpio hash hcd i2c i2s irda iwdg lptim ltdc mmc nand nor 
+    pccard pcd pwr qspi rcc rng rtc sai sd sdram smartcard smbus spdifrx spi 
+    sram tim uart usart wwdg
 )
-set(HAL_EX_DRIVERS_L4
-    adc crc cryp dac dfsdm dma flash hash i2c ltdc mmc opamp pcd pwr rcc rng rtc 
-    sai sd smartcard spi tim uart usart
+set(HAL_EX_DRIVERS_F4
+    adc cryp dac dcmi dma flash fmpi2c hash i2c i2s ltdc pcd pwr rcc rtc sai tim 
 )
-set(HAL_LL_DRIVERS_L4
-    adc comp crc crs dac dma dma2d exti fmc gpio i2c lptim lpuart opamp pka pwr 
-    rcc rng rtc sdmmc spi swpmi tim usart usb utils
+set(HAL_LL_DRIVERS_F4
+    adc crc dac dma dma2d exti fmc fsmc gpio i2c lptim pwr rcc rng rtc sdmmc spi 
+    tim usart usb utils 
 )
 
 set(HAL_DRIVERS_F7
@@ -142,6 +76,32 @@ set(HAL_LL_DRIVERS_F7
     usart usb utils
 )
 
+set(HAL_DRIVERS_G0
+    adc cec comp cortex crc cryp dac dma exti flash gpio i2c i2s irda iwdg lptim 
+    pwr rcc rng rtc smartcard smbus spi tim uart usart wwdg
+)
+set(HAL_EX_DRIVERS_G0
+    adc crc cryp dac dma flash i2c pwr rcc rtc smartcard spi tim uart usart
+)
+set(HAL_LL_DRIVERS_G0
+    adc comp crc dac dma exti gpio i2c lptim lpuart pwr rcc rng rtc spi tim ucpd 
+    usart utils
+)
+
+set(HAL_DRIVERS_G4
+    adc comp cordic cortex crc cryp dac dma exti fdcan flash flash_ramfunc fmac 
+    gpio hrtim i2c i2s irda iwdg lptim nand nor opamp pcd pwr qspi rcc rng rtc 
+    sai smartcard smbus spi sram tim uart usart wwdg
+)
+set(HAL_EX_DRIVERS_G4
+    adc crc cryp dac dma flash i2c opamp pcd pwr rcc rtc sai smartcard spi tim 
+    uart usart
+)
+set(HAL_LL_DRIVERS_G4
+    adc comp cordic crc crs dac dma exti fmac fmc gpio hrtim i2c lptim lpuart 
+    opamp pwr rcc rng rtc spi tim ucpd usart usb utils
+)
+
 set(HAL_DRIVERS_H7
     adc cec comp cortex crc cryp dac dcmi dfsdm dma dma2d dsi dts eth exti fdcan
     flash gfxmmu gpio hash hrtim hsem i2c i2s irda iwdg jpeg lptim ltdc mdios 
@@ -157,10 +117,52 @@ set(HAL_LL_DRIVERS_H7
     lpuart mdma opamp pwr rcc rng rtc sdmmc spi swpmi tim usart usb utils
 )
 
+set(HAL_DRIVERS_L0
+    adc comp cortex crc cryp dac dma firewall flash flash_ramfunc gpio i2c i2s 
+    irda iwdg lcd lptim pcd pwr rcc rng rtc smartcard smbus spi tim tsc uart 
+    usart wwdg
+)
+set(HAL_EX_DRIVERS_L0
+    adc comp crc cryp dac flash i2c pcd pwr rcc rtc smartcard tim uart
+)
+set(HAL_LL_DRIVERS_L0
+    adc comp crc crs dac dma exti gpio i2c lptim lpuart pwr rcc rng rtc spi tim 
+    usart usb utils
+)
+
+set(HAL_DRIVERS_L1
+    adc comp cortex crc cryp dac dma flash flash_ramfunc gpio i2c i2s irda iwdg 
+    lcd nor opamp pcd pwr rcc rtc sd smartcard spi sram tim uart usart wwdg
+)
+set(HAL_EX_DRIVERS_L1
+    adc cryp dac flash opamp pcd pcd pwr rcc rtc tim
+)
+set(HAL_LL_DRIVERS_L1
+    adc comp crc dac dma exti fsmc gpio i2c opamp pwr rcc rtc sdmmc spi tim 
+    usart usb utils
+)
+
+set(HAL_DRIVERS_L4
+    adc can comp cortex crc cryp dac dcmi dfsdm dma dma2d dsi exti firewall 
+    flash flash_ramfunc gfxmmu gpio hash hcd i2c irda iwdg lcd lptim ltdc mmc 
+    nand nor opamp ospi pcd pka pssi pwr qspi rcc rng rtc sai sd smartcard smbus 
+    spi sram swpmi tim tsc uart usart wwdg
+)
+set(HAL_EX_DRIVERS_L4
+    adc crc cryp dac dfsdm dma flash hash i2c ltdc mmc opamp pcd pwr rcc rng rtc 
+    sai sd smartcard spi tim uart usart
+)
+set(HAL_LL_DRIVERS_L4
+    adc comp crc crs dac dma dma2d exti fmc gpio i2c lptim lpuart opamp pka pwr 
+    rcc rng rtc sdmmc spi swpmi tim usart usb utils
+)
+
 if(NOT HAL_FIND_COMPONENTS)
-    set(HAL_FIND_COMPONENTS 
-        STM32F0 STM32G0 STM32L0 STM32F1 STM32L1 STM32F2 STM32F3 STM32F4 STM32G4 
-        STM32L4 STM32F7 STM32H7
+    set(HAL_FIND_COMPONENTS
+        STM32F0 STM32F1 STM32F2 STM32F3 STM32F4 STM32F7
+        STM32G0 STM32G4
+        STM32H7
+        STM32L0 STM32L1 STM32L4
     )
 endif()
 
@@ -209,8 +211,7 @@ foreach(COMP ${HAL_FIND_COMPONENTS})
 
     if(NOT (TARGET HAL::STM32::${FAMILY}))
         add_library(HAL::STM32::${FAMILY} INTERFACE IMPORTED)
-        target_link_libraries(HAL::STM32::${FAMILY} INTERFACE STM32::${FAMILY})
-        target_link_libraries(HAL::STM32::${FAMILY} INTERFACE CMSIS::STM32::${FAMILY})
+        target_link_libraries(HAL::STM32::${FAMILY} INTERFACE STM32::${FAMILY} CMSIS::STM32::${FAMILY})
         target_include_directories(HAL::STM32::${FAMILY} INTERFACE "${HAL_${FAMILY}_INCLUDE}")
         target_sources(HAL::STM32::${FAMILY} INTERFACE "${HAL_${FAMILY}_SOURCE}")
     endif()
@@ -226,7 +227,7 @@ foreach(COMP ${HAL_FIND_COMPONENTS})
         )
         list(APPEND HAL_${FAMILY}_SOURCES "${HAL_${FAMILY}_${DRV}_SOURCE}")
         if(NOT HAL_${FAMILY}_${DRV}_SOURCE)
-            message(WARNING "Cannot found ${DRV} driver for ${COMP}")
+            message(WARNING "Cannot find ${DRV} driver for ${COMP}")
         endif()
                 
         if(HAL_${FAMILY}_${DRV}_SOURCE AND (NOT (TARGET HAL::STM32::${FAMILY}::${DRV})))
@@ -243,7 +244,7 @@ foreach(COMP ${HAL_FIND_COMPONENTS})
             )
             list(APPEND HAL_${FAMILY}_SOURCES "${HAL_${FAMILY}_${DRV}_EX_SOURCE}")
             if(NOT HAL_${FAMILY}_${DRV}_EX_SOURCE)
-                message(WARNING "Cannot found ${DRV}Ex driver for ${COMP}")
+                message(WARNING "Cannot find ${DRV}Ex driver for ${COMP}")
             endif()
             
             if((TARGET HAL::STM32::${FAMILY}::${DRV}) AND (NOT (TARGET HAL::STM32::${FAMILY}::${DRV}Ex)))
@@ -265,7 +266,7 @@ foreach(COMP ${HAL_FIND_COMPONENTS})
         )
         list(APPEND HAL_${FAMILY}_SOURCES "${HAL_${FAMILY}_${DRV}_LL_SOURCE}")
         if(NOT HAL_${FAMILY}_${DRV}_LL_SOURCE)
-            message(WARNING "Cannot found LL_${DRV} driver for ${COMP}")
+            message(WARNING "Cannot find LL_${DRV} driver for ${COMP}")
         endif()
     
         if(HAL_${FAMILY}_${DRV}_LL_SOURCE AND (NOT (TARGET HAL::STM32::${FAMILY}::LL_${DRV})))
@@ -285,7 +286,7 @@ foreach(COMP ${HAL_FIND_COMPONENTS})
         
     if(HAL_${COMP}_FOUND)
         list(APPEND HAL_INCLUDE_DIRS "${HAL_${FAMILY}_INCLUDE}")
-        list(APPEND HAL_SOURCES HAL_${FAMILY}_SOURCES)
+        list(APPEND HAL_SOURCES "${HAL_${FAMILY}_SOURCES}")
     endif()
 endforeach()
 

cmake/stm32/common.cmake

@@ -1,4 +1,4 @@
-set(STM32_SUPPORTED_FAMILIES L0 L1 L4 F0 F1 F2 F3 F4 G4 L4 F7 H7)
+set(STM32_SUPPORTED_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
 
 if(NOT STM32_TOOLCHAIN_PATH)
      set(STM32_TOOLCHAIN_PATH "/usr")
@@ -99,7 +99,7 @@ function(stm32_get_memory_info FAMILY DEVICE
         set(FLASH "192K")
     else()
         set(FLASH "16K")
-        message(WARNING "Unknow flash size for device ${DEVICE}")
+        message(WARNING "Unknow flash size for device ${DEVICE}. Set to ${FLASH}")
     endif()
     
     stm32_get_chip_type(${FAMILY} ${DEVICE} TYPE)
@@ -146,17 +146,16 @@ endif()
 
 include(stm32/utilities)
 include(stm32/f0)
-include(stm32/g0)
-include(stm32/l0)
 include(stm32/f1)
-include(stm32/l1)
 include(stm32/f2)
 include(stm32/f3)
 include(stm32/f4)
-include(stm32/g4)
-include(stm32/l4)
 include(stm32/f7)
+include(stm32/g0)
+include(stm32/g4)
 include(stm32/h7)
-
+include(stm32/l0)
+include(stm32/l1)
+include(stm32/l4)
 
 

examples/blinky/blinky.c

@@ -1,58 +1,58 @@
 #if defined STM32L0
-	#include <stm32l0xx_hal.h>
+    #include <stm32l0xx_hal.h>
 
-	// STM32L0538-Discovery green led - PB4
-	#define LED_PORT				GPIOB
-	#define LED_PIN					GPIO_PIN_4
-	#define LED_PORT_CLK_ENABLE		__HAL_RCC_GPIOB_CLK_ENABLE
+    // STM32L0538-Discovery green led - PB4
+    #define LED_PORT                GPIOB
+    #define LED_PIN                 GPIO_PIN_4
+    #define LED_PORT_CLK_ENABLE     __HAL_RCC_GPIOB_CLK_ENABLE
 #elif defined STM32F1
-	#include <stm32f1xx_hal.h>
+    #include <stm32f1xx_hal.h>
 
-	// STM32VL-Discovery green led - PC9
-	#define LED_PORT				GPIOC
-	#define LED_PIN					GPIO_PIN_9
-	#define LED_PORT_CLK_ENABLE		__HAL_RCC_GPIOC_CLK_ENABLE
+    // STM32VL-Discovery green led - PC9
+    #define LED_PORT                GPIOC
+    #define LED_PIN                 GPIO_PIN_9
+    #define LED_PORT_CLK_ENABLE     __HAL_RCC_GPIOC_CLK_ENABLE
 #elif defined STM32F4
-	#include <stm32f4xx_hal.h>
+    #include <stm32f4xx_hal.h>
 
-	// STM32F4-Discovery green led - PD12
-	#define LED_PORT				GPIOD
-	#define LED_PIN					GPIO_PIN_12
-	#define LED_PORT_CLK_ENABLE		__HAL_RCC_GPIOD_CLK_ENABLE
+    // STM32F4-Discovery green led - PD12
+    #define LED_PORT                GPIOD
+    #define LED_PIN                 GPIO_PIN_12
+    #define LED_PORT_CLK_ENABLE     __HAL_RCC_GPIOD_CLK_ENABLE
 #endif
 
 void SysTick_Handler(void)
 {
-	HAL_IncTick();
+    HAL_IncTick();
 
-	// 1 Hz blinking
-	if ((HAL_GetTick() % 500) == 0)
-		HAL_GPIO_TogglePin(LED_PORT, LED_PIN);
+    // 1 Hz blinking
+    if ((HAL_GetTick() % 500) == 0)
+        HAL_GPIO_TogglePin(LED_PORT, LED_PIN);
 }
 
 void initGPIO()
 {
     GPIO_InitTypeDef GPIO_Config;
 
-	GPIO_Config.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_Config.Mode = GPIO_MODE_OUTPUT_PP;
     GPIO_Config.Pull = GPIO_NOPULL;
-	GPIO_Config.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_Config.Speed = GPIO_SPEED_FREQ_HIGH;
 
-	GPIO_Config.Pin = LED_PIN;
+    GPIO_Config.Pin = LED_PIN;
 
-	LED_PORT_CLK_ENABLE();
-	HAL_GPIO_Init(LED_PORT, &GPIO_Config);
+    LED_PORT_CLK_ENABLE();
+    HAL_GPIO_Init(LED_PORT, &GPIO_Config);
 }
 
 int main(void)
 {
-	HAL_Init();
-	initGPIO();
-	// 1kHz ticks
-	HAL_SYSTICK_Config(SystemCoreClock / 1000);
+    HAL_Init();
+    initGPIO();
+    // 1kHz ticks
+    HAL_SYSTICK_Config(SystemCoreClock / 1000);
 
-	for (;;)
-		__WFI();
+    for (;;)
+        __WFI();
 
     return 0;
 }

tests/cmsis/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 G0 L0 F1 L1 F2 F3 F4 G4 L4 F7 H7)
+    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
 endif()
 
 project(cmsis-test C ASM)

tests/hal/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 G0 L0 F1 L1 F2 F3 F4 G4 L4 F7 H7)
+    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
 endif()
 
 project(hal-test C ASM)