From baa19bbcdd7995236381456953b3d26002a2611f Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Tue, 11 May 2021 16:48:17 +0200 Subject: Adjust spacing on CH3 parameters --- src/sequencer.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/sequencer.c b/src/sequencer.c index 867d3e4..947b498 100644 --- a/src/sequencer.c +++ b/src/sequencer.c @@ -16,9 +16,9 @@ #define SEQ_DUTYCYCLE_POS_Y SEQ_ENV_POS_Y - 8 #define SEQ_SWEEP_POS_X SEQ_DUTYCYCLE_POS_X + SEQ_ENV_DIST #define SEQ_SWEEP_POS_Y SEQ_ENV_POS_Y -#define SEQ_CH3_PARAM_X SEQ_TRIG_POS_X +#define SEQ_CH3_PARAM_X SEQ_TRIG_POS_X + 1 #define SEQ_CH3_PARAM_Y SEQ_ENV_POS_Y - 12 -#define SEQ_CH3_PARAM_SEL_X SEQ_CH3_PARAM_X - 5 +#define SEQ_CH3_PARAM_SEL_X SEQ_CH3_PARAM_X - 4 #define SEQ_CH3_PARAM_SEL_Y SEQ_CH3_PARAM_Y + 22 #define SEQ_N_CHANNELS 3 @@ -1111,25 +1111,33 @@ update_sequencer_sprites(void) { // Wave A. draw_wave_pattern(wave_a, x, y, 2); - txt_position(x - 1, y + 20); - txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", - wave_a[0], wave_a[1], wave_a[2], wave_a[3], + txt_position(x, y + 20); + txt_printf("%02x%02x%02x%02x", + wave_a[0], wave_a[1], wave_a[2], wave_a[3]); + txt_position(x + 34, y + 20); + txt_printf("%02x%02x%02x%02x", wave_a[4], wave_a[5], wave_a[6], wave_a[7]); - txt_position(x - 1, y + 20 + 8); - txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", - wave_a[8], wave_a[9], wave_a[10], wave_a[11], + txt_position(x, y + 20 + 8); + txt_printf("%02x%02x%02x%02x", + wave_a[8], wave_a[9], wave_a[10], wave_a[11]); + txt_position(x + 34, y + 20 + 8); + txt_printf("%02x%02x%02x%02x", wave_a[12], wave_a[13], wave_a[14], wave_a[15]); // Wave B. x += 64 + 12; draw_wave_pattern(wave_b, x, y, 3); - txt_position(x - 1, y + 20); - txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", - wave_b[0], wave_b[1], wave_b[2], wave_b[3], + txt_position(x, y + 20); + txt_printf("%02x%02x%02x%02x", + wave_b[0], wave_b[1], wave_b[2], wave_b[3]); + txt_position(x + 34, y + 20); + txt_printf("%02x%02x%02x%02x", wave_b[4], wave_b[5], wave_b[6], wave_b[7]); - txt_position(x - 1, y + 20 + 8); - txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", - wave_b[8], wave_b[9], wave_b[10], wave_b[11], + txt_position(x, y + 20 + 8); + txt_printf("%02x%02x%02x%02x", + wave_b[8], wave_b[9], wave_b[10], wave_b[11]); + txt_position(x + 34, y + 20 + 8); + txt_printf("%02x%02x%02x%02x", wave_b[12], wave_b[13], wave_b[14], wave_b[15]); // Clear the backbuffer. @@ -1142,18 +1150,18 @@ update_sequencer_sprites(void) { u8 x_positions[] = { // 32 half bytes (Wave A). 0, 4, 8, 12, 16, 20, 24, 28, - 36, 40, 44, 48, 52, 56, 60, 64, + 34, 38, 42, 46, 50, 54, 58, 62, 0, 4, 8, 12, 16, 20, 24, 28, - 36, 40, 44, 48, 52, 56, 60, 64, + 34, 38, 42, 46, 50, 54, 58, 62, // 32 half bytes (Wave B). 76, 80, 84, 88, 92, 96, 100, 104, - 112, 116, 120, 124, 128, 132, 136, 140, + 110, 114, 118, 122, 126, 130, 134, 138, 76, 80, 84, 88, 92, 96, 100, 104, - 112, 116, 120, 124, 128, 132, 136, 140, + 110, 114, 118, 122, 126, 130, 134, 138, // Default wave A. - 4, 21, 38, 55, + 3, 20, 37, 54, // Default wave B. - 80, 97, 114, 131, + 79, 96, 113, 130, }; u8 y_positions[] = { // 32 half bytes (Wave A) -- cgit v1.2.1