From 89b288a49818e314c90c953c11ff3477a056a680 Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Fri, 15 Jul 2016 22:49:24 +1000
Subject: [PATCH] Fix for F4 telemetry

---
 src/main/drivers/dma.h                   | 6 ++++--
 src/main/drivers/dma_stm32f4xx.c         | 4 ++--
 src/main/drivers/serial_uart_stm32f4xx.c | 1 +
 src/main/target/BLUEJAYF4/target.h       | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/drivers/dma.h b/src/main/drivers/dma.h
index 4f0dabdff..422b4c45a 100644
--- a/src/main/drivers/dma.h
+++ b/src/main/drivers/dma.h
@@ -22,13 +22,15 @@ typedef void (*dmaCallbackHandlerFuncPtr)(struct dmaChannelDescriptor_s *channel
 #ifdef STM32F4
 
 typedef enum {
-    DMA1_ST1_HANDLER = 0,
+    DMA1_ST0_HANDLER = 0,
+    DMA1_ST1_HANDLER,
     DMA1_ST2_HANDLER,
     DMA1_ST3_HANDLER,
     DMA1_ST4_HANDLER,
     DMA1_ST5_HANDLER,
     DMA1_ST6_HANDLER,
     DMA1_ST7_HANDLER,
+    DMA2_ST0_HANDLER,
     DMA2_ST1_HANDLER,
     DMA2_ST2_HANDLER,
     DMA2_ST3_HANDLER,
@@ -63,7 +65,7 @@ typedef struct dmaChannelDescriptor_s {
 #define DMA_IT_TEIF                         ((uint32_t)0x00000008)
 #define DMA_IT_DMEIF                        ((uint32_t)0x00000004)
 #define DMA_IT_FEIF                         ((uint32_t)0x00000001)
-
+    
 #else
 
 typedef enum {
diff --git a/src/main/drivers/dma_stm32f4xx.c b/src/main/drivers/dma_stm32f4xx.c
index ce960ab4c..9ee748637 100644
--- a/src/main/drivers/dma_stm32f4xx.c
+++ b/src/main/drivers/dma_stm32f4xx.c
@@ -45,7 +45,6 @@ static dmaChannelDescriptor_t dmaDescriptors[] = {
     DEFINE_DMA_CHANNEL(DMA2, DMA2_Stream5, 38, DMA2_Stream5_IRQn, RCC_AHB1Periph_DMA2),
     DEFINE_DMA_CHANNEL(DMA2, DMA2_Stream6, 48, DMA2_Stream6_IRQn, RCC_AHB1Periph_DMA2),
     DEFINE_DMA_CHANNEL(DMA2, DMA2_Stream7, 54, DMA2_Stream7_IRQn, RCC_AHB1Periph_DMA2),
-
 };
 
 /*
@@ -63,7 +62,8 @@ DEFINE_DMA_IRQ_HANDLER(2, 2, DMA2_ST2_HANDLER)
 DEFINE_DMA_IRQ_HANDLER(2, 3, DMA2_ST3_HANDLER)
 DEFINE_DMA_IRQ_HANDLER(2, 4, DMA2_ST4_HANDLER)
 DEFINE_DMA_IRQ_HANDLER(2, 5, DMA2_ST5_HANDLER)
-
+DEFINE_DMA_IRQ_HANDLER(2, 6, DMA2_ST6_HANDLER)
+DEFINE_DMA_IRQ_HANDLER(2, 7, DMA2_ST7_HANDLER)
 
 void dmaInit(void)
 {
diff --git a/src/main/drivers/serial_uart_stm32f4xx.c b/src/main/drivers/serial_uart_stm32f4xx.c
index 97f087a51..3adecfc89 100644
--- a/src/main/drivers/serial_uart_stm32f4xx.c
+++ b/src/main/drivers/serial_uart_stm32f4xx.c
@@ -376,6 +376,7 @@ void USART1_IRQHandler(void)
     uartPort_t *s = &(uartHardwareMap[UARTDEV_1]->port);
     uartIrqHandler(s);
 }
+
 #endif
 
 #ifdef USE_UART2
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 6bad2fee1..ffae24c92 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -98,7 +98,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11