diff --git a/src/model_menus.cpp b/src/model_menus.cpp index eb3ecc0cf..63ab921a9 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -1567,22 +1567,22 @@ void menuProcMixOne(uint8_t event) case MIX_FIELD_DELAY_UP: lcd_putsLeft(y, STR_DELAYUP); lcd_outdezAtt(MIXES_2ND_COLUMN,y,md2->delayUp,attr|LEFT); - if(attr) CHECK_INCDEC_MODELVAR( event, md2->delayUp, 0, 15); + if(attr) CHECK_INCDEC_MODELVAR( event, md2->delayUp, 0, MAX_DELAY); break; case MIX_FIELD_DELAY_DOWN: lcd_putsLeft(y, STR_DELAYDOWN); lcd_outdezAtt(MIXES_2ND_COLUMN,y,md2->delayDown,attr|LEFT); - if(attr) CHECK_INCDEC_MODELVAR( event, md2->delayDown, 0, 15); + if(attr) CHECK_INCDEC_MODELVAR( event, md2->delayDown, 0, MAX_DELAY); break; case MIX_FIELD_SLOW_UP: lcd_putsLeft(y, STR_SLOWUP); lcd_outdezAtt(MIXES_2ND_COLUMN,y,5*md2->speedUp,attr|PREC1|LEFT); - if(attr) CHECK_INCDEC_MODELVAR( event, md2->speedUp, 0, 15); + if(attr) CHECK_INCDEC_MODELVAR( event, md2->speedUp, 0, MAX_SLOW); break; case MIX_FIELD_SLOW_DOWN: lcd_putsLeft(y, STR_SLOWDOWN); lcd_outdezAtt(MIXES_2ND_COLUMN,y,5*md2->speedDown,attr|PREC1|LEFT); - if(attr) CHECK_INCDEC_MODELVAR( event, md2->speedDown, 0, 15); + if(attr) CHECK_INCDEC_MODELVAR( event, md2->speedDown, 0, MAX_SLOW); break; } } diff --git a/src/myeeprom.h b/src/myeeprom.h index 3cb7de258..ec176c78a 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -239,11 +239,13 @@ enum MixSources { #define TRIM_THR -3 #define TRIM_AIL -4 -#define MLTPX_ADD 0 -#define MLTPX_MUL 1 -#define MLTPX_REP 2 +#define MLTPX_ADD 0 +#define MLTPX_MUL 1 +#define MLTPX_REP 2 #if defined(PCBARM) +#define MAX_DELAY 60 /* 30 seconds */ +#define MAX_SLOW 60 /* 30 seconds */ PACK(typedef struct t_MixData { uint8_t destCh; int8_t phase; @@ -258,10 +260,12 @@ PACK(typedef struct t_MixData { uint8_t speedDown; // 0 nichts uint8_t srcRaw; // int8_t differential; - int8_t carryTrim; + int8_t carryTrim; int8_t sOffset; }) MixData; #else +#define MAX_DELAY 15 /* 7.5 seconds */ +#define MAX_SLOW 15 /* 7.5 seconds */ PACK(typedef struct t_MixData { uint8_t destCh:4; // 0, 1..NUM_CHNOUT int8_t phase:4; // -5=!FP4, 0=normal, 5=FP4