bugfix: other variants than generic did not work

Author: stevstrong

STM32F4/boards.txt

@@ -31,6 +31,12 @@ discovery_f407.build.error_led_port=GPIOD
 discovery_f407.build.error_led_pin=14
 discovery_f407.build.board=STM32DiscoveryF407
 
+discovery_f407.menu.usb_cfg.usb_nc=USB inactive
+discovery_f407.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
+discovery_f407.menu.usb_cfg.usb_serial=USB serial (CDC)
+discovery_f407.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
+discovery_f407.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
+discovery_f407.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
 ##############################################################
 generic_f407v.name=Generic STM32F407V series
 
@@ -88,7 +94,7 @@ stm32f4stamp.upload.dfuse_addr=0x8000000
 stm32f4stamp.build.mcu=cortex-m4
 stm32f4stamp.build.f_cpu=168000000L
 stm32f4stamp.build.core=maple
-stm32f4stamp.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4
+stm32f4stamp.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F4 -DBOARD_discovery_f4
 stm32f4stamp.build.ldscript=ld/jtag.ld
 stm32f4stamp.build.variant=discovery_f407
 stm32f4stamp.build.variant_system_lib=lib_f407.a
@@ -98,6 +104,12 @@ stm32f4stamp.build.error_led_port=GPIOD
 stm32f4stamp.build.error_led_pin=14
 stm32f4stamp.build.board=STM32F4StampF405
 
+stm32f4stamp.menu.usb_cfg.usb_nc=USB inactive
+stm32f4stamp.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
+stm32f4stamp.menu.usb_cfg.usb_serial=USB serial (CDC)
+stm32f4stamp.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
+stm32f4stamp.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
+stm32f4stamp.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
 ##############################################################
 netduino2plus.name=Netduino2 F405
 
@@ -118,7 +130,7 @@ netduino2plus.upload.dfuse_addr=0x8000000
 netduino2plus.build.mcu=cortex-m4
 netduino2plus.build.f_cpu=168000000L
 netduino2plus.build.core=maple
-netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
+netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
 netduino2plus.build.ldscript=ld/jtag.ld
 netduino2plus.build.variant=discovery_f407
 netduino2plus.build.variant_system_lib=lib_f407.a
@@ -128,5 +140,11 @@ netduino2plus.build.error_led_port=GPIOD
 netduino2plus.build.error_led_pin=14
 netduino2plus.build.board=Netduino2F405
 
+netduino2plus.menu.usb_cfg.usb_nc=USB inactive
+netduino2plus.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
+netduino2plus.menu.usb_cfg.usb_serial=USB serial (CDC)
+netduino2plus.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
+netduino2plus.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
+netduino2plus.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
 ##############################################################
 

STM32F4/cores/maple/libmaple/gpioF4.c

@@ -124,14 +124,14 @@ void gpio_init_all(void) {
 
 #ifdef ARDUINO_STM32F4_NETDUINO2PLUS
     // PA8 Output the Master Clock MCO1
-    gpio_set_af_mode(GPIOA, 8, 0);
-    gpio_set_mode(GPIOA, 8, GPIO_MODE_AF | GPIO_OTYPE_PP | GPIO_OSPEED_100MHZ);
+    gpio_set_af_mode(PA8, 0);
+    gpio_set_mode(PA8, GPIO_MODE_AF | GPIO_OTYPE_PP | GPIO_OSPEED_100MHZ);
     // PB4 as alternate MISO Input
-    gpio_set_af_mode(GPIOB, 4, 5);
+    gpio_set_af_mode(PB4, 5);
     // PA5 as alternate SCK Output
-    gpio_set_af_mode(GPIOA, 5, 5);
+    gpio_set_af_mode(PA5, 5);
     // PA7 as alternate MOSI Output
-    gpio_set_af_mode(GPIOA, 7, 5);
+    gpio_set_af_mode(PA7, 5);
 #endif
 }
 

STM32F4/cores/maple/wirish_types.h

@@ -60,13 +60,11 @@ typedef struct stm32_pin_info {
 #else
 
 typedef struct stm32_pin_info {
-    gpio_dev *gpio_device;      /**< Maple pin's GPIO device */
+    const gpio_dev *gpio_device;      /**< Maple pin's GPIO device */
     timer_dev *timer_device;    /**< Pin's timer device, if any. */
     const adc_dev *adc_device;  /**< ADC device, if any. */
-    uint8 gpio_bit;             /**< Pin's GPIO port bit. */
     uint8 timer_channel;        /**< Timer channel, or 0 if none. */
     uint8 adc_channel;          /**< Pin ADC channel, or ADCx if none. */
-    uint8 filler;
 } stm32_pin_info;
 
 #endif

STM32F4/libraries/SPI/src/SPI.h

@@ -42,6 +42,7 @@
 #include <libmaple/dma.h>
 #include <wirish.h>
 
+#define SPI_DMA
 
 // SPI_HAS_TRANSACTION means SPI has
 //   - beginTransaction()