Bsongis/gui refactoring for x7 d (#3701)

* [X7D] New board added
* Cosmetics
This commit is contained in:
Bertrand Songis
2016-08-18 11:49:16 +02:00
committed by GitHub
parent 282b856309
commit d3ae3c035d
233 changed files with 7472 additions and 4560 deletions
+3 -158
View File
@@ -21,161 +21,6 @@
#ifndef _KEYS_H_
#define _KEYS_H_
enum EnumKeys {
#if defined(PCBHORUS)
KEY_PGUP,
KEY_PGDN,
KEY_ENTER,
KEY_MODEL,
KEY_UP=KEY_MODEL,
KEY_EXIT,
KEY_DOWN=KEY_EXIT,
KEY_TELEM,
KEY_RIGHT=KEY_TELEM,
KEY_RADIO,
KEY_LEFT=KEY_RADIO,
#elif defined(PCBFLAMENCO)
KEY_MENU,
KEY_EXIT,
KEY_ENTER,
KEY_PAGE,
KEY_PLUS, // TODO remove
KEY_MINUS, // TODO remove
#elif defined(PCBTARANIS)
KEY_MENU,
KEY_EXIT,
KEY_ENTER,
KEY_PAGE,
KEY_PLUS,
KEY_MINUS,
#else
KEY_MENU,
KEY_ENTER=KEY_MENU,
KEY_EXIT,
KEY_DOWN,
KEY_UP,
KEY_RIGHT,
KEY_LEFT,
#endif
TRM_BASE,
TRM_LH_DWN = TRM_BASE,
TRM_LH_UP,
TRM_LV_DWN,
TRM_LV_UP,
TRM_RV_DWN,
TRM_RV_UP,
TRM_RH_DWN,
TRM_RH_UP,
#if defined(PCBHORUS)
TRM_LS_DWN,
TRM_LS_UP,
TRM_RS_DWN,
TRM_RS_UP,
TRM_LAST = TRM_RS_UP,
#else
TRM_LAST = TRM_RH_UP,
#endif
#if ROTARY_ENCODERS > 0 || defined(ROTARY_ENCODER_NAVIGATION)
BTN_REa,
#endif
#if ROTARY_ENCODERS > 0
BTN_REb,
#endif
NUM_KEYS,
SW_BASE=NUM_KEYS,
#if defined(PCBFLAMENCO)
SW_SA0=SW_BASE,
SW_SA1,
SW_SA2,
SW_SB0,
SW_SB2,
SW_SC0,
SW_SC1,
SW_SC2,
SW_SC3,
SW_SC4,
SW_SC5,
SW_SE0,
SW_SE2,
SW_SF0,
SW_SF1,
SW_SF2,
#elif defined(PCBTARANIS) || defined(PCBHORUS)
SW_SA0=SW_BASE,
SW_SA1,
SW_SA2,
SW_SB0,
SW_SB1,
SW_SB2,
SW_SC0,
SW_SC1,
SW_SC2,
SW_SD0,
SW_SD1,
SW_SD2,
SW_SE0,
SW_SE1,
SW_SE2,
SW_SF0,
SW_SF1,
SW_SF2,
SW_SG0,
SW_SG1,
SW_SG2,
SW_SH0,
SW_SH1,
SW_SH2,
#if defined(PCBX9E)
SW_SI0,
SW_SI1,
SW_SI2,
SW_SJ0,
SW_SJ1,
SW_SJ2,
SW_SK0,
SW_SK1,
SW_SK2,
SW_SL0,
SW_SL1,
SW_SL2,
SW_SM0,
SW_SM1,
SW_SM2,
SW_SN0,
SW_SN1,
SW_SN2,
SW_SO0,
SW_SO1,
SW_SO2,
SW_SP0,
SW_SP1,
SW_SP2,
SW_SQ0,
SW_SQ1,
SW_SQ2,
SW_SR0,
SW_SR1,
SW_SR2,
#endif
#else
SW_ID0=SW_BASE,
SW_ID1,
SW_ID2,
SW_THR,
SW_RUD,
SW_ELE,
SW_AIL,
SW_GEA,
SW_TRN,
#endif
};
#define EVT_KEY_MASK(e) ((e) & 0x1f)
#if defined(PCBHORUS)
@@ -250,7 +95,7 @@ class Key
bool state() { return m_vals > 0; }
void pauseEvents() { m_state = KSTATE_PAUSE; m_cnt = 0; }
void killEvents() { m_state = KSTATE_KILLED; }
EnumKeys key() const;
uint8_t key() const;
};
extern Key keys[NUM_KEYS];
@@ -265,8 +110,8 @@ extern event_t s_evt;
#define putEvent(evt) s_evt = evt
void pauseEvents(uint8_t enuk);
void killEvents(uint8_t enuk);
void pauseEvents(uint8_t index);
void killEvents(uint8_t index);
#if defined(CPUARM)
bool clearKeyEvents();