From 02bb061b1d7fd47942b90df9869b480f2fe1e60f Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 28 Mar 2014 17:52:08 +0100 Subject: [PATCH] Display problem on PlayTrack function, when the user wanted to select below 1x which is !1x - which means don't play this track at startup --- radio/src/gui/menu_model.cpp | 6 +++--- radio/src/myeeprom.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index e49eb6ec3..d8fa2e543 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -5128,16 +5128,16 @@ void menuModelCustomFunctions(uint8_t event) #if LCD_W >= 212 lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2, y, "1x", attr); #else - lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+1, y, '-', attr); + lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+3, y, '-', attr); #endif } #if defined(CPUARM) else if (CFN_PLAY_REPEAT(sd) == CFN_PLAY_REPEAT_NOSTART) { #if LCD_W >= 212 - lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN-2, y, '!', attr); + lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN-1, y, '!', attr); lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2, y, "1x", attr); #else - lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+1, y, '!', attr); + lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF, y, "!-", attr); #endif } #endif diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 7eba2afc4..7bcea8e53 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -883,7 +883,7 @@ PACK(typedef struct t_CustomFnData { // Function Switches data #define CFN_TIMER_INDEX(p) ((p)->all.param) #define CFN_PLAY_REPEAT(p) ((p)->active) #define CFN_PLAY_REPEAT_MUL 1 -#define CFN_PLAY_REPEAT_NOSTART 0x3F +#define CFN_PLAY_REPEAT_NOSTART 0xFF #define CFN_GVAR_MODE(p) ((p)->all.mode) #define CFN_PARAM(p) ((p)->all.val) #define CFN_RESET(p) ((p)->active=0, (p)->clear.val1=0, (p)->clear.val2=0)