Skip to content

Commit 11b5cca

Browse files
fpistmfpistm
committed
Add Nucleo-F303RE variant
Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent 2246ef1 commit 11b5cca

26 files changed

+3713
-43
lines changed

‎boards.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,22 @@ Nucleo_64.menu.Nucleo_64_board.NUCLEO_F091RC.build.cmsis_lib_gcc=arm_cortexM0l_m
7474
#To enable HID (keyboard and mouse support) add also '-DUSBD_USE_HID_COMPOSITE'
7575
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F091RC.build.extra_flags=-DSTM32F091xC {build.usb_flags}
7676

77+
# NUCLEO_F303RE board
78+
79+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE=Nucleo F303RE
80+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.node=NODE_F303RE
81+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.upload.maximum_size=524288
82+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.upload.maximum_data_size=65536
83+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.mcu=cortex-m4
84+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.f_cpu=8000000L
85+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.usb_product="NUCLEO-F303RE"
86+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.board=NUCLEO_F303RE
87+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.series=STM32F3xx
88+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.variant=NUCLEO_F303RE
89+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.cmsis_lib_gcc=arm_cortexM4l_math
90+
#To enable USB add '-DUSBCON'
91+
#To enable HID (keyboard and mouse support) add also '-DUSBD_USE_HID_COMPOSITE'
92+
Nucleo_64.menu.Nucleo_64_board.NUCLEO_F303RE.build.extra_flags=-DSTM32F303xE {build.usb_flags}
7793

7894
Nucleo_64.menu.upload_method.MassStorageMethod=Mass Storage
7995
Nucleo_64.menu.upload_method.MassStorageMethod.upload.protocol=

‎cores/arduino/Arduino.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ extern void loop( void ) ;
6767
#include "Tone.h"
6868
#include "WMath.h"
6969
#include "HardwareSerial.h"
70+
#include "UARTClass.h"
71+
#include "USARTClass.h"
7072
#include "wiring_pulse.h"
7173
#endif // __cplusplus
7274

‎cores/arduino/UARTClass.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <stdio.h>
2121
#include <string.h>
2222
#include "UARTClass.h"
23-
#include "Arduino.h"
2423

2524
UARTClass::UARTClass(uart_id_e uart_id)
2625
{

‎cores/arduino/USARTClass.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <stdio.h>
2121
#include <string.h>
2222
#include "USARTClass.h"
23-
#include "chip.h"
2423

2524

2625
// Constructors ////////////////////////////////////////////////////////////////

‎cores/arduino/stm32/analog.c‎

Lines changed: 152 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,32 @@
6969
/** @addtogroup STM32F4xx_System_Private_Defines
7070
* @{
7171
*/
72+
#if STM32L0xx
73+
// Contained by handle
74+
#elif defined(ADC_SAMPLETIME_15CYCLES)
75+
#define SAMPLINGTIME ADC_SAMPLETIME_15CYCLES;
76+
#elif defined(ADC_SAMPLETIME_13CYCLES_5)
77+
#define SAMPLINGTIME ADC_SAMPLETIME_13CYCLES_5;
78+
#elif defined(ADC_SAMPLETIME_19CYCLES_5)
79+
#define SAMPLINGTIME ADC_SAMPLETIME_19CYCLES_5;
80+
#elif defined(ADC_SAMPLETIME_16CYCLES)
81+
#define SAMPLINGTIME ADC_SAMPLETIME_16CYCLES;
82+
#elif defined(ADC_SAMPLETIME_12CYCLES_5)
83+
#define SAMPLINGTIME ADC_SAMPLETIME_12CYCLES_5;
84+
#else
85+
#error "ADC SAMPLINGTIME could not be defined"
86+
#endif
7287

73-
#ifdef STM32F0xx
74-
#define SAMPLINGTIME ADC_SAMPLETIME_1CYCLE_5
88+
#ifdef ADC_CLOCK_SYNC_PCLK_DIV2
89+
#define ADC_CLOCK_DIV ADC_CLOCK_SYNC_PCLK_DIV2
90+
#elif defined(ADC_CLOCK_ASYNC_DIV1)
91+
#define ADC_CLOCK_DIV ADC_CLOCK_ASYNC_DIV1
92+
#elif defined(ADC_CLOCKPRESCALER_PCLK_DIV2)
93+
#define ADC_CLOCK_DIV ADC_CLOCKPRESCALER_PCLK_DIV2
7594
#else
76-
#define SAMPLINGTIME ADC_SAMPLETIME_3CYCLES /*!< ADC conversions sampling time. */
95+
#error "ADC_CLOCK_DIV could not be defined"
7796
#endif
97+
7898
#define ADC_REGULAR_RANK_1 1
7999
/**
80100
* @}
@@ -105,9 +125,11 @@ static uint32_t get_adc_channel(PinName pin)
105125
uint32_t function = pinmap_function(pin, PinMap_ADC);
106126
uint32_t channel = 0;
107127
switch(STM_PIN_CHANNEL(function)) {
128+
#ifdef ADC_CHANNEL_0
108129
case 0:
109130
channel = ADC_CHANNEL_0;
110131
break;
132+
#endif
111133
case 1:
112134
channel = ADC_CHANNEL_1;
113135
break;
@@ -174,9 +196,11 @@ static uint32_t get_dac_channel(PinName pin)
174196
uint32_t function = pinmap_function(pin, PinMap_DAC);
175197
uint32_t channel = 0;
176198
switch(STM_PIN_CHANNEL(function)) {
199+
#ifdef DAC_CHANNEL_0
177200
case 0:
178-
channel = ADC_CHANNEL_0;
201+
channel = DAC_CHANNEL_0;
179202
break;
203+
#endif
180204
case 1:
181205
channel = DAC_CHANNEL_1;
182206
break;
@@ -232,8 +256,12 @@ void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac)
232256
port = set_GPIO_Port_Clock(STM_PORT(g_current_pin));
233257

234258
/* DAC Periph clock enable */
259+
#ifdef __HAL_RCC_DAC1_CLK_ENABLE
260+
__HAL_RCC_DAC1_CLK_ENABLE();
261+
#endif
262+
#ifdef __HAL_RCC_DAC_CLK_ENABLE
235263
__HAL_RCC_DAC_CLK_ENABLE();
236-
264+
#endif
237265
/*##-2- Configure peripheral GPIO ##########################################*/
238266
/* DAC Channel1 GPIO pin configuration */
239267
GPIO_InitStruct.Pin = STM_GPIO_PIN(g_current_pin);
@@ -253,8 +281,8 @@ void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac)
253281
*/
254282
void dac_write_value(PinName pin, uint32_t value, uint8_t do_init)
255283
{
256-
DAC_HandleTypeDef DacHandle = {0};
257-
DAC_ChannelConfTypeDef dacChannelConf;
284+
DAC_HandleTypeDef DacHandle = {};
285+
DAC_ChannelConfTypeDef dacChannelConf = {};
258286
uint32_t dacChannel;
259287

260288
DacHandle.Instance = pinmap_peripheral(pin, PinMap_DAC);
@@ -307,7 +335,12 @@ void dac_write_value(PinName pin, uint32_t value, uint8_t do_init)
307335
void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac)
308336
{
309337
/* DAC Periph clock disable */
338+
#ifdef __HAL_RCC_DAC1_CLK_DISABLE
339+
__HAL_RCC_DAC1_CLK_DISABLE();
340+
#endif
341+
#ifdef __HAL_RCC_DAC_CLK_DISABLE
310342
__HAL_RCC_DAC_CLK_DISABLE();
343+
#endif
311344
}
312345

313346
/**
@@ -353,11 +386,36 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
353386
/*##-1- Enable peripherals and GPIO Clocks #################################*/
354387
/* ADC Periph clock enable */
355388
if(hadc->Instance == ADC1) {
356-
__HAL_RCC_ADC1_CLK_ENABLE();
389+
#ifdef __HAL_RCC_ADC1_CLK_ENABLE
390+
__HAL_RCC_ADC1_CLK_ENABLE();
391+
#endif
392+
#ifdef __HAL_RCC_ADC12_CLK_ENABLE
393+
__HAL_RCC_ADC12_CLK_ENABLE();
394+
#endif
357395
}
396+
#ifdef ADC2
397+
else if(hadc->Instance == ADC2) {
398+
#ifdef __HAL_RCC_ADC2_CLK_ENABLE
399+
__HAL_RCC_ADC2_CLK_ENABLE();
400+
#endif
401+
#ifdef __HAL_RCC_ADC12_CLK_ENABLE
402+
__HAL_RCC_ADC12_CLK_ENABLE();
403+
#endif
404+
}
405+
#endif
358406
#ifdef ADC3
359407
else if(hadc->Instance == ADC3) {
408+
#ifdef __HAL_RCC_ADC3_CLK_ENABLE
360409
__HAL_RCC_ADC3_CLK_ENABLE();
410+
#endif
411+
#ifdef __HAL_RCC_ADC34_CLK_ENABLE
412+
__HAL_RCC_ADC34_CLK_ENABLE();
413+
#endif
414+
}
415+
#endif
416+
#ifdef ADC4
417+
else if(hadc->Instance == ADC4) {
418+
__HAL_RCC_ADC34_CLK_ENABLE();
361419
}
362420
#endif
363421

@@ -379,18 +437,87 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
379437
*/
380438
void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
381439
{
382-
440+
#ifdef __HAL_RCC_ADC_FORCE_RESET
383441
__HAL_RCC_ADC_FORCE_RESET();
442+
#endif
443+
#ifdef __HAL_RCC_ADC_RELEASE_RESET
384444
__HAL_RCC_ADC_RELEASE_RESET();
445+
#endif
385446

386447
if(hadc->Instance == ADC1) {
387-
__HAL_RCC_ADC1_CLK_DISABLE();
448+
#ifdef __HAL_RCC_ADC1_FORCE_RESET
449+
__HAL_RCC_ADC1_FORCE_RESET();
450+
#endif
451+
#ifdef __HAL_RCC_ADC1_RELEASE_RESET
452+
__HAL_RCC_ADC1_RELEASE_RESET();
453+
#endif
454+
#ifdef __HAL_RCC_ADC12_FORCE_RESET
455+
__HAL_RCC_ADC12_FORCE_RESET();
456+
#endif
457+
#ifdef __HAL_RCC_ADC12_RELEASE_RESET
458+
__HAL_RCC_ADC12_RELEASE_RESET();
459+
#endif
460+
#ifdef __HAL_RCC_ADC1_CLK_DISABLE
461+
__HAL_RCC_ADC1_CLK_DISABLE();
462+
#endif
463+
#ifdef __HAL_RCC_ADC12_CLK_DISABLE
464+
__HAL_RCC_ADC12_CLK_DISABLE();
465+
#endif
466+
}
467+
#ifdef ADC2
468+
else if(hadc->Instance == ADC2) {
469+
#ifdef __HAL_RCC_ADC2_FORCE_RESET
470+
__HAL_RCC_ADC2_FORCE_RESET();
471+
#endif
472+
#ifdef __HAL_RCC_ADC2_RELEASE_RESET
473+
__HAL_RCC_ADC2_RELEASE_RESET();
474+
#endif
475+
#ifdef __HAL_RCC_ADC12_FORCE_RESET
476+
__HAL_RCC_ADC12_FORCE_RESET();
477+
#endif
478+
#ifdef __HAL_RCC_ADC12_RELEASE_RESET
479+
__HAL_RCC_ADC12_RELEASE_RESET();
480+
#endif
481+
#ifdef __HAL_RCC_ADC2_CLK_DISABLE
482+
__HAL_RCC_ADC2_CLK_DISABLE();
483+
#endif
484+
#ifdef __HAL_RCC_ADC2_CLK_DISABLE
485+
__HAL_RCC_ADC2_CLK_DISABLE();
486+
#endif
388487
}
488+
#endif
389489
#ifdef ADC3
390490
else if(hadc->Instance == ADC3) {
491+
#ifdef __HAL_RCC_ADC3_FORCE_RESET
492+
__HAL_RCC_ADC3_FORCE_RESET();
493+
#endif
494+
#ifdef __HAL_RCC_ADC3_RELEASE_RESET
495+
__HAL_RCC_ADC3_RELEASE_RESET();
496+
#endif
497+
#ifdef __HAL_RCC_ADC34_FORCE_RESET
498+
__HAL_RCC_ADC34_FORCE_RESET();
499+
#endif
500+
#ifdef __HAL_RCC_ADC34_RELEASE_RESET
501+
__HAL_RCC_ADC34_RELEASE_RESET();
502+
#endif
503+
#ifdef __HAL_RCC_ADC3_CLK_DISABLE
391504
__HAL_RCC_ADC3_CLK_DISABLE();
505+
#endif
506+
#ifdef __HAL_RCC_ADC34_CLK_DISABLE
507+
__HAL_RCC_ADC34_CLK_DISABLE();
508+
#endif
392509
}
393510
#endif
511+
#ifdef ADC4
512+
else if(hadc->Instance == ADC4) {
513+
__HAL_RCC_ADC34_FORCE_RESET();
514+
__HAL_RCC_ADC34_RELEASE_RESET();
515+
__HAL_RCC_ADC34_CLK_DISABLE();
516+
}
517+
#endif
518+
#ifdef __HAL_RCC_ADC_CLK_DISABLE
519+
__HAL_RCC_ADC_CLK_DISABLE();
520+
#endif
394521
}
395522

396523
/**
@@ -400,15 +527,15 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
400527
*/
401528
uint16_t adc_read_value(PinName pin)
402529
{
403-
ADC_HandleTypeDef AdcHandle;
404-
ADC_ChannelConfTypeDef AdcChannelConf;
530+
ADC_HandleTypeDef AdcHandle = {};
531+
ADC_ChannelConfTypeDef AdcChannelConf = {};
405532
__IO uint16_t uhADCxConvertedValue = 0;
406533

407534
AdcHandle.Instance = pinmap_peripheral(pin, PinMap_ADC);
408535

409536
if (AdcHandle.Instance == NC) return 0;
410537

411-
AdcHandle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2; /* Asynchronous clock mode, input ADC clock divided */
538+
AdcHandle.Init.ClockPrescaler = ADC_CLOCK_DIV; /* Asynchronous clock mode, input ADC clock divided */
412539
AdcHandle.Init.Resolution = ADC_RESOLUTION_12B; /* 12-bit resolution for converted data */
413540
AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT; /* Right-alignment for converted data */
414541
AdcHandle.Init.ScanConvMode = DISABLE; /* Sequencer disabled (ADC conversion on only 1 channel: channel set on rank 1) */
@@ -425,6 +552,9 @@ uint16_t adc_read_value(PinName pin)
425552
AdcHandle.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN; /* DR register is overwritten with the last conversion result in case of overrun */
426553
AdcHandle.Init.SamplingTimeCommon = SAMPLINGTIME;
427554
#else
555+
#ifdef STM32F3xx
556+
AdcHandle.Init.LowPowerAutoWait = DISABLE; /* Auto-delayed conversion feature disabled */
557+
#endif
428558
AdcHandle.Init.NbrOfConversion = 1; /* Specifies the number of ranks that will be converted within the regular group sequencer. */
429559
AdcHandle.Init.NbrOfDiscConversion = 0; /* Parameter discarded because sequencer is disabled */
430560
#endif
@@ -446,6 +576,15 @@ uint16_t adc_read_value(PinName pin)
446576
return 0;
447577
}
448578

579+
#ifdef STM32F3xx
580+
/*##-2.1- Calibrate ADC then Start the conversion process ####################*/
581+
if (HAL_ADCEx_Calibration_Start(&AdcHandle, ADC_SINGLE_ENDED) != HAL_OK)
582+
{
583+
/* ADC Calibration Error */
584+
return 0;
585+
}
586+
#endif
587+
449588
/*##-3- Start the conversion process ####################*/
450589
if (HAL_ADC_Start(&AdcHandle) != HAL_OK)
451590
{

‎cores/arduino/stm32/stm32_def.h‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,7 @@
4646
#error "STM32YYxx chip series is not defined in boards.txt."
4747
#endif
4848

49-
50-
#ifndef __HAL_RCC_ADC_FORCE_RESET
51-
#define __HAL_RCC_ADC_FORCE_RESET __HAL_RCC_ADC1_FORCE_RESET
52-
#endif
53-
#ifndef __HAL_RCC_ADC_RELEASE_RESET
54-
#define __HAL_RCC_ADC_RELEASE_RESET __HAL_RCC_ADC1_RELEASE_RESET
55-
#endif
56-
#ifndef __HAL_RCC_DAC_CLK_DISABLE
57-
#define __HAL_RCC_DAC_CLK_DISABLE __HAL_RCC_DAC1_CLK_DISABLE
58-
#endif
59-
#ifndef __HAL_RCC_DAC_CLK_ENABLE
60-
#define __HAL_RCC_DAC_CLK_ENABLE __HAL_RCC_DAC1_CLK_ENABLE
61-
#endif
49+
#ifdef STM32F0xx
6250
#ifndef __HAL_RCC_UART4_CLK_ENABLE
6351
#define __HAL_RCC_UART4_CLK_ENABLE __HAL_RCC_USART4_CLK_ENABLE
6452
#endif
@@ -68,7 +56,11 @@
6856
#ifndef __HAL_RCC_UART4_FORCE_RESET
6957
#define __HAL_RCC_UART4_FORCE_RESET __HAL_RCC_USART4_FORCE_RESET
7058
#endif
59+
#endif
7160

72-
73-
61+
#ifdef STM32F3xx
62+
#ifndef EXTI2_IRQn
63+
#define EXTI2_IRQn EXTI2_TSC_IRQn
64+
#endif
65+
#endif
7466
#endif //_STM32_DEF_

‎cores/arduino/stm32/stm32_def_build.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
#if defined(STM32F091xC)
2626
#define CMSIS_STARTUP_FILE "startup_stm32f091xc.s"
27+
#elif defined(STM32F303xE)
28+
#define CMSIS_STARTUP_FILE "startup_stm32f303xe.s"
2729
#elif defined(STM32F407xx)
2830
#define CMSIS_STARTUP_FILE "startup_stm32f407xx.s"
2931
#elif defined(STM32F429xx)

‎cores/arduino/stm32/stm32_eeprom.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
// Flash base address (Bank2, page 256)
7474
#define FLASH_BASE_ADDRESS 0x0803F800
7575
#define FLASH_PAGE_NUMBER 127
76+
#elif defined (STM32F3xx)
77+
#define FLASH_BASE_ADDRESS ((uint32_t)((0x0807FFFF + 1) - FLASH_PAGE_SIZE)) //0x0807F800
78+
#define FLASH_PAGE_NUMBER 255
7679
#else
7780
// Use the last 16 page of the second bank (sector 15)
7881
#define FLASH_BASE_ADDRESS ((uint32_t)(0x0810C000))
@@ -159,7 +162,7 @@ void set_data_to_flash(void)
159162
uint32_t offset = 0;
160163
uint32_t address = FLASH_BASE_ADDRESS;
161164
uint32_t address_end = FLASH_BASE_ADDRESS + E2END;
162-
#ifdef STM32F0xx
165+
#if defined (STM32F0xx) || defined (STM32F3xx)
163166
uint32_t pageError = 0;
164167
uint64_t data = 0;
165168

0 commit comments

Comments
 (0)