Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 2617 → Rev 2618

/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui_opt.c
199,7 → 199,7
},
 
{//<-------------------------------------->
"Swap LED Colours: GP Select",
"Swap LED Colours: GP Select XOR Pos",
"",
},
 
678,6 → 678,12
else
seq_ui_options.SWAP_SELECT_LED_COLOURS ^= 1;
ui_store_file_required = 1;
} else if( encoder == SEQ_UI_ENCODER_GP15 || encoder == SEQ_UI_ENCODER_GP16 ) {
if( incrementer )
seq_ui_options.GP_LED_DONT_XOR_POS = (incrementer > 0) ? 1 : 0;
else
seq_ui_options.GP_LED_DONT_XOR_POS ^= 1;
ui_store_file_required = 1;
}
return 1;
} break;
1221,10 → 1227,12
if( ui_cursor_flash ) {
SEQ_LCD_PrintSpaces(20);
} else {
SEQ_LCD_PrintString(seq_ui_options.SWAP_GP_LED_COLOURS ? "On " : "Off");
SEQ_LCD_PrintSpaces(2);
SEQ_LCD_PrintString(seq_ui_options.SWAP_SELECT_LED_COLOURS ? "On " : "Off");
SEQ_LCD_PrintSpaces(2 + 10);
SEQ_LCD_PrintString(seq_ui_options.SWAP_GP_LED_COLOURS ? "Swap" : "Norm");
SEQ_LCD_PrintSpaces(1);
SEQ_LCD_PrintString(seq_ui_options.SWAP_SELECT_LED_COLOURS ? "Swap" : "Norm");
SEQ_LCD_PrintSpaces(1 + 3);
SEQ_LCD_PrintString(seq_ui_options.GP_LED_DONT_XOR_POS ? "Off" : "On ");
SEQ_LCD_PrintSpaces(5);
}
} break;
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_file_gc.c
386,6 → 386,10
#ifndef MBSEQV4L
seq_ui_options.SWAP_SELECT_LED_COLOURS = value;
#endif
} else if( strcmp(parameter, "UiGpLedDontXorPos") == 0 ) {
#ifndef MBSEQV4L
seq_ui_options.GP_LED_DONT_XOR_POS = value;
#endif
} else if( strcmp(parameter, "UiInvertMuteLeds") == 0 ) {
#ifndef MBSEQV4L
seq_ui_options.INVERT_MUTE_LEDS = value;
724,6 → 728,11
#endif
 
#ifndef MBSEQV4L
sprintf(line_buffer, "UiGpLedDontXorPos %d\n", seq_ui_options.GP_LED_DONT_XOR_POS);
FLUSH_BUFFER;
#endif
 
#ifndef MBSEQV4L
sprintf(line_buffer, "UiInvertMuteLeds %d\n", seq_ui_options.INVERT_MUTE_LEDS);
FLUSH_BUFFER;
#endif
/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.c
3507,10 → 3507,11
// since it's only executed when ui_gp_leds or gp_mask has changed, it doesn't really hurt
 
u16 modified_gp_leds = ui_gp_leds;
#if 1
 
// extra: red LED is lit exclusively for higher contrast
modified_gp_leds &= ~pos_marker_mask;
#endif
if( !seq_ui_options.GP_LED_DONT_XOR_POS ) {
modified_gp_leds &= ~pos_marker_mask;
}
 
u16 leds_colour1 = !seq_ui_options.SWAP_GP_LED_COLOURS ? modified_gp_leds : pos_marker_mask;
u16 leds_colour2 = !seq_ui_options.SWAP_GP_LED_COLOURS ? pos_marker_mask : modified_gp_leds;
3548,10 → 3549,11
// 4 = 40,41 2 = 43,42 3 = 45,44 4 = 47,46
 
u16 modified_gp_leds = ui_gp_leds;
#if 1
 
// extra: red LED is lit exclusively for higher contrast
modified_gp_leds &= ~pos_marker_mask;
#endif
if( !seq_ui_options.GP_LED_DONT_XOR_POS ) {
modified_gp_leds &= ~pos_marker_mask;
}
 
u16 leds_colour1 = !seq_ui_options.SWAP_GP_LED_COLOURS ? modified_gp_leds : pos_marker_mask;
u16 leds_colour2 = !seq_ui_options.SWAP_GP_LED_COLOURS ? pos_marker_mask : modified_gp_leds;
/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.h
191,17 → 191,18
 
 
typedef union {
u8 ALL;
u16 ALL;
 
struct {
u8 RESTORE_TRACK_SELECTIONS:1;
u8 MODIFY_PATTERN_BANKS:1;
u8 PRINT_AND_MODIFY_WITHOUT_GATES:1;
u8 PRINT_TRANSPOSED_NOTES:1;
u8 SELECT_UNMUTED_TRACK:1;
u8 SWAP_GP_LED_COLOURS:1;
u8 SWAP_SELECT_LED_COLOURS:1;
u8 INVERT_MUTE_LEDS:1;
u16 RESTORE_TRACK_SELECTIONS:1;
u16 MODIFY_PATTERN_BANKS:1;
u16 PRINT_AND_MODIFY_WITHOUT_GATES:1;
u16 PRINT_TRANSPOSED_NOTES:1;
u16 SELECT_UNMUTED_TRACK:1;
u16 SWAP_GP_LED_COLOURS:1;
u16 SWAP_SELECT_LED_COLOURS:1;
u16 GP_LED_DONT_XOR_POS:1;
u16 INVERT_MUTE_LEDS:1;
};
} seq_ui_options_t;