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

[X9D] REV3 switches assignation (regression)

Browse Source
This commit is contained in:
bsongis
2013-03-10 19:12:19 +00:00
parent 958dee594f
commit ff609188cb
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x9d/hal.h
+8 -8
View File
@@ -76,10 +76,10 @@
#endif
#if defined(REV3)
#define GPIO_PIN_SW_G_L GPIOA->IDR
#define GPIO_PIN_SW_G_H GPIOB->IDR
#define PIN_SW_G_L GPIO_Pin_5 //PA.05
#define PIN_SW_G_H GPIO_Pin_0 //PB.00
#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
#else
#define GPIO_PIN_SW_G_H GPIOE->IDR
#define GPIO_PIN_SW_G_L GPIOE->IDR
@@ -88,10 +88,10 @@
#endif
#if defined(REV3)
#define GPIO_PIN_SW_C_L GPIOB->IDR
#define GPIO_PIN_SW_C_H GPIOE->IDR
#define PIN_SW_C_L GPIO_Pin_1 //PB.01
#define PIN_SW_C_H GPIO_Pin_7 //PE.07
#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
#else
#define GPIO_PIN_SW_C_H GPIOE->IDR
#define GPIO_PIN_SW_C_L GPIOA->IDR
src/x9d/keys_driver.cpp
+4
View File
@@ -198,7 +198,11 @@ bool switchState(EnumKeys enuk)
xxx = (GPIO_PIN_SW_G_H & PIN_SW_G_H) && (~GPIO_PIN_SW_G_L & PIN_SW_G_L);
break;
case SW_SG1:
#if defined(REV3)
xxx = (~GPIO_PIN_SW_G_H & PIN_SW_G_H) && (~GPIO_PIN_SW_G_L & PIN_SW_G_L);
#else
xxx = (GPIO_PIN_SW_G_H & PIN_SW_G_H) && (GPIO_PIN_SW_G_L & PIN_SW_G_L);
#endif
break;
case SW_SG2:
xxx = (~GPIO_PIN_SW_G_H & PIN_SW_G_H) && (GPIO_PIN_SW_G_L & PIN_SW_G_L);