Skip to content

Commit c214f63

Browse files
committed
sparky: Adapt to new USB IRQ handling, fixup mcuconf.h for ChibiOS 17, axed two modules to save flash space.
Storm32Bgc and VtolPathFollower got axed to make it fit the flash image.
1 parent 23992ad commit c214f63

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

flight/targets/sparky/board-info/board_hw_defs.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,11 @@ static struct pios_internal_adc_cfg internal_adc_cfg = {
10451045
static const struct pios_usb_cfg pios_usb_main_cfg = {
10461046
.irq = {
10471047
.init = {
1048+
#if defined(STM32_HAS_USB)
1049+
.NVIC_IRQChannel = USB_LP_IRQn,
1050+
#else
10481051
.NVIC_IRQChannel = USB_LP_CAN1_RX0_IRQn,
1052+
#endif
10491053
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_LOW,
10501054
.NVIC_IRQChannelSubPriority = 0,
10511055
.NVIC_IRQChannelCmd = ENABLE,

flight/targets/sparky/fw/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OPTMODULES += Autotune
4646
OPTMODULES += TxPID
4747
OPTMODULES += AltitudeHold
4848
OPTMODULES += PathPlanner
49-
OPTMODULES += VtolPathFollower
49+
#OPTMODULES += VtolPathFollower
5050
OPTMODULES += FixedWingPathFollower
5151
OPTMODULES += UAVOMavlinkBridge
5252
OPTMODULES += UAVOMSPBridge
@@ -59,7 +59,7 @@ OPTMODULES += UAVOFrSKYSensorHubBridge
5959
OPTMODULES += UAVOFrSKYSPortBridge
6060
OPTMODULES += Geofence
6161
OPTMODULES += Logging
62-
OPTMODULES += Storm32Bgc
62+
#OPTMODULES += Storm32Bgc
6363
OPTMODULES += UAVOCrossfireTelemetry
6464

6565
# Paths

flight/targets/sparky/fw/mcuconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* 0...3 Lowest...Highest.
4040
*/
4141

42-
#define STM32F30x_MCUCONF
42+
#define STM32F3xx_MCUCONF
4343

4444
/*
4545
* HAL driver system settings.

0 commit comments

Comments
 (0)