piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

X9E Trims should now be ok

Browse Source
This commit is contained in:
bsongis
2014-11-25 23:42:06 +01:00
parent ea0d7577c8
commit e5006769be
2 changed files with 154 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/taranis/hal.h
+140 -135
View File
@@ -6,7 +6,7 @@
*/
#if defined(REV9E)
#define RCC_AHB1Periph_GPIOBUTTON (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE|RCC_AHB1Periph_GPIOF)
#define RCC_AHB1Periph_GPIOBUTTON (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE|RCC_AHB1Periph_GPIOF|RCC_AHB1Periph_GPIOG)
#else
#define RCC_AHB1Periph_GPIOBUTTON (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE)
#endif
@@ -18,16 +18,16 @@
#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_MINUS GPIO_Pin_11 // PE11
#define PIN_BUTTON_PLUS GPIO_Pin_10 // PE.10
#define PIN_BUTTON_MINUS GPIO_Pin_11 // PE.11
#if defined(REV9E)
#define PIN_BUTTON_ENTER GPIO_Pin_0 // PF0
#define PIN_BUTTON_ENTER GPIO_Pin_0 // PF.00
#else
#define PIN_BUTTON_ENTER GPIO_Pin_12 // PE12
#define PIN_BUTTON_ENTER GPIO_Pin_12 // PE.12
#endif
#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
#define PIN_BUTTON_MENU GPIO_Pin_7 // PD.07
#define PIN_BUTTON_PAGE GPIO_Pin_3 // PD.02
#define PIN_BUTTON_EXIT GPIO_Pin_2 // PD.03
// Trims
#define GPIO_TRIM_LH_L GPIOE->IDR
@@ -38,127 +38,132 @@
#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_L GPIO_Pin_3 //PE.03
#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
#define PIN_TRIM_LH_R GPIO_Pin_3 //PE.03
#define PIN_TRIM_LH_L GPIO_Pin_4 // PE.04
#define PIN_TRIM_LH_R GPIO_Pin_3 // PE.03
#endif
#if defined(REV9E)
#define PIN_TRIM_LV_DN GPIO_Pin_1 // PG.01
#define PIN_TRIM_LV_UP GPIO_Pin_0 // PG.00
#else
#define PIN_TRIM_LV_DN GPIO_Pin_6 // PE.06
#define PIN_TRIM_LV_UP GPIO_Pin_5 // PE.05
#endif
#define PIN_TRIM_LV_DN GPIO_Pin_6 //PE.06
#define PIN_TRIM_LV_UP GPIO_Pin_5 //PE.05
// 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
#define PIN_SW_F GPIO_Pin_14 // PE.14
#endif
#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
#define GPIO_PIN_SW_B_H GPIOB->IDR
#define PIN_SW_B_L GPIO_Pin_5 //PB.05
#define PIN_SW_B_H GPIO_Pin_6 //PB.06
#define PIN_SW_B_L GPIO_Pin_5 // PB.05
#define PIN_SW_B_H GPIO_Pin_6 // PB.06
#else
#define GPIO_PIN_SW_B_H GPIOE->IDR
#define GPIO_PIN_SW_B_L GPIOE->IDR
#define PIN_SW_B_H GPIO_Pin_1 //PE.01
#define PIN_SW_B_L GPIO_Pin_2 //PE.02
#define PIN_SW_B_H GPIO_Pin_1 // PE.01
#define PIN_SW_B_L GPIO_Pin_2 // PE.02
#endif
#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
#define PIN_SW_A_H GPIO_Pin_5 //PB.05
#define PIN_SW_A_L GPIO_Pin_0 //PE.00
#define PIN_SW_A_H GPIO_Pin_5 // PB.05
#define PIN_SW_A_L GPIO_Pin_0 // PE.00
#endif
#if defined(REV3)
#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_H GPIO_Pin_5 // PA.05
#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
#define PIN_SW_G_H GPIO_Pin_9 //PE.09
#define PIN_SW_G_L GPIO_Pin_8 //PE.08
#define PIN_SW_G_H GPIO_Pin_9 // PE.09
#define PIN_SW_G_L GPIO_Pin_8 // PE.08
#endif
#if defined(REV3)
#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_H GPIO_Pin_1 // PB.01
#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
#define PIN_SW_C_H GPIO_Pin_15 //PE.15
#define PIN_SW_C_L GPIO_Pin_5 //PA.05
#define PIN_SW_C_H GPIO_Pin_15 // PE.15
#define PIN_SW_C_L GPIO_Pin_5 // PA.05
#endif
#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
#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
#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
#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
#define PIN_SW_H GPIO_Pin_13 // PE.13
#endif
// ADC
#define PIN_STK_J1 GPIO_Pin_0 //PA.00
#define PIN_STK_J2 GPIO_Pin_1 //PA.01
#define PIN_STK_J3 GPIO_Pin_2 //PA.02
#define PIN_STK_J4 GPIO_Pin_3 //PA.03
#define PIN_SLD_J1 GPIO_Pin_4 //PC.04
#define PIN_SLD_J2 GPIO_Pin_5 //PC.05
#define PIN_FLP_J1 GPIO_Pin_6 //PA.06
#define PIN_STK_J1 GPIO_Pin_0 // PA.00
#define PIN_STK_J2 GPIO_Pin_1 // PA.01
#define PIN_STK_J3 GPIO_Pin_2 // PA.02
#define PIN_STK_J4 GPIO_Pin_3 // PA.03
#define PIN_SLD_J1 GPIO_Pin_4 // PC.04
#define PIN_SLD_J2 GPIO_Pin_5 // PC.05
#define PIN_FLP_J1 GPIO_Pin_6 // PA.06
#if defined(REV3)
#define PIN_FLP_J2 GPIO_Pin_7 //PA.07
#define PIN_FLP_J2 GPIO_Pin_7 // PA.07
#else
#define PIN_FLP_J2 GPIO_Pin_0 //PB.00
#define PIN_FLP_J2 GPIO_Pin_0 // PB.00
#endif
#if defined(REVPLUS)
#define PIN_FLP_J3 GPIO_Pin_1 //PB.01
#define PIN_FLP_J3 GPIO_Pin_1 // PB.01
#endif
#define PIN_MVOLT GPIO_Pin_0 //PC.00
#define PIN_MVOLT GPIO_Pin_0 // PC.00
#if defined(REV3)
#define RCC_AHB1Periph_GPIOADC RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC
#else
@@ -166,12 +171,12 @@
#endif
// DAC
#define PIN_AUDIO_DAC GPIO_Pin_4 //PA.04
#define PIN_AUDIO_DAC GPIO_Pin_4 // PA.04
// Power_OFF Delay and LED
#define PIN_PWR_LED GPIO_Pin_6 //PC.06
#define PIN_PWR_STATUS GPIO_Pin_1 //PD.01
#define PIN_MCU_PWR GPIO_Pin_0 //PD.00
#define PIN_PWR_LED GPIO_Pin_6 // PC.06
#define PIN_PWR_STATUS GPIO_Pin_1 // PD.01
#define PIN_MCU_PWR GPIO_Pin_0 // PD.00
#define RCC_AHB1Periph_GPIOPWR RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD
#define GPIOPWRLED GPIOC
#define GPIOPWR GPIOD
@@ -187,8 +192,8 @@
// Trainer Port
#define GPIO_TR_INOUT GPIOC
#define PIN_TR_PPM_IN GPIO_Pin_8 //PC.08
#define PIN_TR_PPM_OUT GPIO_Pin_9 //PC.09
#define PIN_TR_PPM_IN GPIO_Pin_8 // PC.08
#define PIN_TR_PPM_OUT GPIO_Pin_9 // PC.09
#define GPIOTRNDET GPIOA
#define PIN_TRNDET GPIO_Pin_8
@@ -209,23 +214,23 @@
// Cppm
#define RCC_AHB1Periph_GPIO_INTPPM RCC_AHB1Periph_GPIOA
#define PIN_INTPPM_OUT GPIO_Pin_10 //PA.10
#define PIN_INTPPM_OUT GPIO_Pin_10 // PA.10
#define GPIO_INTPPM GPIOA
#define GPIO_PinSource_INTPPM GPIO_PinSource10
#define RCC_AHB1Periph_GPIO_EXTPPM RCC_AHB1Periph_GPIOA
#define PIN_EXTPPM_OUT GPIO_Pin_7 //PA.07
#define PIN_EXTPPM_OUT GPIO_Pin_7 // PA.07
#define GPIO_EXTPPM GPIOA
#define GPIO_PinSource_EXTPPM GPIO_PinSource7
// Heart Beat
#define PIN_HEART_BEAT GPIO_Pin_7 //PC.07
#define PIN_HEART_BEAT GPIO_Pin_7 // PC.07
// UART3
#define RCC_AHB1Periph_GPIO_UART3 RCC_AHB1Periph_GPIOB
#define RCC_APB1Periph_UART3 RCC_APB1Periph_USART3
#define GPIO_UART3 GPIOB
#define GPIO_PIN_UART3_TX GPIO_Pin_10 //PB.10
#define GPIO_PIN_UART3_RX GPIO_Pin_11 //PB.11
#define GPIO_PIN_UART3_TX GPIO_Pin_10 // PB.10
#define GPIO_PIN_UART3_RX GPIO_Pin_11 // PB.11
#define GPIO_PinSource_UART3_TX GPIO_PinSource10
#define GPIO_PinSource_UART3_RX GPIO_PinSource11
#define GPIO_AF_UART3 GPIO_AF_USART3
@@ -235,61 +240,61 @@
#define RCC_AHB1Periph_GPIO_SPORT RCC_AHB1Periph_GPIOD
#define RCC_APB1Periph_SPORT RCC_APB1Periph_USART2
#define GPIO_PIN_SPORT_ON GPIOD
#define PIN_SPORT_ON GPIO_Pin_4 //PD.04
#define PIN_SPORT_ON GPIO_Pin_4 // PD.04
#define GPIO_PIN_SPORT_TXRX GPIOD
#define PIN_SPORT_TX GPIO_Pin_5 //PD.05
#define PIN_SPORT_RX GPIO_Pin_6 //PD.06
#define PIN_SPORT_TX GPIO_Pin_5 // PD.05
#define PIN_SPORT_RX GPIO_Pin_6 // PD.06
#define GPIO_PinSource_SPORT_TX GPIO_PinSource5
#define GPIO_PinSource_SPORT_RX GPIO_PinSource6
#define GPIO_AF_SPORT GPIO_AF_USART2
#define SPORT USART2
// USB_OTG
#define PIN_FS_VBUS GPIO_Pin_9 //PA.09
#define PIN_FS_DM GPIO_Pin_11 //PA.11
#define PIN_FS_DP GPIO_Pin_12 //PA.12
#define PIN_FS_VBUS GPIO_Pin_9 // PA.09
#define PIN_FS_DM GPIO_Pin_11 // PA.11
#define PIN_FS_DP GPIO_Pin_12 // PA.12
// BackLight
#if defined (REVPLUS)
#define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOD
#define GPIO_Pin_BL GPIO_Pin_15 //PD.15
#define Pin_BL_AF GPIO_AF_TIM4
#define GPIOBL GPIOD
#define GPIO_PinSource_BL GPIO_PinSource15
#define GPIO_Pin_BLW GPIO_Pin_13 //PD.13
#define Pin_BLW_AF GPIO_AF_TIM4
#define GPIO_PinSource_BLW GPIO_PinSource13
#define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOD
#define GPIO_Pin_BL GPIO_Pin_15 // PD.15
#define Pin_BL_AF GPIO_AF_TIM4
#define GPIOBL GPIOD
#define GPIO_PinSource_BL GPIO_PinSource15
#define GPIO_Pin_BLW GPIO_Pin_13 // PD.13
#define Pin_BLW_AF GPIO_AF_TIM4
#define GPIO_PinSource_BLW GPIO_PinSource13
#else
#define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOB
#define GPIO_Pin_BL GPIO_Pin_8 //PB.08
#define Pin_BL_AF GPIO_AF_TIM10
#define GPIOBL GPIOB
#define GPIO_PinSource_BL GPIO_PinSource8
#define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOB
#define GPIO_Pin_BL GPIO_Pin_8 // PB.08
#define Pin_BL_AF GPIO_AF_TIM10
#define GPIOBL GPIOB
#define GPIO_PinSource_BL GPIO_PinSource8
#endif
// LCD
#if defined(REVPLUS)
#define RCC_AHB1Periph_LCD (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD)
#define RCC_AHB1Periph_LCD_RST RCC_AHB1Periph_GPIOD
#define RCC_AHB1Periph_LCD_NCS RCC_AHB1Periph_GPIOA
#define GPIO_LCD_SPI GPIOC
#define GPIO_LCD_NCS GPIOA
#define GPIO_LCD_RST GPIOD
#define PIN_LCD_MOSI GPIO_Pin_12 //PC.12
#define PIN_LCD_CLK GPIO_Pin_10 //PC.10
#define PIN_LCD_NCS GPIO_Pin_15 //PA.15
#define PIN_LCD_A0 GPIO_Pin_11 //PC.11
#define PIN_LCD_RST GPIO_Pin_12 //PD.12
#define RCC_AHB1Periph_LCD (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD)
#define RCC_AHB1Periph_LCD_RST RCC_AHB1Periph_GPIOD
#define RCC_AHB1Periph_LCD_NCS RCC_AHB1Periph_GPIOA
#define GPIO_LCD_SPI GPIOC
#define GPIO_LCD_NCS GPIOA
#define GPIO_LCD_RST GPIOD
#define PIN_LCD_MOSI GPIO_Pin_12 // PC.12
#define PIN_LCD_CLK GPIO_Pin_10 // PC.10
#define PIN_LCD_NCS GPIO_Pin_15 // PA.15
#define PIN_LCD_A0 GPIO_Pin_11 // PC.11
#define PIN_LCD_RST GPIO_Pin_12 // PD.12
#else
#define RCC_AHB1Periph_LCD RCC_AHB1Periph_GPIOD
#define GPIO_LCD_SPI GPIOD
#define GPIO_LCD_NCS GPIOD
#define GPIO_LCD_RST GPIOD
#define PIN_LCD_MOSI GPIO_Pin_10 //PD.10
#define PIN_LCD_CLK GPIO_Pin_11 //PD.11
#define PIN_LCD_NCS GPIO_Pin_14 //PD.14
#define PIN_LCD_A0 GPIO_Pin_13 //PD.13
#define PIN_LCD_RST GPIO_Pin_12 //PD.12
#define RCC_AHB1Periph_LCD RCC_AHB1Periph_GPIOD
#define GPIO_LCD_SPI GPIOD
#define GPIO_LCD_NCS GPIOD
#define GPIO_LCD_RST GPIOD
#define PIN_LCD_MOSI GPIO_Pin_10 // PD.10
#define PIN_LCD_CLK GPIO_Pin_11 // PD.11
#define PIN_LCD_NCS GPIO_Pin_14 // PD.14
#define PIN_LCD_A0 GPIO_Pin_13 // PD.13
#define PIN_LCD_RST GPIO_Pin_12 // PD.12
#endif
// Audio - I2S3
@@ -298,10 +303,10 @@
#define CODEC_I2S_GPIO_AF GPIO_AF_SPI3
#define CODEC_I2S_IRQ SPI3_IRQn
#define CODEC_I2S_GPIO_CLOCK (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC )//| RCC_AHB1Periph_GPIOE)
#define CODEC_I2S_WS_PIN GPIO_Pin_15 //PA.15
#define CODEC_I2S_SCK_PIN GPIO_Pin_10 //PC.10
#define CODEC_I2S_SD_PIN GPIO_Pin_12 //PC.12
#define CODEC_I2S_MCK_PIN GPIO_Pin_6 //DISABLED
#define CODEC_I2S_WS_PIN GPIO_Pin_15 // PA.15
#define CODEC_I2S_SCK_PIN GPIO_Pin_10 // PC.10
#define CODEC_I2S_SD_PIN GPIO_Pin_12 // PC.12
#define CODEC_I2S_MCK_PIN GPIO_Pin_6 // DISABLED
#define CODEC_I2S_WS_PINSRC GPIO_PinSource15
#define CODEC_I2S_SCK_PINSRC GPIO_PinSource10
#define CODEC_I2S_SD_PINSRC GPIO_PinSource12
@@ -309,18 +314,18 @@
#define CODEC_I2S_GPIO GPIOC
#define CODEC_I2S_MCK_GPIO GPIOC
#define CODEC_I2S_WS_GPIO GPIOA
#define CODEC_I2S_MUTE GPIO_Pin_11 //PC.11
//#define CODEC_I2S_FLT GPIO_Pin_ //IIR/FIR
//#define CODEC_I2S_MODE GPIO_Pin_ //Connect to GND=I2S_STANDARD
#define CODEC_I2S_MUTE GPIO_Pin_11 // PC.11
//#define CODEC_I2S_FLT GPIO_Pin_ // IIR/FIR
//#define CODEC_I2S_MODE GPIO_Pin_ // Connect to GND=I2S_STANDARD
// Eeprom 5137
#if defined(REV3)
#define I2C_EE_GPIO GPIOE
#define I2C_EE_WP_GPIO GPIOB
#define I2C_EE_GPIO_CLK RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOE
#define I2C_EE_SCL GPIO_Pin_1 //PE1
#define I2C_EE_SDA GPIO_Pin_0 //PE0
#define I2C_EE_WP GPIO_Pin_9 //PB9
#define I2C_EE_SCL GPIO_Pin_1 // PE1
#define I2C_EE_SDA GPIO_Pin_0 // PE0
#define I2C_EE_WP GPIO_Pin_9 // PB9
#else
#define RCC_APBPeriph_I2C_EE RCC_APB1Periph_I2C1
#define I2C_EE I2C1
@@ -330,19 +335,19 @@
#define I2C_EE_GPIO GPIOB
#define I2C_EE_WP_GPIO GPIOB
#define I2C_EE_GPIO_CLK RCC_AHB1Periph_GPIOB
#define I2C_EE_SCL GPIO_Pin_6 //PB6
#define I2C_EE_SDA GPIO_Pin_7 //PB7
#define I2C_EE_WP GPIO_Pin_9 //PB9
#define I2C_EE_SCL GPIO_Pin_6 // PB6
#define I2C_EE_SDA GPIO_Pin_7 // PB7
#define I2C_EE_WP GPIO_Pin_9 // PB9
#endif
// SD - SPI2
#define RCC_AHB1Periph_SD_PRESENT RCC_AHB1Periph_GPIOD
#define SD_PRESENT_GPIO GPIOD
#define SD_PRESENT_GPIO_Pin GPIO_Pin_9 //PD.09
#define GPIO_Pin_SPI_SD_CS GPIO_Pin_12 //PB.12
#define GPIO_Pin_SPI_SD_SCK GPIO_Pin_13 //PB.13
#define GPIO_Pin_SPI_SD_MISO GPIO_Pin_14 //PB.14
#define GPIO_Pin_SPI_SD_MOSI GPIO_Pin_15 //PB.15
#define SD_PRESENT_GPIO_Pin GPIO_Pin_9 // PD.09
#define GPIO_Pin_SPI_SD_CS GPIO_Pin_12 // PB.12
#define GPIO_Pin_SPI_SD_SCK GPIO_Pin_13 // PB.13
#define GPIO_Pin_SPI_SD_MISO GPIO_Pin_14 // PB.14
#define GPIO_Pin_SPI_SD_MOSI GPIO_Pin_15 // PB.15
#define GPIO_PinSource_CS GPIO_PinSource12
#define GPIO_PinSource_SCK GPIO_PinSource13
#define GPIO_PinSource_MISO GPIO_PinSource14
@@ -358,9 +363,9 @@
#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
@@ -370,13 +375,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
radio/src/targets/taranis/keys_driver.cpp
+14 -1
View File
@@ -75,16 +75,27 @@ uint32_t readTrims()
{
register uint32_t c = GPIOC->IDR;
register uint32_t e = GPIOE->IDR;
#if defined(REV9E)
register uint32_t g = GPIOG->IDR;
#endif
register uint32_t result = 0;
if (~e & PIN_TRIM_LH_L)
result |= 0x01; // LH_L
if (~e & PIN_TRIM_LH_R)
result |= 0x02; // LH_R
#if defined(REV9E)
if (~g & PIN_TRIM_LV_DN)
result |= 0x04; // LV_DN
if (~g & PIN_TRIM_LV_UP)
result |= 0x08; // LV_UP
#else
if (~e & PIN_TRIM_LV_DN)
result |= 0x04; // LV_DN
if (~e & PIN_TRIM_LV_UP)
result |= 0x08; // LV_UP
#endif
if (~c & PIN_TRIM_RV_DN)
result |= 0x10; // RV_DN
@@ -327,7 +338,6 @@ void keysInit()
| PIN_SW_A_L | PIN_SW_D_L | PIN_SW_F | PIN_SW_C_L | PIN_SW_D_H | PIN_SW_H;
#elif defined(REV9E)
GPIO_InitStructure.GPIO_Pin = PIN_BUTTON_PLUS | PIN_BUTTON_MINUS | PIN_TRIM_LH_R | PIN_TRIM_LH_L
| PIN_TRIM_LV_DN | PIN_TRIM_LV_UP
| PIN_SW_F | PIN_SW_A_L | PIN_SW_B_H | PIN_SW_B_L | PIN_SW_C_H | PIN_SW_D_H | PIN_SW_D_L | PIN_SW_G_H | PIN_SW_G_L;
#elif defined(REVPLUS)
GPIO_InitStructure.GPIO_Pin = PIN_BUTTON_PLUS | PIN_BUTTON_ENTER | PIN_BUTTON_MINUS | PIN_TRIM_LH_R | PIN_TRIM_LH_L
@@ -347,6 +357,9 @@ void keysInit()
#if defined(REV9E)
GPIO_InitStructure.GPIO_Pin = PIN_BUTTON_ENTER;
GPIO_Init(GPIOF, &GPIO_InitStructure);
GPIO_InitStructure.GPIO_Pin = PIN_TRIM_LV_DN | PIN_TRIM_LV_UP;
GPIO_Init(GPIOG, &GPIO_InitStructure);
#endif
#if defined(REVPLUS)