Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 2596 → Rev 2597

/trunk/apps/sequencers/midibox_seq_v4/core/seq_ui.c
3510,8 → 3510,8
{
u8 value = 0;
 
if( modified_gp_leds & (1 << 0) ) value |= (1 << 0);
if( pos_marker_mask & (1 << 0) ) value |= (1 << 1);
if( modified_gp_leds & (1 << 0) ) value |= (1 << 1);
if( pos_marker_mask & (1 << 0) ) value |= (1 << 0);
 
if( modified_gp_leds & (1 << 1) ) value |= (1 << 3);
if( pos_marker_mask & (1 << 1) ) value |= (1 << 2);
3529,8 → 3529,8
{
u8 value = 0;
 
if( modified_gp_leds & (1 << 4) ) value |= (1 << 0);
if( pos_marker_mask & (1 << 4) ) value |= (1 << 1);
if( modified_gp_leds & (1 << 4) ) value |= (1 << 1);
if( pos_marker_mask & (1 << 4) ) value |= (1 << 0);
 
if( modified_gp_leds & (1 << 5) ) value |= (1 << 3);
if( pos_marker_mask & (1 << 5) ) value |= (1 << 2);
3548,8 → 3548,8
{
u8 value = 0;
 
if( modified_gp_leds & (1 << 8) ) value |= (1 << 0);
if( pos_marker_mask & (1 << 8) ) value |= (1 << 1);
if( modified_gp_leds & (1 << 8) ) value |= (1 << 1);
if( pos_marker_mask & (1 << 8) ) value |= (1 << 0);
 
if( modified_gp_leds & (1 << 9) ) value |= (1 << 3);
if( pos_marker_mask & (1 << 9) ) value |= (1 << 2);
3567,8 → 3567,8
{
u8 value = 0;
 
if( modified_gp_leds & (1 << 12) ) value |= (1 << 0);
if( pos_marker_mask & (1 << 12) ) value |= (1 << 1);
if( modified_gp_leds & (1 << 12) ) value |= (1 << 1);
if( pos_marker_mask & (1 << 12) ) value |= (1 << 0);
 
if( modified_gp_leds & (1 << 13) ) value |= (1 << 3);
if( pos_marker_mask & (1 << 13) ) value |= (1 << 2);
3646,8 → 3646,8
{
u8 value = 0;
 
if( select_leds_green & (1 << 0) ) value |= (1 << 0);
if( select_leds_red & (1 << 0) ) value |= (1 << 1);
if( select_leds_green & (1 << 0) ) value |= (1 << 1);
if( select_leds_red & (1 << 0) ) value |= (1 << 0);
 
if( select_leds_green & (1 << 1) ) value |= (1 << 3);
if( select_leds_red & (1 << 1) ) value |= (1 << 2);
3665,8 → 3665,8
{
u8 value = 0;
 
if( select_leds_green & (1 << 4) ) value |= (1 << 0);
if( select_leds_red & (1 << 4) ) value |= (1 << 1);
if( select_leds_green & (1 << 4) ) value |= (1 << 1);
if( select_leds_red & (1 << 4) ) value |= (1 << 0);
 
if( select_leds_green & (1 << 5) ) value |= (1 << 3);
if( select_leds_red & (1 << 5) ) value |= (1 << 2);
3684,8 → 3684,8
{
u8 value = 0;
 
if( select_leds_green & (1 << 8) ) value |= (1 << 0);
if( select_leds_red & (1 << 8) ) value |= (1 << 1);
if( select_leds_green & (1 << 8) ) value |= (1 << 1);
if( select_leds_red & (1 << 8) ) value |= (1 << 0);
 
if( select_leds_green & (1 << 9) ) value |= (1 << 3);
if( select_leds_red & (1 << 9) ) value |= (1 << 2);
3703,8 → 3703,8
{
u8 value = 0;
 
if( select_leds_green & (1 << 12) ) value |= (1 << 0);
if( select_leds_red & (1 << 12) ) value |= (1 << 1);
if( select_leds_green & (1 << 12) ) value |= (1 << 1);
if( select_leds_red & (1 << 12) ) value |= (1 << 0);
 
if( select_leds_green & (1 << 13) ) value |= (1 << 3);
if( select_leds_red & (1 << 13) ) value |= (1 << 2);
/trunk/apps/sequencers/midibox_seq_v4/core/seq_tpd.c
114,22 → 114,23
// transfer pattern to SRs
{
int i;
u8 inversion_mask = (seq_hwcfg_tpd.enabled == 2) ? 0xff : 0x00;
u8 inversion_mask_row = (seq_hwcfg_tpd.enabled == 1) ? 0x00 : 0xff; // 0x00, 0xFF, 0xFF for tpd modes 1, 2, 3
u8 inversion_mask_pat = (seq_hwcfg_tpd.enabled == 2) ? 0xff : 0x00; // 0x00, 0xFF, 0x00 for tpd modes 1, 2, 3
 
// row selection
u8 select_pattern = ~(1 << cycle_ctr);
for(i=0; i<2; ++i) {
if( seq_hwcfg_tpd.columns_sr[i] )
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.columns_sr[i] - 1, mios32_dout_reverse_tab[select_pattern ^ inversion_mask]);
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.columns_sr[i] - 1, mios32_dout_reverse_tab[select_pattern ^ inversion_mask_row]);
}
 
// row patterns
for(i=0; i<2; ++i) {
if( seq_hwcfg_tpd.rows_sr_green[i] )
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.rows_sr_green[i] - 1, mios32_dout_reverse_tab[tpd_display[i][TPD_GREEN][cycle_ctr] ^ inversion_mask]);
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.rows_sr_green[i] - 1, mios32_dout_reverse_tab[tpd_display[i][TPD_GREEN][cycle_ctr] ^ inversion_mask_pat]);
if( seq_hwcfg_tpd.rows_sr_red[i] )
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.rows_sr_red[i] - 1, mios32_dout_reverse_tab[tpd_display[i][TPD_RED][cycle_ctr] ^ inversion_mask]);
MIOS32_DOUT_SRSet(seq_hwcfg_tpd.rows_sr_red[i] - 1, mios32_dout_reverse_tab[tpd_display[i][TPD_RED][cycle_ctr] ^ inversion_mask_pat]);
}
}