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

Fix compilation errors

Browse Source
This commit is contained in:
bsongis
2012-08-20 18:57:50 +00:00
parent c2563ca816
commit 511f5b8338
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gruvin9x/somo14d.h
+1 -1
View File
@@ -34,7 +34,7 @@
#define PROMPT_SYSTEM_BASE 230
#define PROMPT_CUSTOM_BASE 256
#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+v)
#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+p)
extern void pushPrompt(uint16_t prompt);
extern bool isPlaying();
src/model_menus.cpp
+2 -10
View File
@@ -1550,16 +1550,8 @@ void menuProcExpoOne(uint8_t event)
break;
#endif
case EXPO_FIELD_WIDTH:
{
#if defined(PCBARM)
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT(ed->weight));
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, ed->weight, 0, 100, 0, STR_DRWEIGHT);
#else
PREPARE_INFLIGHT_BITFIELD(&ed->expo - 1);
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT(*bitfield));
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR_BITFIELD(event, ed->weight, 0, 100, 0, STR_DRWEIGHT, 1);
#endif
}
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT((int8_t&)ed->weight));
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, (int8_t&)ed->weight, 0, 100, 0, STR_DRWEIGHT);
break;
case EXPO_FIELD_EXPO:
if (ed->curveMode==MODE_EXPO || ed->curveParam==0) {