Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

VC++ compilation in companion9x

Browse source
This commit is contained in:
bsongis 2012-04-20 21:58:58 +00:00
parent 29700853fd
commit c50859fe62
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/model_menus.cpp
View file

@ -527,7 +527,17 @@ enum menuProcModelItems {
ITEM_MODEL_PROTOCOL_PARAMS ITEM_MODEL_PROTOCOL_PARAMS
}; };
// TODO little flash saving with the test on protocol below #if defined(DSM2)
#define IS_DSM2_PROTOCOL(protocol) (protocol==PROTO_DSM2)
#else
#define IS_DSM2_PROTOCOL(protocol) (0)
#endif
#if defined(PXX)
#define IS_PXX_PROTOCOL(protocol) (protocol==PROTO_PXX)
#else
#define IS_PXX_PROTOCOL(protocol) (0)
#endif
#define MODEL_PARAM_OFS (9*FW+2) #define MODEL_PARAM_OFS (9*FW+2)
void menuProcModel(uint8_t event) void menuProcModel(uint8_t event)
@ -535,14 +545,7 @@ void menuProcModel(uint8_t event)
lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2); lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
uint8_t protocol = g_model.protocol; uint8_t protocol = g_model.protocol;
MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol==PROTO_PPM||protocol==PROTO_FAAST MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol==PROTO_PPM||protocol==PROTO_FAAST||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 12 : 11), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,2,1});
#if defined(DSM2)
||protocol==PROTO_DSM2
#endif
#if defined(PXX)
||protocol==PROTO_PXX
#endif
) ? 12 : 11), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,2,1});
uint8_t sub = m_posVert - 1; uint8_t sub = m_posVert - 1;

6
src/myeeprom.h
View file

@ -134,11 +134,7 @@ PACK(typedef struct t_EEGeneral {
uint8_t templateSetup; //RETA order according to chout_ar array uint8_t templateSetup; //RETA order according to chout_ar array
int8_t PPM_Multiplier; int8_t PPM_Multiplier;
int8_t hapticLength; int8_t hapticLength;
#if defined(ROTARY_ENCODERS) uint8_t reNavigation; // TODO not needed on stock board
uint8_t reNavigation;
#else
uint8_t spare3;
#endif
int8_t beeperLength:3; int8_t beeperLength:3;
uint8_t hapticStrength:3; uint8_t hapticStrength:3;
uint8_t gpsFormat:1; uint8_t gpsFormat:1;

4
src/open9x.cpp
View file

@ -2608,12 +2608,14 @@ int main(void)
lcd_clear() ; lcd_clear() ;
displayPopup(STR_SHUTDOWN); displayPopup(STR_SHUTDOWN);
eeCheck(true); eeCheck(true);
lcd_clear() ;
refreshDisplay() ;
// TODO needed? lcdSetRefVolt(0);
soft_power_off(); // Only turn power off if necessary soft_power_off(); // Only turn power off if necessary
#endif #endif
#if defined(PCBARM) #if defined(PCBARM)
if (shutdown_state == e_power_usb) { if (shutdown_state == e_power_usb) {
lcd_clear();
lcd_putcAtt( 48, 24, 'U', DBLSIZE ) ; lcd_putcAtt( 48, 24, 'U', DBLSIZE ) ;
lcd_putcAtt( 60, 24, 'S', DBLSIZE ) ; lcd_putcAtt( 60, 24, 'S', DBLSIZE ) ;
lcd_putcAtt( 72, 24, 'B', DBLSIZE ) ; lcd_putcAtt( 72, 24, 'B', DBLSIZE ) ;