Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 2501 → Rev 2502

/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui_trkevnt.c
817,8 → 817,12
if( depressed )
SEQ_UI_UnInstallDelayedActionCallback(InitReq);
else {
SEQ_UI_InstallDelayedActionCallback(InitReq, 2000, 0);
SEQ_UI_Msg(SEQ_UI_MSG_DELAYED_ACTION_R, 2001, "", "to initialize Track!");
if( seq_ui_button_state.ENC_BTN_FWD_PRESSED ) {
InitReq(0);
} else {
SEQ_UI_InstallDelayedActionCallback(InitReq, 2000, 0);
SEQ_UI_Msg(SEQ_UI_MSG_DELAYED_ACTION_R, 2001, "", "to initialize Track!");
}
}
return 1; // value has been changed
}
/trunk/apps/sequencers/midibox_seq_v4/core/seq_hwcfg.c
218,6 → 218,7
.unmute_all_tracks_and_layers = ((( 0 -1)<<3)+ 0),
 
.footswitch = ((( 0 -1)<<3)+ 0),
.enc_btn_fwd = ((( 0 -1)<<3)+ 0),
.pattern_remix = ((( 0 -1)<<3)+ 0),
};
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_hwcfg.h
131,6 → 131,7
u8 unmute_all_tracks_and_layers;
 
u8 footswitch;
u8 enc_btn_fwd;
u8 pattern_remix;
} seq_hwcfg_button_t;
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.c
473,7 → 473,7
// forward to menu page
if( ui_button_callback != NULL ) {
ui_button_callback(gp, depressed);
ui_cursor_flash_ctr = ui_cursor_flash_overrun_ctr = 0;
ui_cursor_flash_ctr = ui_cursor_flash_overrun_ctr = 0; // ensure that value is visible when it has been changed
}
}
 
2071,6 → 2071,14
}
 
 
static s32 SEQ_UI_Button_EncBtnFwd(s32 depressed)
{
seq_ui_button_state.ENC_BTN_FWD_PRESSED = depressed == 0;
 
return 0; // no error
}
 
 
/////////////////////////////////////////////////////////////////////////////
// Button handler
/////////////////////////////////////////////////////////////////////////////
2254,6 → 2262,8
return SEQ_UI_Button_Fx(pin_value);
if( pin == seq_hwcfg_button.footswitch )
return SEQ_UI_Button_FootSwitch(pin_value);
if( pin == seq_hwcfg_button.enc_btn_fwd )
return SEQ_UI_Button_EncBtnFwd(pin_value);
if( pin == seq_hwcfg_button.pattern_remix )
return SEQ_UI_Button_Pattern_Remix(pin_value);
 
2387,8 → 2397,16
if( encoder >= 1 && encoder <= 16 )
SEQ_UI_PageSet(SEQ_UI_PAGES_MenuShortcutPageGet(encoder-1));
} else if( ui_encoder_callback != NULL ) {
ui_encoder_callback((encoder == 0) ? SEQ_UI_ENCODER_Datawheel : (encoder-1), incrementer);
ui_cursor_flash_ctr = ui_cursor_flash_overrun_ctr = 0; // ensure that value is visible when it has been changed
if( seq_ui_button_state.ENC_BTN_FWD_PRESSED ) {
// encoder emulates a GP button
ui_button_callback(encoder-1, 0);
ui_button_callback(encoder-1, 1);
ui_cursor_flash_ctr = ui_cursor_flash_overrun_ctr = 0; // ensure that value is visible when it has been changed
} else {
// common handling
ui_encoder_callback((encoder == 0) ? SEQ_UI_ENCODER_Datawheel : (encoder-1), incrementer);
ui_cursor_flash_ctr = ui_cursor_flash_overrun_ctr = 0; // ensure that value is visible when it has been changed
}
}
 
// request display update
/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.h
77,6 → 77,7
u32 TAP_TEMPO:1;
u32 UP:1;
u32 DOWN:1;
u32 ENC_BTN_FWD_PRESSED:1;
};
} seq_ui_button_state_t;
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_file_hw.c
559,6 → 559,8
seq_hwcfg_button.fx = din_value;
} else if( strcasecmp(parameter, "FOOTSWITCH") == 0 ) {
seq_hwcfg_button.footswitch = din_value;
} else if( strcasecmp(parameter, "ENC_BTN_FWD") == 0 ) {
seq_hwcfg_button.enc_btn_fwd = din_value;
} else if( strcasecmp(parameter, "PATTERN_RMX") == 0 ) {
seq_hwcfg_button.pattern_remix = din_value;
} else if( strcasecmp(parameter, "MUTE_ALL_TRACKS") == 0 ) {
/trunk/apps/sequencers/midibox_seq_v4/mios32/mios32_config.h
14,7 → 14,7
// The boot message which is print during startup and returned on a SysEx query
#define MIOS32_LCD_BOOT_MSG_DELAY 0 // we delay the boot and print a message inside the app
// <---------------------->
#define MIOS32_LCD_BOOT_MSG_LINE1 "MIDIbox SEQ V4.092"
#define MIOS32_LCD_BOOT_MSG_LINE1 "MIDIbox SEQ V4.093"
#define MIOS32_LCD_BOOT_MSG_LINE2 "(C) 2017 T. Klose"
 
// USB settings
/trunk/apps/sequencers/midibox_seq_v4/hwcfg/wilba_tpd/MBSEQ_HW.V4
651,6 → 651,9
# SR Pin
BUTTON_FOOTSWITCH 0 0
 
# SR Pin
BUTTON_ENC_BTN_FWD 0 0
 
# SR Pin
BUTTON_TRACK_MODE 0 0
BUTTON_TRACK_GROOVE 0 0
/trunk/apps/sequencers/midibox_seq_v4/hwcfg/standard_v4/MBSEQ_HW.V4
648,6 → 648,8
# SR Pin
BUTTON_FOOTSWITCH 0 0
 
# SR Pin
BUTTON_ENC_BTN_FWD 0 0
 
# SR Pin
BUTTON_TRACK_MODE 0 0
/trunk/apps/sequencers/midibox_seq_v4/hwcfg/tk/MBSEQ_HW.V4
648,6 → 648,8
# SR Pin
BUTTON_FOOTSWITCH 0 0
 
# SR Pin
BUTTON_ENC_BTN_FWD 0 0
 
# SR Pin
BUTTON_TRACK_MODE 0 0
/trunk/apps/sequencers/midibox_seq_v4/hwcfg/wilba/MBSEQ_HW.V4
650,6 → 650,9
# SR Pin
BUTTON_FOOTSWITCH 0 0
 
# SR Pin
BUTTON_ENC_BTN_FWD 0 0
 
# SR Pin
BUTTON_TRACK_MODE 0 0
BUTTON_TRACK_GROOVE 0 0