Fix compilation errors
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
#define PROMPT_SYSTEM_BASE 230
|
#define PROMPT_SYSTEM_BASE 230
|
||||||
#define PROMPT_CUSTOM_BASE 256
|
#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 void pushPrompt(uint16_t prompt);
|
||||||
extern bool isPlaying();
|
extern bool isPlaying();
|
||||||
|
|
||||||
|
|||||||
+2
-10
@@ -1550,16 +1550,8 @@ void menuProcExpoOne(uint8_t event)
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case EXPO_FIELD_WIDTH:
|
case EXPO_FIELD_WIDTH:
|
||||||
{
|
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT((int8_t&)ed->weight));
|
||||||
#if defined(PCBARM)
|
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, (int8_t&)ed->weight, 0, 100, 0, STR_DRWEIGHT);
|
||||||
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
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case EXPO_FIELD_EXPO:
|
case EXPO_FIELD_EXPO:
|
||||||
if (ed->curveMode==MODE_EXPO || ed->curveParam==0) {
|
if (ed->curveMode==MODE_EXPO || ed->curveParam==0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user