Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 2604 → Rev 2605

/trunk/apps/sequencers/midibox_seq_v4/CHANGELOG.txt
58,7 → 58,9
 
o experimental (might be optional in future): show measure and pattern step position in main screen
 
o STM32F4 board: orange LED shows measure, red LED any received MIDI IN, blue LED any transmitted MIDI OUT
 
 
MIDIboxSEQ V4.094b
~~~~~~~~~~~~~~~~~~
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_midi_port.c
839,7 → 839,10
if( port_ix >= 0 ) {
midi_out_package[port_ix] = package;
midi_out_ctr[port_ix] = 20; // 2 seconds lifetime
seq_midi_port_out_combined_ctr = 5; // 500 mS lifetime
 
if( port < 0xf0 ) { // ignore Bus1..4
seq_midi_port_out_combined_ctr = 5; // 500 mS lifetime
}
}
}
 
905,7 → 908,10
if( port_ix >= 0 ) {
midi_in_package[port_ix] = package;
midi_in_ctr[port_ix] = 20; // 2 seconds lifetime
seq_midi_port_in_combined_ctr = 5; // 500 mS lifetime
 
if( port < 0xf0 ) { // ignore Bus1..4
seq_midi_port_in_combined_ctr = 5; // 500 mS lifetime
}
}
}
 
/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.c
3338,16 → 3338,21
u8 beat_led_on = sequencer_running && ((seq_core_state.ref_step % 4) == 0);
SEQ_LED_PinSet(seq_hwcfg_led.beat, beat_led_on);
 
// mirror to status LED (inverted, so that LED is normaly on)
MIOS32_BOARD_LED_Set(0xffffffff, beat_led_on ? 0 : 1);
// mirror to green status LED (inverted, so that LED is normaly on)
MIOS32_BOARD_LED_Set(0x00000001, beat_led_on ? 0 : 1);
 
// measure LED
u8 measure_led_on = sequencer_running && ((seq_core_state.ref_step % (seq_core_steps_per_measure+1)) == 0);
SEQ_LED_PinSet(seq_hwcfg_led.measure, measure_led_on);
 
// mirror to red status LED
MIOS32_BOARD_LED_Set(0x00000002, measure_led_on ? 2 : 0);
 
// MIDI IN/OUT LEDs
SEQ_LED_PinSet(seq_hwcfg_led.midi_in_combined, seq_midi_port_in_combined_ctr);
MIOS32_BOARD_LED_Set(0x00000004, seq_midi_port_in_combined_ctr ? 4 : 0);
SEQ_LED_PinSet(seq_hwcfg_led.midi_out_combined, seq_midi_port_out_combined_ctr);
MIOS32_BOARD_LED_Set(0x00000008, seq_midi_port_out_combined_ctr ? 8 : 0);
 
// don't continue if no new step has been generated and GP LEDs haven't changed
if( !seq_core_step_update_req && prev_ui_gp_leds == ui_gp_leds && sequencer_running ) // sequencer running check: workaround - as long as sequencer not running, we won't get an step update request!
/trunk/apps/sequencers/midibox_seq_v4/core/seq_core.c
520,7 → 520,7
bpm_tick_prefetched = bpm_tick;
 
#if LED_PERFORMANCE_MEASURING == 1
MIOS32_BOARD_LED_Set(0xffffffff, 1);
MIOS32_BOARD_LED_Set(0x00000001, 1);
#endif
#if STOPWATCH_PERFORMANCE_MEASURING == 1
SEQ_STATISTICS_StopwatchReset();
531,7 → 531,7
SEQ_MIDPLY_Tick(bpm_tick);
 
#if LED_PERFORMANCE_MEASURING == 1
MIOS32_BOARD_LED_Set(0xffffffff, 0);
MIOS32_BOARD_LED_Set(0x00000001, 0);
#endif
#if STOPWATCH_PERFORMANCE_MEASURING == 1
SEQ_STATISTICS_StopwatchCapture();
/trunk/apps/sequencers/midibox_seq_v4/core/seq_pattern.c
132,11 → 132,11
portEXIT_CRITICAL();
 
#if LED_PERFORMANCE_MEASURING
MIOS32_BOARD_LED_Set(0xffffffff, 1);
MIOS32_BOARD_LED_Set(0x00000001, 1);
#endif
SEQ_PATTERN_Load(group, pattern);
#if LED_PERFORMANCE_MEASURING
MIOS32_BOARD_LED_Set(0xffffffff, 0);
MIOS32_BOARD_LED_Set(0x00000001, 0);
#endif
} else {
 
183,7 → 183,7
u8 group;
 
#if LED_PERFORMANCE_MEASURING
MIOS32_BOARD_LED_Set(0xffffffff, 1);
MIOS32_BOARD_LED_Set(0x00000001, 1);
#endif
 
MUTEX_SDCARD_TAKE; // take SD Card Mutex before entering critical section, because within the section we won't get it anymore -> hangup
238,7 → 238,7
MUTEX_SDCARD_GIVE;
 
#if LED_PERFORMANCE_MEASURING
MIOS32_BOARD_LED_Set(0xffffffff, 0);
MIOS32_BOARD_LED_Set(0x00000001, 0);
#endif
 
return 0; // no error