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.
d-ronin · Jan 6, 2018 · c214f63 · c214f63
1 parent 23992ad
commit c214f63
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/flight/targets/sparky/board-info/board_hw_defs.c b/flight/targets/sparky/board-info/board_hw_defs.c
@@ -1045,7 +1045,11 @@ static struct pios_internal_adc_cfg internal_adc_cfg = {
 static const struct pios_usb_cfg pios_usb_main_cfg = {
 	.irq = {
 		.init    = {
+#if defined(STM32_HAS_USB)
+			.NVIC_IRQChannel                   = USB_LP_IRQn,
+#else
 			.NVIC_IRQChannel                   = USB_LP_CAN1_RX0_IRQn,
+#endif
 			.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_LOW,
 			.NVIC_IRQChannelSubPriority        = 0,
 			.NVIC_IRQChannelCmd                = ENABLE,

diff --git a/flight/targets/sparky/fw/Makefile b/flight/targets/sparky/fw/Makefile
@@ -46,7 +46,7 @@ OPTMODULES += Autotune
 OPTMODULES += TxPID
 OPTMODULES += AltitudeHold
 OPTMODULES += PathPlanner
-OPTMODULES += VtolPathFollower
+#OPTMODULES += VtolPathFollower
 OPTMODULES += FixedWingPathFollower
 OPTMODULES += UAVOMavlinkBridge
 OPTMODULES += UAVOMSPBridge
@@ -59,7 +59,7 @@ OPTMODULES += UAVOFrSKYSensorHubBridge
 OPTMODULES += UAVOFrSKYSPortBridge
 OPTMODULES += Geofence
 OPTMODULES += Logging
-OPTMODULES += Storm32Bgc
+#OPTMODULES += Storm32Bgc
 OPTMODULES += UAVOCrossfireTelemetry
 
 # Paths

diff --git a/flight/targets/sparky/fw/mcuconf.h b/flight/targets/sparky/fw/mcuconf.h
@@ -39,7 +39,7 @@
  * 0...3        Lowest...Highest.
  */
 
-#define STM32F30x_MCUCONF
+#define STM32F3xx_MCUCONF
 
 /*
  * HAL driver system settings.