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

Compilation fixes

Browse Source
This commit is contained in:
Bertrand Songis
2015-06-12 13:56:29 +02:00
parent 7e50b2e466
commit b32bc91385
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/mega2560/board_mega2560.cpp
+9 -9
View File
@@ -162,15 +162,15 @@ bool switchState(EnumKeys enuk)
}
// Trim switches
static const pm_uchar crossTrim[] PROGMEM ={
1<<INP_F_TRM_LH_DWN,
1<<INP_F_TRM_LH_UP,
1<<INP_F_TRM_LV_DWN,
1<<INP_F_TRM_LV_UP,
1<<INP_F_TRM_RV_DWN,
1<<INP_F_TRM_RV_UP,
1<<INP_F_TRM_RH_DWN,
1<<INP_F_TRM_RH_UP
static const pm_uchar crossTrim[] PROGMEM = {
TRIMS_GPIO_PIN_LHL,
TRIMS_GPIO_PIN_LHR,
TRIMS_GPIO_PIN_LVD,
TRIMS_GPIO_PIN_LVU,
TRIMS_GPIO_PIN_RVD,
TRIMS_GPIO_PIN_RVU,
TRIMS_GPIO_PIN_RHL,
TRIMS_GPIO_PIN_RHR
};
uint8_t trimDown(uint8_t idx)
radio/src/targets/mega2560/board_mega2560.h
+2 -2
View File
@@ -149,9 +149,9 @@ void sdPoll10ms(void);
// DBLKeys driver
#define KEYS_PRESSED() (~PINL)
#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
#define DBLKEYS_PRESSED_UP_DWN(i) ((in & (KEYS_GPIO_PIN_UP + (1<<INP_L_KEY_DWN))) == (KEYS_GPIO_PIN_UP + (1<<INP_L_KEY_DWN)))
#define DBLKEYS_PRESSED_UP_DWN(i) ((in & (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN))
#define DBLKEYS_PRESSED_RGT_UP(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + (1<<INP_L_KEY_DWN))) == (KEYS_GPIO_PIN_LEFT + (1<<INP_L_KEY_DWN)))
#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
// Power driver
uint8_t pwrCheck();