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

[X9D] Top bar

Browse Source
This commit is contained in:
bsongis
2013-03-11 13:47:16 +00:00
parent d6543f6c55
commit 5bdd8f8994
11 changed files with 174 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x9d/hal.h
+2
View File
@@ -53,6 +53,8 @@
#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
src/x9d/keys_driver.cpp
+3 -4
View File
@@ -119,7 +119,6 @@ void readKeysAndTrims()
bool switchState(EnumKeys enuk)
{
register uint32_t b = GPIOB->IDR;
register uint32_t xxx = 0;
if (enuk < (int) DIM(keys)) return keys[enuk].state() ? 1 : 0;
@@ -178,13 +177,13 @@ bool switchState(EnumKeys enuk)
break;
case SW_SE0:
xxx = (~b & PIN_SW_E_H) && (b & PIN_SW_E_L);
xxx = (~GPIO_PIN_SW_E_H & PIN_SW_E_H) && (GPIO_PIN_SW_E_L & PIN_SW_E_L);
break;
case SW_SE1:
xxx = (b & PIN_SW_E_H) && (b & PIN_SW_E_L);
xxx = (GPIO_PIN_SW_E_H & PIN_SW_E_H) && (GPIO_PIN_SW_E_L & PIN_SW_E_L);
break;
case SW_SE2:
xxx = (b & PIN_SW_E_H) && (~b & PIN_SW_E_L);
xxx = (GPIO_PIN_SW_E_H & PIN_SW_E_H) && (~GPIO_PIN_SW_E_L & PIN_SW_E_L);
break;
case SW_SF0: