Merge branch 'Black_F4_variant' of https://github.com/stevstrong/Arduino_STM32 into Black_F4_variant

# Conflicts:
#	STM32F4/libraries/SPI/src/SPI.cpp
#	STM32F4/libraries/SPI/src/SPI.h

Author: stevstrong

STM32F4/libraries/SPI/src/SPI.cpp

@@ -357,7 +357,6 @@ void SPIClass::write(uint16 data)
 	 * This almost doubles the speed of this function.
 	 */
 	spi_tx_reg(_currentSetting->spi_d, data); // write the data to be transmitted into the SPI_DR register (this clears the TXE flag)
-//return;
 	while (spi_is_tx_empty(_currentSetting->spi_d) == 0); // "5. Wait until TXE=1 ..."
 	while (spi_is_busy(_currentSetting->spi_d) != 0); // "... and then wait until BSY=0 before disabling the SPI." 
 }

STM32F4/libraries/SPI/src/SPI.h

@@ -42,7 +42,6 @@
 #include <libmaple/dma.h>
 #include <wirish.h>
 
-#define SPI_DMA
 
 // SPI_HAS_TRANSACTION means SPI has
 //   - beginTransaction()
@@ -368,28 +367,12 @@ class SPIClass {
     uint8 recv(void);
 
 private:
-/*
-	static inline void DMA1_CH3_Event() {
-		dma1_ch3_Active = 0;
-//		dma_disable(DMA1, DMA_CH3);
-//		dma_disable(DMA1, DMA_CH2);
-		
-		// To Do. Need to wait for 
-	}
-*/	
 	SPISettings _settings[BOARD_NR_SPI];
 	SPISettings *_currentSetting;
 
 	void updateSettings(void);
-	/*
-	spi_dev *spi_d;
-	uint8_t _SSPin;
-	uint32_t clockDivider;
-	uint8_t dataMode;
-	BitOrder bitOrder;
-	*/
 };
 
-extern SPIClass SPI;
+extern SPIClass SPI; // needed bx SdFat(EX) lib
 
 #endif

STM32F4/variants/generic_f407v/pin_map.c

@@ -53,20 +53,16 @@ extern timer_dev timer5;
 extern timer_dev timer6;
 extern timer_dev timer7;
 extern timer_dev timer8;
+
 /*
 typedef struct stm32_pin_info {
     gpio_dev *gpio_device;      // Maple pin's GPIO device
-    uint8 gpio_bit;             // Pin's GPIO port bit.
     timer_dev *timer_device;    // Pin's timer device, if any.
     uint8 timer_channel;        // Timer channel, or 0 if none.
-    const adc_dev *adc_device;  // ADC device, if any.
     uint8 adc_channel;          // Pin ADC channel, or ADCx if none.
+    const adc_dev *adc_device;  // ADC device, if any.
 } stm32_pin_info;
 */
-const stm32_pin_info PIN_MAP1[] = { // LQFP100 package pin
-    {&GPIOA, &timer5, 1,    0, &ADC1}, // D00/PA0  | 23 | USART2_CTS | UART4_TX       | ETH_MII_CRS      | TIM2_CH1_ETR   | TIM5_CH1       | TIM8_ETR                      | ADC123_IN0/WKUP
-};
-
 const stm32_pin_info PIN_MAP[] = { // LQFP100 package pin
     {&GPIOA, &timer5, 1,    0, &ADC1}, // D00/PA0  | 23 | USART2_CTS | UART4_TX       | ETH_MII_CRS      | TIM2_CH1_ETR   | TIM5_CH1       | TIM8_ETR                      | ADC123_IN0/WKUP
     {&GPIOA, &timer5, 2,    1, &ADC1}, // D01/PA1  | 24 | USART2_RTS | UART4_RX       | ETH_RMII_REF_CLK | ETH_MII_RX_CLK | TIM5_CH2       | TIM2_CH2                      | ADC123_IN1