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 17:54:42 +00:00
parent 6e553663ee
commit d8467af191
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x9d/hal.h
+4 -4
View File
@@ -64,10 +64,10 @@
#endif
#if defined(REV3)
#define GPIO_PIN_SW_A_L GPIOB->IDR
#define GPIO_PIN_SW_A_H GPIOE->IDR
#define PIN_SW_A_L GPIO_Pin_7 //PB.07
#define PIN_SW_A_H GPIO_Pin_2 //PE.02
#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
#else
#define GPIO_PIN_SW_A_H GPIOB->IDR
#define GPIO_PIN_SW_A_L GPIOE->IDR
src/x9d/keys_driver.cpp
+4
View File
@@ -129,7 +129,11 @@ bool switchState(EnumKeys enuk)
xxx = (GPIO_PIN_SW_A_H & PIN_SW_A_H) && (~GPIO_PIN_SW_A_L & PIN_SW_A_L);
break;
case SW_SA1:
#if defined(REV3)
xxx = (~GPIO_PIN_SW_A_H & PIN_SW_A_H) && (~GPIO_PIN_SW_A_L & PIN_SW_A_L);
#else
xxx = (GPIO_PIN_SW_A_H & PIN_SW_A_H) && (GPIO_PIN_SW_A_L & PIN_SW_A_L);
#endif
break;
case SW_SA2:
xxx = (~GPIO_PIN_SW_A_H & PIN_SW_A_H) && (GPIO_PIN_SW_A_L & PIN_SW_A_L);