noisymime
/
STM32GENERIC
mirror of https://github.com/noisymime/STM32GENERIC.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

variant: fix f303 variant file coding

This commit is contained in:
Daniel Fekete 2017-06-24 09:17:37 +02:00
parent 20b186d387
commit 1611d28ecf
4 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32/boards.txt
View File

@ -538,7 +538,7 @@ NUCLEO_144.build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART3
NUCLEO_144.menu.subboard.Nucleo_F767ZI=Nucleo-F767ZI
NUCLEO_144.menu.subboard.Nucleo_F767ZI.upload.maximum_size=2097152
NUCLEO_144.menu.subboard.Nucleo_F767ZI.upload.maximum_data_size=524288
NUCLEO_144.menu.subboard.Nucleo_F767ZI.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DHSE_VALUE=((uint32_t)8000000)
NUCLEO_144.menu.subboard.Nucleo_F767ZI.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DHSE_VALUE=8000000
NUCLEO_144.menu.subboard.Nucleo_F767ZI.build.series=STM32F7
NUCLEO_144.menu.subboard.Nucleo_F767ZI.build.variant=NUCLEO_F767ZI
NUCLEO_144.menu.subboard.Nucleo_F767ZI.build.extra_flags=-DSTM32F767ZI

37
STM32/variants/DISCOVERY_F303VC/ variant.c
View File

@ -1,37 +0,0 @@
#include "stm32_build_defines.h"#include "stm32_def.h"void Error_Handler(void);
void SystemClock_Config(void){
  RCC_OscInitTypeDef RCC_OscInitStruct;
RCC_ClkInitTypeDef RCC_ClkInitStruct;
RCC_PeriphCLKInitTypeDef PeriphClkInit;
  /**Initializes the CPU, AHB and APB busses clocks     */
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE;
RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
RCC_OscInitStruct.HSICalibrationValue = 16;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
{
Error_Handler();
}
  /**Initializes the CPU, AHB and APB busses clocks     */
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)  {    Error_Handler();  }
  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB|RCC_PERIPHCLK_USART1|RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_USART3                              |RCC_PERIPHCLK_I2C1|RCC_PERIPHCLK_TIM1                              |RCC_PERIPHCLK_TIM1|RCC_PERIPHCLK_ADC12                              |RCC_PERIPHCLK_ADC34;  PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2;  PeriphClkInit.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1;  PeriphClkInit.Usart3ClockSelection = RCC_USART3CLKSOURCE_PCLK1;  PeriphClkInit.Adc12ClockSelection = RCC_ADC12PLLCLK_DIV1;  PeriphClkInit.Adc34ClockSelection = RCC_ADC34PLLCLK_DIV1;  PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI;  PeriphClkInit.USBClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;  PeriphClkInit.Tim1ClockSelection = RCC_TIM1CLK_HCLK;  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)  {    Error_Handler();  }
  /**Configure the Systick interrupt time     */
HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
  /**Configure the Systick     */
HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
  /* SysTick_IRQn interrupt configuration */
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);}/* USER CODE END 2 */
//void SystemClock_Config(void)
//{//#if defined(RUN_HSI)
//  SystemClock_Config_HSI();//#else//  SystemClock_Config_HSE();//#endif  //}
/**  * @}  * @}  */
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

40
STM32/variants/DISCOVERY_F303VC/variant.c Normal file
View File

@ -0,0 +1,40 @@
#include "stm32_build_defines.h"
#include "stm32_def.h"
void Error_Handler(void);
void SystemClock_Config(void){
RCC_OscInitTypeDef RCC_OscInitStruct;
RCC_ClkInitTypeDef RCC_ClkInitStruct;
RCC_PeriphCLKInitTypeDef PeriphClkInit;
/**Initializes the CPU, AHB and APB busses clocks */
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE;
RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
RCC_OscInitStruct.HSICalibrationValue = 16;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
{
Error_Handler();
}
/**Initializes the CPU, AHB and APB busses clocks */
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) { Error_Handler(); }
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB|RCC_PERIPHCLK_USART1|RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_USART3 |RCC_PERIPHCLK_I2C1|RCC_PERIPHCLK_TIM1 |RCC_PERIPHCLK_TIM1|RCC_PERIPHCLK_ADC12 |RCC_PERIPHCLK_ADC34; PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; PeriphClkInit.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1; PeriphClkInit.Usart3ClockSelection = RCC_USART3CLKSOURCE_PCLK1; PeriphClkInit.Adc12ClockSelection = RCC_ADC12PLLCLK_DIV1; PeriphClkInit.Adc34ClockSelection = RCC_ADC34PLLCLK_DIV1; PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI; PeriphClkInit.USBClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5; PeriphClkInit.Tim1ClockSelection = RCC_TIM1CLK_HCLK; if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) { Error_Handler(); }
/**Configure the Systick interrupt time */
HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
/**Configure the Systick */
HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
/* SysTick_IRQn interrupt configuration */
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);}/* USER CODE END 2 */
//void SystemClock_Config(void)
//{//#if defined(RUN_HSI)
// SystemClock_Config_HSI();//#else// SystemClock_Config_HSE();//#endif //}
/** * @} * @} */
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

45
STM32/variants/DISCOVERY_F303VC/variant.h
View File

@ -1,31 +1,32 @@
#ifndef VARIANT_H#define VARIANT_H
#ifndef VARIANT_H
#define VARIANT_H
//On-board LED pin number           PIN 
// Arduino Pin Number        
#define BOARD_NR_LED            8
#define LED_BUILTIN             PE8
#define LED_BUILTIN1            PE9
#define LED_BUILTIN2            PE10
#define LED_BUILTIN3            PE11
#define LED_BUILTIN4            PE12
//On-board LED pin number PIN
// Arduino Pin Number
#define BOARD_NR_LED 8
#define LED_BUILTIN PE8
#define LED_BUILTIN1 PE9
#define LED_BUILTIN2 PE10
#define LED_BUILTIN3 PE11
#define LED_BUILTIN4 PE12
#define LED_BUILTIN5 PE13
#define LED_BUILTIN6            PE14
#define LED_BUILTIN7            PE15
#define LED_BUILTIN_MASK        0xFF   //ON 0
#define LED_BUILTIN6 PE14
#define LED_BUILTIN7 PE15
#define LED_BUILTIN_MASK 0xFF //ON 0
#define BOARD_NR_KEY               1
#define KEY0_BUILTIN             PA0
#define KEY0_BUILTIN_MASK        0x01    //PRESED 1
#define BOARD_NR_KEY 1
#define KEY0_BUILTIN PA0
#define KEY0_BUILTIN_MASK 0x01 //PRESED 1
//On-board user button
#define USER_BTN                  PA0  // 2
#define USER_BTN PA0 // 2
// Connected to on board LIS3DSH accelerometer, CS: PE3
#define MOSI                        PA7
#define MISO                        PA6
#define SCK                         PA5
#define SS                          PA4
#define MOSI PA7
#define MISO PA6
#define SCK PA5
#define SS PA4
// Connected to on board CS43L22 audio
#define SDA                         PB9
#define SCL                         PB6
#define SDA PB9
#define SCL PB6
#endif