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:22:12 +00:00
parent c41ac65fd2
commit 6e553663ee
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x9d/hal.h
+4 -4
View File
@@ -52,10 +52,10 @@
#define PIN_SW_E_H GPIO_Pin_4 //PB.04
#if defined(REV3)
#define GPIO_PIN_SW_B_H GPIOB->IDR
#define GPIO_PIN_SW_B_L GPIOB->IDR
#define PIN_SW_B_H GPIO_Pin_5 //PB.05
#define PIN_SW_B_L GPIO_Pin_6 //PB.06
#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
#else
#define GPIO_PIN_SW_B_H GPIOE->IDR
#define GPIO_PIN_SW_B_L GPIOE->IDR
@@ -65,7 +65,7 @@
#if defined(REV3)
#define GPIO_PIN_SW_A_L GPIOB->IDR
#define GPIO_PIN_SW_A_H 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
#else
src/x9d/keys_driver.cpp
-2
View File
@@ -120,8 +120,6 @@ void readKeysAndTrims()
bool switchState(EnumKeys enuk)
{
register uint32_t b = GPIOB->IDR;
register uint32_t e = GPIOE->IDR;
register uint32_t xxx = 0;
if (enuk < (int) DIM(keys)) return keys[enuk].state() ? 1 : 0;