From c03708a4dc3c66fedb26be1d8920e200977655c1 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Tue, 29 Apr 2014 17:12:17 +0200 Subject: [PATCH] More pin remappings --- radio/src/targets/taranis/hal.h | 99 ++++++++++++++++---------- radio/src/targets/taranis/pwr_driver.c | 14 +++- 2 files changed, 74 insertions(+), 39 deletions(-) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 655598944..7361b0e69 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -14,10 +14,10 @@ #define GPIO_BUTTON_MENU GPIOD->IDR #define GPIO_BUTTON_EXIT GPIOD->IDR #define GPIO_BUTTON_PAGE GPIOD->IDR -#define PIN_BUTTON_PLUS GPIO_Pin_10 //SW3 PE.10 +#define PIN_BUTTON_PLUS GPIO_Pin_10 //SW3 PE.10 #define PIN_BUTTON_MINUS GPIO_Pin_11 //SW1 PE.12 -#define PIN_BUTTON_ENTER GPIO_Pin_12 //SW2 PE.11 -#define PIN_BUTTON_MENU GPIO_Pin_7 //SW4 PD.07 +#define PIN_BUTTON_ENTER GPIO_Pin_12 //SW2 PE.11 +#define PIN_BUTTON_MENU GPIO_Pin_7 //SW4 PD.07 #define PIN_BUTTON_PAGE GPIO_Pin_3 //SW6 PD.02 #define PIN_BUTTON_EXIT GPIO_Pin_2 //SW5 PD.03 @@ -30,12 +30,12 @@ #define GPIO_TRIM_LV_UP GPIOE->IDR #define GPIO_TRIM_RV_DN GPIOC->IDR #define GPIO_TRIM_RH_R GPIOC->IDR -#define PIN_TRIM_RV_DN GPIO_Pin_3 //PC.03 -#define PIN_TRIM_RV_UP GPIO_Pin_2 //PC.02 -#define PIN_TRIM_RH_L GPIO_Pin_1 //PC.01 -#define PIN_TRIM_RH_R GPIO_Pin_13 //PC.13 +#define PIN_TRIM_RV_DN GPIO_Pin_3 //PC.03 +#define PIN_TRIM_RV_UP GPIO_Pin_2 //PC.02 +#define PIN_TRIM_RH_L GPIO_Pin_1 //PC.01 +#define PIN_TRIM_RH_R GPIO_Pin_13 //PC.13 #if defined(REV3) - #define PIN_TRIM_LH_R GPIO_Pin_4 //PE.04 + #define PIN_TRIM_LH_R GPIO_Pin_4 //PE.04 #define PIN_TRIM_LH_L GPIO_Pin_3 //PE.03 #else #define PIN_TRIM_LH_L GPIO_Pin_4 //PE.04 @@ -47,7 +47,7 @@ // Switchs #if defined(REV3) #define GPIO_PIN_SW_F (~GPIOE->IDR) - #define PIN_SW_F GPIO_Pin_14 //PE.14 + #define PIN_SW_F GPIO_Pin_14 //PE.14 #else #define GPIO_PIN_SW_F GPIOE->IDR #define PIN_SW_F GPIO_Pin_14 //PE.14 @@ -55,8 +55,8 @@ #define GPIO_PIN_SW_E_L GPIOB->IDR #define GPIO_PIN_SW_E_H GPIOB->IDR -#define PIN_SW_E_L GPIO_Pin_3 //PB.03 -#define PIN_SW_E_H GPIO_Pin_4 //PB.04 +#define PIN_SW_E_L GPIO_Pin_3 //PB.03 +#define PIN_SW_E_H GPIO_Pin_4 //PB.04 #if defined(REV3) #define GPIO_PIN_SW_B_L GPIOB->IDR @@ -73,8 +73,8 @@ #if defined(REV3) #define GPIO_PIN_SW_A_H (~GPIOB->IDR) #define GPIO_PIN_SW_A_L (~GPIOE->IDR) - #define PIN_SW_A_H GPIO_Pin_7 //PB.07 - #define PIN_SW_A_L GPIO_Pin_2 //PE.02 + #define PIN_SW_A_H GPIO_Pin_7 //PB.07 + #define PIN_SW_A_L GPIO_Pin_2 //PE.02 #else #define GPIO_PIN_SW_A_H GPIOB->IDR #define GPIO_PIN_SW_A_L GPIOE->IDR @@ -86,7 +86,7 @@ #define GPIO_PIN_SW_G_H (~GPIOA->IDR) #define GPIO_PIN_SW_G_L (~GPIOB->IDR) #define PIN_SW_G_H GPIO_Pin_5 //PA.05 - #define PIN_SW_G_L GPIO_Pin_0 //PB.00 + #define PIN_SW_G_L GPIO_Pin_0 //PB.00 #else #define GPIO_PIN_SW_G_H GPIOE->IDR #define GPIO_PIN_SW_G_L GPIOE->IDR @@ -98,7 +98,7 @@ #define GPIO_PIN_SW_C_H (~GPIOB->IDR) #define GPIO_PIN_SW_C_L (~GPIOE->IDR) #define PIN_SW_C_H GPIO_Pin_1 //PB.01 - #define PIN_SW_C_L GPIO_Pin_7 //PE.07 + #define PIN_SW_C_L GPIO_Pin_7 //PE.07 #else #define GPIO_PIN_SW_C_H GPIOE->IDR #define GPIO_PIN_SW_C_L GPIOA->IDR @@ -109,18 +109,26 @@ #if defined(REV3) #define GPIO_PIN_SW_D_H (~GPIOE->IDR) #define GPIO_PIN_SW_D_L (~GPIOE->IDR) - #define PIN_SW_D_H GPIO_Pin_9 //PE.09 - #define PIN_SW_D_L GPIO_Pin_8 //PE.08 + #define PIN_SW_D_H GPIO_Pin_9 //PE.09 + #define PIN_SW_D_L GPIO_Pin_8 //PE.08 +#elif defined(REVPLUS) + #define GPIO_PIN_SW_D_H (GPIOE->IDR) + #define GPIO_PIN_SW_D_L (GPIOE->IDR) + #define PIN_SW_D_H GPIO_Pin_7 //PE.07 + #define PIN_SW_D_L GPIO_Pin_13 //PE.13 #else #define GPIO_PIN_SW_D_H GPIOE->IDR #define GPIO_PIN_SW_D_L GPIOB->IDR - #define PIN_SW_D_H GPIO_Pin_7 //PE.07 - #define PIN_SW_D_L GPIO_Pin_1 //PB.01 + #define PIN_SW_D_H GPIO_Pin_7 //PE.07 + #define PIN_SW_D_L GPIO_Pin_1 //PB.01 #endif #if defined(REV3) #define GPIO_PIN_SW_H (~GPIOE->IDR) #define PIN_SW_H GPIO_Pin_13 //PE.13 +#elif defined(REVPLUS) + #define GPIO_PIN_SW_H GPIOD->IDR + #define PIN_SW_H GPIO_Pin_14 //PD.14 #else #define GPIO_PIN_SW_H GPIOE->IDR #define PIN_SW_H GPIO_Pin_13 //PE.13 @@ -139,6 +147,9 @@ #else #define PIN_FLP_J2 GPIO_Pin_0 //PB.00 #endif +#if defined(REVPLUS) + #define PIN_FLP_J3 GPIO_Pin_1 //PB.01 +#endif #define PIN_MVOLT GPIO_Pin_0 //PC.00 #if defined(REV3) #define RCC_AHB1Periph_GPIOADC RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC @@ -156,8 +167,15 @@ #define RCC_AHB1Periph_GPIOPWR RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD #define GPIOPWRLED GPIOC #define GPIOPWR GPIOD -#define PIN_INT_RF_PWR GPIO_Pin_15 +#define GPIO_EXT_RF_PWR GPIOD #define PIN_EXT_RF_PWR GPIO_Pin_8 +#if defined(REVPLUS) + #define GPIO_INT_RF_PWR GPIOC + #define PIN_INT_RF_PWR GPIO_Pin_6 +#else + #define GPIO_INT_RF_PWR GPIOD + #define PIN_INT_RF_PWR GPIO_Pin_15 +#endif // Trainer Port #define GPIO_TR_INOUT GPIOC @@ -219,11 +237,20 @@ #define PIN_FS_DM GPIO_Pin_11 //PA.11 #define PIN_FS_DP GPIO_Pin_12 //PA.12 -// BackLight PB8 -#define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOB -#define GPIO_Pin_BL GPIO_Pin_8 //PB.08 -#define GPIOBL GPIOB -#define GPIO_PinSource_BL GPIO_PinSource8 +// BackLight +#if defined (REVPLUS) + #define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOD + #define GPIO_Pin_BL GPIO_Pin_15 //PD.15 + #define GPIOBL GPIOD + #define GPIO_PinSource_BL GPIO_PinSource15 + #define GPIO_Pin_BLW GPIO_Pin_13 //PD.13 + #define GPIO_PinSource_BLW GPIO_PinSource13 +#else + #define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOB + #define GPIO_Pin_BL GPIO_Pin_8 //PB.08 + #define GPIOBL GPIOB + #define GPIO_PinSource_BL GPIO_PinSource8 +#endif // LCD #if defined(REVPLUS) @@ -310,13 +337,13 @@ #define RCC_AHB1Periph_GPIO_SD RCC_AHB1Periph_GPIOB #define RCC_APBPeriphClockCmd_SPI_SD RCC_APB1PeriphClockCmd #define RCC_APBPeriph_SPI_SD RCC_APB1Periph_SPI2 -#define RCC_AHB1Periph_DMA_SD RCC_AHB1Periph_DMA1 -#define SPI_BaudRatePrescaler_SPI_SD SPI_BaudRatePrescaler_4 //10.5<20MHZ,make sure < 20MHZ +#define RCC_AHB1Periph_DMA_SD RCC_AHB1Periph_DMA1 +#define SPI_BaudRatePrescaler_SPI_SD SPI_BaudRatePrescaler_4 //10.5<20MHZ,make sure < 20MHZ //disabled io_ctl and cp/wp -#define CARD_SUPPLY_SWITCHABLE 0 -#define SOCKET_WP_CONNECTED 0 -#define SOCKET_CP_CONNECTED 0 +#define CARD_SUPPLY_SWITCHABLE 0 +#define SOCKET_WP_CONNECTED 0 +#define SOCKET_CP_CONNECTED 0 /* set to 1 to provide a disk_ioctrl function even if not needed by the FatFs */ #define STM32_SD_DISK_IOCTRL_FORCE 0 @@ -326,13 +353,13 @@ #endif #ifdef STM32_SD_USE_DMA -#define DMA_Channel_SPI_SD_RX DMA1_Stream3 -#define DMA_Channel_SPI_SD_TX DMA1_Stream4 +#define DMA_Channel_SPI_SD_RX DMA1_Stream3 +#define DMA_Channel_SPI_SD_TX DMA1_Stream4 -#define DMA_FLAG_SPI_SD_TC_RX DMA_FLAG_TCIF3 -#define DMA_FLAG_SPI_SD_TC_TX DMA_FLAG_TCIF4 -#define DMA_Channel_SPI2_TX DMA_Channel_0 -#define DMA_Channel_SPI2_RX DMA_Channel_0 +#define DMA_FLAG_SPI_SD_TC_RX DMA_FLAG_TCIF3 +#define DMA_FLAG_SPI_SD_TC_TX DMA_FLAG_TCIF4 +#define DMA_Channel_SPI2_TX DMA_Channel_0 +#define DMA_Channel_SPI2_RX DMA_Channel_0 #endif // Audio----I2S3-----SPI3 diff --git a/radio/src/targets/taranis/pwr_driver.c b/radio/src/targets/taranis/pwr_driver.c index 2df7d5d2b..3d1dc7de8 100644 --- a/radio/src/targets/taranis/pwr_driver.c +++ b/radio/src/targets/taranis/pwr_driver.c @@ -66,13 +66,21 @@ void pwrInit() GPIO_Init(GPIOPWRLED, &GPIO_InitStructure); #if !defined(REV3) - GPIO_ResetBits(GPIOPWR, PIN_INT_RF_PWR | PIN_EXT_RF_PWR); - GPIO_InitStructure.GPIO_Pin = PIN_INT_RF_PWR | PIN_EXT_RF_PWR; + GPIO_ResetBits(GPIO_INT_RF_PWR, PIN_INT_RF_PWR; + GPIO_InitStructure.GPIO_Pin = PIN_INT_RF_PWR; 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_NOPULL; - GPIO_Init(GPIOPWR, &GPIO_InitStructure); + GPIO_Init(GPIO_INT_RF_PWR, &GPIO_InitStructure); + + GPIO_ResetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR); + GPIO_InitStructure.GPIO_Pin = PIN_EXT_RF_PWR; + 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_NOPULL; + GPIO_Init(GPIO_EXT_RF_PWR, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Pin = PIN_TRNDET; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;