From 7f15566d5c53ee56dd1cd236503c4f8fd485d58c Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 19 Mar 2013 00:02:35 +0000
Subject: [PATCH] [X9D] We now have PXX pulses, but they still don't seem to be
 recognised by the module...

---
 src/x9d/hal.h             |  2 +-
 src/x9d/pulses_driver.cpp | 15 +++++++++++++--
 src/x9d/pwr_driver.cpp    | 10 +++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/x9d/hal.h b/src/x9d/hal.h
index 071b64241..26b1df9f3 100644
--- a/src/x9d/hal.h
+++ b/src/x9d/hal.h
@@ -179,7 +179,7 @@
 #define RCC_AHB1Periph_GPIOCPPM         RCC_AHB1Periph_GPIOA
 #define PIN_CPPM_OUT                    GPIO_Pin_7  //PA.07
 #define GPIOCPPM                        GPIOA
-#define GPIO_PinSource_CPPM             GPIO_PinSource8
+#define GPIO_PinSource_CPPM             GPIO_PinSource7
 
 // Heart Beat
 #define PIN_HEART_BEAT                  GPIO_Pin_7  //PC.07
diff --git a/src/x9d/pulses_driver.cpp b/src/x9d/pulses_driver.cpp
index b7ed3f01b..f336e3fda 100644
--- a/src/x9d/pulses_driver.cpp
+++ b/src/x9d/pulses_driver.cpp
@@ -55,6 +55,7 @@ uint16_t *ppmStreamPtr;
 extern uint16_t ppmStream[20];
 extern uint16_t pxxStream[400] ;
 
+#if 1
 void init_pxx()
 {
   INTERNAL_RF_ON();
@@ -66,7 +67,15 @@ void init_pxx()
 #if defined(REV3)
   configure_pins( 0x0100, PIN_PERIPHERAL | PIN_PORTA | PIN_PER_1 | PIN_OS25 | PIN_PUSHPULL ) ;
 #else
-  configure_pins( 0x0080, PIN_PERIPHERAL | PIN_PORTA | PIN_PER_1 | PIN_OS25 | PIN_PUSHPULL ) ;
+  GPIO_InitTypeDef GPIO_InitStructure;
+  RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOCPPM, ENABLE);
+  GPIO_PinAFConfig(GPIOCPPM, GPIO_PinSource_CPPM, GPIO_AF_TIM1);
+  GPIO_InitStructure.GPIO_Pin = PIN_CPPM_OUT;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
+  GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
+  GPIO_Init(GPIOCPPM, &GPIO_InitStructure);
 #endif
   RCC->APB2ENR |= RCC_APB2ENR_TIM1EN ;            // Enable clock
   RCC->AHB1ENR |= RCC_AHB1ENR_DMA2EN ;                    // Enable DMA1 clock
@@ -119,7 +128,7 @@ void disable_pxx()
 }
 
 // Robert@FrSky code
-#if 0
+#else
 static DMA_InitTypeDef DMA_InitStructure;
 
 /**
@@ -127,6 +136,7 @@ static DMA_InitTypeDef DMA_InitStructure;
 */
 void init_pxx()
 {
+  INTERNAL_RF_ON();
   setupPulsesPXX(); // TODO later ... not here!
 
   // SPI1
@@ -198,6 +208,7 @@ void disable_pxx()
   NVIC_DisableIRQ(DMA2_Stream3_IRQn);
   DMA_ITConfig(DMA_Stream_SPI1_TX, DMA_IT_TC, DISABLE);
   SPI_I2S_DMACmd(SPI1, SPI_I2S_DMAReq_Tx, DISABLE);
+  INTERNAL_RF_OFF();
 }
 
 extern "C" void DMA2_Stream3_IRQHandler()
diff --git a/src/x9d/pwr_driver.cpp b/src/x9d/pwr_driver.cpp
index 9ca20636f..661d5ee62 100644
--- a/src/x9d/pwr_driver.cpp
+++ b/src/x9d/pwr_driver.cpp
@@ -70,21 +70,21 @@ void pwrInit()
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_Init(GPIOPWR, &GPIO_InitStructure);
 
   GPIO_InitStructure.GPIO_Pin = PIN_PWR_STATUS;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_Init(GPIOPWR, &GPIO_InitStructure);
   
   GPIO_InitStructure.GPIO_Pin = PIN_PWR_LED;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_Init(GPIOPWRLED, &GPIO_InitStructure);
 
 #if !defined(REV3)  
@@ -93,14 +93,14 @@ void pwrInit()
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_Init(GPIOPWR, &GPIO_InitStructure);
   
   GPIO_InitStructure.GPIO_Pin = PIN_TRNDET;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_Init(GPIOTRNDET, &GPIO_InitStructure);
 #endif