Skip to content

Commit c0f859a

Browse files
kbumsikkbumsik
authored
Merge branch 'master' into stm32mp1
2 parents 89d27dc + 5cf1048 commit c0f859a

File tree

435 files changed

+177705
-142456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+177705
-142456
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
124124
| :---: | --- | :---: | :--- |
125125
| :yellow_heart: | [ThunderPack](https://github.com/jgillick/ThunderPack) | **1.8.0** | |
126126

127-
128127
| Status | 3D printer boards | Release | Comment |
129128
| :---: | --- | :---: | :--- |
130129
| :green_heart: | [ARMED V1](https://github.com/ktand/Armed) | *1.5.0* | |
@@ -142,13 +141,14 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
142141
| :green_heart: | [RAK811 LoRa Tracker](https://www.rakwireless.com/en/) | *1.4.0* | Basic support |
143142
| :green_heart: | [RHF76-052](https://www.ai-thinker.com/) | *1.7.0* | Basic support |
144143

145-
| Status | Sparky flight controllers | Release | Comment |
144+
| Status | Electronic Speed Controller boards | Release | Comment |
146145
| :---: | --- | :---: | :--- |
147-
| :green_heart: | [Sparky V1](https://github.com/TauLabs/TauLabs/wiki/Sparky) | *1.6.0* | |
146+
| :yellow_heart: | Wraith V1 ESC | **1.8.0** | |
148147

149148
| Status | Generic flight controllers | Release | Comment |
150149
| :---: | --- | :---: | :--- |
151150
| :green_heart: | Afro Flight Rev5 (8/12MHz) | *1.7.0* | |
151+
| :green_heart: | [Sparky V1](https://github.com/TauLabs/TauLabs/wiki/Sparky) | *1.6.0* | |
152152

153153
| Status | [Midatronics](https://midatronics.com/) | Release | Comment |
154154
| :---: | --- | :---: | :--- |

‎boards.txt

+81-78
Original file line numberDiff line numberDiff line change
@@ -1095,43 +1095,42 @@ GenL0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
10951095
GenL0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
10961096
GenL0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
10971097

1098-
###############################
1099-
# Sparky Flight Controllers
1100-
1101-
Sparky.name=Sparky flight controllers
1102-
1103-
Sparky.build.vid=0x0483
1104-
Sparky.build.core=arduino
1105-
Sparky.build.board=Sparky
1106-
Sparky.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1107-
1108-
# Sparky_V1 board
1109-
Sparky.menu.pnum.Sparky_V1=Sparky V1
1110-
Sparky.menu.pnum.Sparky_V1.upload.maximum_size=262144
1111-
Sparky.menu.pnum.Sparky_V1.upload.maximum_data_size=40960
1112-
Sparky.menu.pnum.Sparky_V1.build.mcu=cortex-m4
1113-
Sparky.menu.pnum.Sparky_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
1114-
Sparky.menu.pnum.Sparky_V1.build.board=Sparky_V1
1115-
Sparky.menu.pnum.Sparky_V1.build.series=STM32F3xx
1116-
Sparky.menu.pnum.Sparky_V1.build.product_line=STM32F303xC
1117-
Sparky.menu.pnum.Sparky_V1.build.variant=SPARKY_F303CC
1118-
Sparky.menu.pnum.Sparky_V1.build.cmsis_lib_gcc=arm_cortexM4lf_math
1098+
################################################################################
1099+
# Electronic Speed Controller boards
1100+
1101+
ESC_board.name=Electronic speed controllers
1102+
1103+
ESC_board.build.vid=0x0483
1104+
ESC_board.build.core=arduino
1105+
ESC_board.build.board=FCE_board
1106+
ESC_board.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1107+
1108+
# Wraith32_V1 board
1109+
ESC_board.menu.pnum.Wraith32_V1=Wraith V1 ESC
1110+
ESC_board.menu.pnum.Wraith32_V1.upload.maximum_size=32768
1111+
ESC_board.menu.pnum.Wraith32_V1.upload.maximum_data_size=7936
1112+
ESC_board.menu.pnum.Wraith32_V1.build.mcu=cortex-m0
1113+
ESC_board.menu.pnum.Wraith32_V1.build.board=Wraith32_V1
1114+
ESC_board.menu.pnum.Wraith32_V1.build.series=STM32F0xx
1115+
ESC_board.menu.pnum.Wraith32_V1.build.product_line=STM32F051x8
1116+
ESC_board.menu.pnum.Wraith32_V1.build.variant=WRAITH32_F051K6
1117+
ESC_board.menu.pnum.Wraith32_V1.build.cmsis_lib_gcc=arm_cortexM0l_math
11191118

11201119
# Upload menu
1121-
Sparky.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
1122-
Sparky.menu.upload_method.swdMethod.upload.protocol=0
1123-
Sparky.menu.upload_method.swdMethod.upload.options=-g
1124-
Sparky.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
1120+
ESC_board.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
1121+
ESC_board.menu.upload_method.swdMethod.upload.protocol=0
1122+
ESC_board.menu.upload_method.swdMethod.upload.options=-g
1123+
ESC_board.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
11251124

1126-
Sparky.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
1127-
Sparky.menu.upload_method.serialMethod.upload.protocol=1
1128-
Sparky.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
1129-
Sparky.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
1125+
ESC_board.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
1126+
ESC_board.menu.upload_method.serialMethod.upload.protocol=1
1127+
ESC_board.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
1128+
ESC_board.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
11301129

1131-
Sparky.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
1132-
Sparky.menu.upload_method.dfuMethod.upload.protocol=2
1133-
Sparky.menu.upload_method.dfuMethod.upload.options=-g
1134-
Sparky.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
1130+
ESC_board.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
1131+
ESC_board.menu.upload_method.dfuMethod.upload.protocol=2
1132+
ESC_board.menu.upload_method.dfuMethod.upload.options=-g
1133+
ESC_board.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
11351134

11361135
################################################################################
11371136
# LoRa boards
@@ -1338,26 +1337,41 @@ Genericflight.name=Generic flight controllers
13381337
Genericflight.build.vid=0x0483
13391338
Genericflight.build.core=arduino
13401339
Genericflight.build.board=Genericflight
1341-
Genericflight.build.mcu=cortex-m3
1342-
Genericflight.build.series=STM32F1xx
1343-
Genericflight.build.cmsis_lib_gcc=arm_cortexM3l_math
13441340
Genericflight.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} {build.bootloader_flags}
13451341

13461342
# AfroFlight Rev5
13471343
Genericflight.menu.pnum.AFROFLIGHT_F103CB=Afro Flight Rev5 (8MHz)
13481344
Genericflight.menu.pnum.AFROFLIGHT_F103CB.upload.maximum_size=131072
13491345
Genericflight.menu.pnum.AFROFLIGHT_F103CB.upload.maximum_data_size=20480
1346+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.mcu=cortex-m3
1347+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.series=STM32F1xx
1348+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
13501349
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.board=AFROFLIGHT_F103CB
13511350
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.product_line=STM32F103xB
13521351
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.variant=AFROFLIGHT_F103CB
13531352

13541353
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M=Afro Flight Rev5 (12MHz)
13551354
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.maximum_size=131072
13561355
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.maximum_data_size=20480
1356+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.mcu=cortex-m3
1357+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.series=STM32F1xx
1358+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.cmsis_lib_gcc=arm_cortexM3l_math
13571359
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.board=AFROFLIGHT_F103CB_12M
13581360
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.product_line=STM32F103xB
13591361
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant=AFROFLIGHT_F103CB
13601362

1363+
# Sparky_V1 board
1364+
Genericflight.menu.pnum.Sparky_V1=Sparky V1 F303 FC
1365+
Genericflight.menu.pnum.Sparky_V1.upload.maximum_size=262144
1366+
Genericflight.menu.pnum.Sparky_V1.upload.maximum_data_size=40960
1367+
Genericflight.menu.pnum.Sparky_V1.build.mcu=cortex-m4
1368+
Genericflight.menu.pnum.Sparky_V1.build.series=STM32F3xx
1369+
Genericflight.menu.pnum.Sparky_V1.build.cmsis_lib_gcc=arm_cortexM4lf_math
1370+
Genericflight.menu.pnum.Sparky_V1.build.board=Sparky_V1
1371+
Genericflight.menu.pnum.Sparky_V1.build.product_line=STM32F303xC
1372+
Genericflight.menu.pnum.Sparky_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
1373+
Genericflight.menu.pnum.Sparky_V1.build.variant=SPARKY_F303CC
1374+
13611375
# Upload menu
13621376
Genericflight.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
13631377
Genericflight.menu.upload_method.swdMethod.upload.protocol=0
@@ -1520,11 +1534,11 @@ GenL0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
15201534
GenL0.menu.xserial.disabled=Disabled (no Serial support)
15211535
GenL0.menu.xserial.disabled.build.xSerial=
15221536

1523-
Sparky.menu.xserial.generic=Enabled (generic 'Serial')
1524-
Sparky.menu.xserial.none=Enabled (no generic 'Serial')
1525-
Sparky.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
1526-
Sparky.menu.xserial.disabled=Disabled (no Serial support)
1527-
Sparky.menu.xserial.disabled.build.xSerial=
1537+
ESC_board.menu.xserial.generic=Enabled (generic 'Serial')
1538+
ESC_board.menu.xserial.none=Enabled (no generic 'Serial')
1539+
ESC_board.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
1540+
ESC_board.menu.xserial.disabled=Disabled (no Serial support)
1541+
ESC_board.menu.xserial.disabled.build.xSerial=
15281542

15291543
LoRa.menu.xserial.generic=Enabled (generic 'Serial')
15301544
LoRa.menu.xserial.none=Enabled (no generic 'Serial')
@@ -1665,17 +1679,6 @@ GenL0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_G
16651679
GenL0.menu.usb.HID=HID (keyboard and mouse)
16661680
GenL0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
16671681

1668-
Sparky.menu.usb.none=None
1669-
Sparky.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
1670-
Sparky.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
1671-
Sparky.menu.usb.CDC=CDC (no generic 'Serial')
1672-
Sparky.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
1673-
Sparky.menu.xusb.FS=Low/Full Speed
1674-
Sparky.menu.xusb.HS=High Speed
1675-
Sparky.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
1676-
Sparky.menu.xusb.HSFS=High Speed in Full Speed mode
1677-
Sparky.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
1678-
16791682
3dprinter.menu.usb.none=None
16801683
3dprinter.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
16811684
3dprinter.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -1914,23 +1917,23 @@ GenL0.menu.opt.o3lto.build.flags.optimize=-O3 -flto
19141917
GenL0.menu.opt.ogstd=Debug (-g)
19151918
GenL0.menu.opt.ogstd.build.flags.optimize=-g -Og
19161919

1917-
Sparky.menu.opt.osstd=Smallest (-Os default)
1918-
Sparky.menu.opt.oslto=Smallest (-Os) with LTO
1919-
Sparky.menu.opt.oslto.build.flags.optimize=-Os -flto
1920-
Sparky.menu.opt.o1std=Fast (-O1)
1921-
Sparky.menu.opt.o1std.build.flags.optimize=-O1
1922-
Sparky.menu.opt.o1lto=Fast (-O1) with LTO
1923-
Sparky.menu.opt.o1lto.build.flags.optimize=-O1 -flto
1924-
Sparky.menu.opt.o2std=Faster (-O2)
1925-
Sparky.menu.opt.o2std.build.flags.optimize=-O2
1926-
Sparky.menu.opt.o2lto=Faster (-O2) with LTO
1927-
Sparky.menu.opt.o2lto.build.flags.optimize=-O2 -flto
1928-
Sparky.menu.opt.o3std=Fastest (-O3)
1929-
Sparky.menu.opt.o3std.build.flags.optimize=-O3
1930-
Sparky.menu.opt.o3lto=Fastest (-O3) with LTO
1931-
Sparky.menu.opt.o3lto.build.flags.optimize=-O3 -flto
1932-
Sparky.menu.opt.ogstd=Debug (-g)
1933-
Sparky.menu.opt.ogstd.build.flags.optimize=-g -Og
1920+
ESC_board.menu.opt.osstd=Smallest (-Os default)
1921+
ESC_board.menu.opt.oslto=Smallest (-Os) with LTO
1922+
ESC_board.menu.opt.oslto.build.flags.optimize=-Os -flto
1923+
ESC_board.menu.opt.o1std=Fast (-O1)
1924+
ESC_board.menu.opt.o1std.build.flags.optimize=-O1
1925+
ESC_board.menu.opt.o1lto=Fast (-O1) with LTO
1926+
ESC_board.menu.opt.o1lto.build.flags.optimize=-O1 -flto
1927+
ESC_board.menu.opt.o2std=Faster (-O2)
1928+
ESC_board.menu.opt.o2std.build.flags.optimize=-O2
1929+
ESC_board.menu.opt.o2lto=Faster (-O2) with LTO
1930+
ESC_board.menu.opt.o2lto.build.flags.optimize=-O2 -flto
1931+
ESC_board.menu.opt.o3std=Fastest (-O3)
1932+
ESC_board.menu.opt.o3std.build.flags.optimize=-O3
1933+
ESC_board.menu.opt.o3lto=Fastest (-O3) with LTO
1934+
ESC_board.menu.opt.o3lto.build.flags.optimize=-O3 -flto
1935+
ESC_board.menu.opt.ogstd=Debug (-g)
1936+
ESC_board.menu.opt.ogstd.build.flags.optimize=-g -Og
19341937

19351938
LoRa.menu.opt.osstd=Smallest (-Os default)
19361939
LoRa.menu.opt.oslto=Smallest (-Os) with LTO
@@ -2115,15 +2118,15 @@ GenL0.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float
21152118
GenL0.menu.rtlib.full=Newlib Standard
21162119
GenL0.menu.rtlib.full.build.flags.ldspecs=
21172120

2118-
Sparky.menu.rtlib.nano=Newlib Nano (default)
2119-
Sparky.menu.rtlib.nanofp=Newlib Nano + Float Printf
2120-
Sparky.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
2121-
Sparky.menu.rtlib.nanofs=Newlib Nano + Float Scanf
2122-
Sparky.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
2123-
Sparky.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
2124-
Sparky.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
2125-
Sparky.menu.rtlib.full=Newlib Standard
2126-
Sparky.menu.rtlib.full.build.flags.ldspecs=
2121+
ESC_board.menu.rtlib.nano=Newlib Nano (default)
2122+
ESC_board.menu.rtlib.nanofp=Newlib Nano + Float Printf
2123+
ESC_board.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
2124+
ESC_board.menu.rtlib.nanofs=Newlib Nano + Float Scanf
2125+
ESC_board.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
2126+
ESC_board.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
2127+
ESC_board.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
2128+
ESC_board.menu.rtlib.full=Newlib Standard
2129+
ESC_board.menu.rtlib.full.build.flags.ldspecs=
21272130

21282131
LoRa.menu.rtlib.nano=Newlib Nano (default)
21292132
LoRa.menu.rtlib.nanofp=Newlib Nano + Float Printf

‎cores/arduino/stm32/LL/stm32yyxx_ll_usb.h

+6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55
#pragma GCC diagnostic ignored "-Wunused-parameter"
66
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
77

8+
#ifdef STM32F0xx
9+
#include "stm32f0xx_ll_usb.h"
10+
#endif
811
#ifdef STM32F1xx
912
#include "stm32f1xx_ll_usb.h"
1013
#endif
1114
#ifdef STM32F2xx
1215
#include "stm32f2xx_ll_usb.h"
1316
#endif
17+
#ifdef STM32F3xx
18+
#include "stm32f3xx_ll_usb.h"
19+
#endif
1420
#ifdef STM32F4xx
1521
#include "stm32f4xx_ll_usb.h"
1622
#endif

‎cores/arduino/stm32/analog.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,11 @@ uint16_t adc_read_value(PinName pin)
798798
#ifdef ADC_DATAALIGN_RIGHT
799799
AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT; /* Right-alignment for converted data */
800800
#endif
801+
#ifdef ADC_SCAN_SEQ_FIXED
802+
AdcHandle.Init.ScanConvMode = ADC_SCAN_SEQ_FIXED; /* Sequencer disabled (ADC conversion on only 1 channel: channel set on rank 1) */
803+
#else
801804
AdcHandle.Init.ScanConvMode = DISABLE; /* Sequencer disabled (ADC conversion on only 1 channel: channel set on rank 1) */
805+
#endif
802806
#ifdef ADC_EOC_SINGLE_CONV
803807
AdcHandle.Init.EOCSelection = ADC_EOC_SINGLE_CONV; /* EOC flag picked-up to indicate conversion end */
804808
#endif
@@ -824,7 +828,7 @@ uint16_t adc_read_value(PinName pin)
824828
AdcHandle.Init.NbrOfDiscConversion = 0; /* Parameter discarded because sequencer is disabled */
825829
#endif
826830
AdcHandle.Init.ExternalTrigConv = ADC_SOFTWARE_START; /* Software start to trig the 1st conversion manually, without external event */
827-
#if !defined(STM32F1xx)
831+
#if !defined(STM32F1xx) && !defined(STM32F373xC) && !defined(STM32F378xx)
828832
AdcHandle.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE; /* Parameter discarded because software trigger chosen */
829833
#endif
830834
#if !defined(STM32F1xx) && !defined(STM32H7xx) && !defined(STM32MP1xx) && \
@@ -847,7 +851,6 @@ uint16_t adc_read_value(PinName pin)
847851
#if defined(STM32G0xx)
848852
AdcHandle.Init.SamplingTimeCommon1 = samplingTime; /* Set sampling time common to a group of channels. */
849853
AdcHandle.Init.SamplingTimeCommon2 = samplingTime; /* Set sampling time common to a group of channels, second common setting possible.*/
850-
AdcHandle.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
851854
#endif
852855
#if defined(STM32L0xx)
853856
AdcHandle.Init.LowPowerFrequencyMode = DISABLE; /* To be enabled only if ADC clock < 2.8 MHz */
@@ -889,7 +892,11 @@ uint16_t adc_read_value(PinName pin)
889892
#endif /* STM32L4xx || STM32WBxx */
890893
return 0;
891894
}
895+
#ifdef ADC_SCAN_SEQ_FIXED
896+
AdcChannelConf.Rank = ADC_RANK_CHANNEL_NUMBER; /* Enable the rank of the selected channels when not fully configurable */
897+
#else
892898
AdcChannelConf.Rank = ADC_REGULAR_RANK_1; /* Specifies the rank in the regular group sequencer */
899+
#endif
893900
#if !defined(STM32L0xx)
894901
#if !defined(STM32G0xx)
895902
AdcChannelConf.SamplingTime = samplingTime; /* Sampling time value to be set for the selected channel */

‎cores/arduino/stm32/timer.h

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ extern "C" {
6262
#endif
6363
#endif
6464
#if defined(TIM6_BASE) && !defined(TIM6_IRQn)
65+
#if defined(DAC_BASE) || defined(DAC1_BASE)
6566
#if defined(STM32G0xx)
6667
#define TIM6_IRQn TIM6_DAC_LPTIM1_IRQn
6768
#define TIM6_IRQHandler TIM6_DAC_LPTIM1_IRQHandler
@@ -70,6 +71,7 @@ extern "C" {
7071
#define TIM6_IRQHandler TIM6_DAC_IRQHandler
7172
#endif
7273
#endif
74+
#endif
7375
#if defined(TIM7_BASE) && !defined(TIM7_IRQn)
7476
#if defined(STM32G0xx)
7577
#define TIM7_IRQn TIM7_LPTIM2_IRQn

‎cores/arduino/stm32/twi.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -974,8 +974,8 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
974974
if (obj->i2c_onSlaveTransmit != NULL) {
975975
obj->i2c_onSlaveTransmit();
976976
}
977-
#if defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) ||\
978-
defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
977+
#if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F3xx) ||\
978+
defined(STM32F4xx) || defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
979979
HAL_I2C_Slave_Seq_Transmit_IT(hi2c, (uint8_t *) obj->i2cTxRxBuffer,
980980
obj->i2cTxRxBufferSize, I2C_LAST_FRAME);
981981
#else
@@ -987,8 +987,8 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
987987
obj->slaveMode = SLAVE_MODE_RECEIVE;
988988
/* We don't know in advance how many bytes will be sent by master so
989989
* we'll fetch one by one until master ends the sequence */
990-
#if defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) ||\
991-
defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
990+
#if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F3xx) ||\
991+
defined(STM32F4xx) || defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
992992
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t *) & (obj->i2cTxRxBuffer[obj->slaveRxNbData]),
993993
1, I2C_NEXT_FRAME);
994994
#else
@@ -1035,12 +1035,12 @@ void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
10351035
if (obj->slaveRxNbData < I2C_TXRX_BUFFER_SIZE) {
10361036
obj->slaveRxNbData++;
10371037
} else {
1038-
core_debug("ERROR: I2C Slave RX overflow\n");
1038+
10391039
}
10401040
/* Restart interrupt mode for next Byte */
10411041
if (obj->slaveMode == SLAVE_MODE_RECEIVE) {
1042-
#if defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) ||\
1043-
defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
1042+
#if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F3xx) ||\
1043+
defined(STM32F4xx) || defined(STM32L0xx) || defined(STM32L1xx) || defined(STM32MP1xx)
10441044
HAL_I2C_Slave_Seq_Receive_IT(hi2c, (uint8_t *) & (obj->i2cTxRxBuffer[obj->slaveRxNbData]),
10451045
1, I2C_NEXT_FRAME);
10461046
#else

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c

+6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
#ifdef STM32F0xx
2+
#include "stm32f0xx_hal_exti.c"
3+
#endif
14
#ifdef STM32F1xx
25
#include "stm32f1xx_hal_exti.c"
36
#endif
47
#ifdef STM32F2xx
58
#include "stm32f2xx_hal_exti.c"
69
#endif
10+
#ifdef STM32F3xx
11+
#include "stm32f3xx_hal_exti.c"
12+
#endif
713
#ifdef STM32F4xx
814
#include "stm32f4xx_hal_exti.c"
915
#endif

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#ifdef STM32F0xx
2+
#include "stm32f0xx_hal_usart_ex.c"
3+
#endif
4+
#ifdef STM32F3xx
5+
#include "stm32f3xx_hal_usart_ex.c"
6+
#endif
17
#ifdef STM32G0xx
28
#include "stm32g0xx_hal_usart_ex.c"
39
#endif

0 commit comments

Comments
 (0)