From d2be261b88753c3e0fdeb7588057aa3f1648ead5 Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Wed, 12 Jul 2023 16:02:28 +0200 Subject: Add notification bar and mockup of pattern chaining --- src/drawing.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'src/drawing.c') diff --git a/src/drawing.c b/src/drawing.c index 4481374..3e00e17 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -342,7 +342,7 @@ draw_note(u8 note, u8 clr) { x0 = PIANO_START_X + 2 + octave * 28 + 4; x1 = x0 + 2; y0 = PIANO_START_Y - 2 + 13; - y1 = y0 + 7; + y1 = y0 + 2; draw_filled_rect(x0, y0, x1, y1, clr); } break; case 4:{ @@ -354,7 +354,7 @@ draw_note(u8 note, u8 clr) { x0 = PIANO_START_X + 2 + octave * 28 + 8; x1 = x0 + 2; y0 = PIANO_START_Y - 2 + 13; - y1 = y0 + 7; + y1 = y0 + 2; draw_filled_rect(x0, y0, x1, y1, clr); } break; case 5:{ @@ -377,7 +377,7 @@ draw_note(u8 note, u8 clr) { x0 = PIANO_START_X + 2 + octave * 28 + 16; x1 = x0 + 2; y0 = PIANO_START_Y - 2 + 13; - y1 = y0 + 7; + y1 = y0 + 2; draw_filled_rect(x0, y0, x1, y1, clr); } break; case 9:{ @@ -389,7 +389,7 @@ draw_note(u8 note, u8 clr) { x0 = PIANO_START_X + 2 + octave * 28 + 20; x1 = x0 + 2; y0 = PIANO_START_Y - 2 + 13; - y1 = y0 + 7; + y1 = y0 + 2; draw_filled_rect(x0, y0, x1, y1, clr); } break; case 11: { @@ -401,7 +401,7 @@ draw_note(u8 note, u8 clr) { x0 = PIANO_START_X + 2 + octave * 28 + 24; x1 = x0 + 2; y0 = PIANO_START_Y - 2 + 13; - y1 = y0 + 7; + y1 = y0 + 2; draw_filled_rect(x0, y0, x1, y1, clr); } break; default: { @@ -611,7 +611,7 @@ draw_parameters_wave(ChannelWaveParams *params, bool global) { u8 *wave_b = params->wave_b; size_t x = PARAMS_START_X; - size_t y = PARAMS_START_Y + 12; + size_t y = PARAMS_START_Y + 8; // Wave Patterns. draw_wave_pattern(wave_a, x, y + 1, COL_ACC_1); @@ -706,7 +706,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Shape drawing. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 47; + size_t y = PARAMS_START_Y + PARAMS_H - 43; size_t x0 = x + 2; size_t x1 = x0; @@ -788,14 +788,14 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Bounding box. { size_t x0 = PARAMS_START_X + 31 + x_offset; - size_t y0 = PARAMS_START_Y + PARAMS_H - 50; + size_t y0 = PARAMS_START_Y + PARAMS_H - 46; size_t x1 = x0 + 79; size_t y1 = y0 + 21; draw_rect(x0, y0, x1, y1, COL_ACC_2); } size_t x = PARAMS_START_X + 42 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 47; + size_t y = PARAMS_START_Y + PARAMS_H - 43; size_t x0 = x; size_t y0 = y + 15 - params->env_volume; size_t x1 = x + 8 * params->env_time; @@ -954,7 +954,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Labels. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 48; + size_t y = PARAMS_START_Y + PARAMS_H - 43; txt_drawf_small("shape", x + 1, y - 12, col_fg); txt_drawf_small("envelope", x + 54, y - 12, col_fg); if (sweep) { @@ -998,14 +998,14 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Bounding box. { size_t x0 = PARAMS_START_X + 31 + x_offset; - size_t y0 = PARAMS_START_Y + PARAMS_H - 50; + size_t y0 = PARAMS_START_Y + PARAMS_H - 46; size_t x1 = x0 + 79; size_t y1 = y0 + 21; draw_rect(x0, y0, x1, y1, COL_ACC_2); } size_t x = PARAMS_START_X + 42 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 47; + size_t y = PARAMS_START_Y + PARAMS_H - 43; size_t x0 = x; size_t y0 = y + 15 - params->env_volume; size_t x1 = x + 8 * params->env_time; @@ -1103,7 +1103,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Labels. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 48; + size_t y = PARAMS_START_Y + PARAMS_H - 43; txt_drawf_small("envelope", x + 54, y - 12, col_fg); } } @@ -1238,3 +1238,14 @@ draw_piano_notes(void) { } } } + +void +draw_notif_bar() { + u8 x0 = PARAMS_START_X; + u8 y0 = PARAMS_START_Y - 7; + u8 x1 = PARAMS_START_X + PARAMS_W; + u8 y1 = y0 + 10; + u8 color = COL_FG; + draw_rect(x0, y0, x1, y1, color); + txt_drawf_small("HELLO WORLD!", x0 + 2, y0 + 1, color); +} -- cgit v1.2.1