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
+6 -1
View File
@@ -10,7 +10,12 @@ set(TARGET_DIR mega2560)
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} 9x_bitmaps)
add_definitions(-DPCB${PCB} -DCPUM2560 -DROTARY_ENCODERS=2)
set(TARGET_SRC ${TARGET_SRC} board.cpp)
set(GUI_SRC ${GUI_SRC} ${9X_GUI_SRC})
set(GUI_SRC
${GUI_SRC}
model_inputs_mixes.cpp
radio_diagkeys.cpp
radio_diaganas.cpp
)
set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/9x/lcd_driver.cpp)
if(PWRMANAGE)
add_definitions(-DPWRMANAGE)
+13 -11
View File
@@ -94,14 +94,16 @@ uint8_t keyDown()
return ((~PINL) & 0x3F) || ROTENC_DOWN();
}
bool switchState(EnumKeys enuk)
uint8_t keyState(uint8_t index)
{
uint8_t result = 0 ;
return keys[index].state();
}
if (enuk < (int)DIM(keys))
return keys[enuk].state() ? 1 : 0;
switch(enuk){
uint8_t switchState(uint8_t index)
{
uint8_t result = 0;
switch (index) {
case SW_ELE:
result = !(PINL & (1<<INP_L_ElevDR));
break;
@@ -169,7 +171,7 @@ uint8_t trimDown(uint8_t idx)
void readKeysAndTrims()
{
uint8_t enuk = KEY_MENU;
uint8_t index = KEY_MENU;
keys[BTN_REa].input(~PINJ & 0x01);
keys[BTN_REb].input(~PINJ & 0x02);
@@ -180,16 +182,16 @@ void readKeysAndTrims()
in |= (tin & 0x30) >> 3;
for (int i=1; i<7; i++) {
keys[enuk].input(in & (1<<i));
++enuk;
keys[index].input(in & (1<<i));
++index;
}
// Trims
in = ~PINF;
for (int i=0; i<8; i++) {
// INP_D_TRM_RH_UP 0 .. INP_D_TRM_LH_UP 7
keys[enuk].input(in & pgm_read_byte(crossTrim+i));
++enuk;
keys[index].input(in & pgm_read_byte(crossTrim+i));
++index;
}
}
+3 -1
View File
@@ -79,6 +79,8 @@ void boardInit(void);
#define backlightEnable() PORTC |= (1<<OUT_C_LIGHT)
#define backlightDisable() PORTC &= ~(1<<OUT_C_LIGHT)
#define isBacklightEnable() PORTC & (1<<OUT_C_LIGHT)
#define BACKLIGHT_ENABLE() backlightEnable()
#define BACKLIGHT_DISABLE() backlightDisable()
// SD driver
#define BLOCK_SIZE 512 /* Block Size in Bytes */
@@ -143,7 +145,7 @@ void sdPoll10ms(void);
#define OUT_C_LCD_A0 5
#define OUT_C_LCD_RES 4
#define OUT_C_LCD_CS1 3
#define OUT_C_LIGHT 2
#define OUT_C_LIGHT 2
// DBLKeys driver
#define KEYS_PRESSED() (~PINL)