From 9c0c004b78a12861ed03ce851d0885d68a25cb02 Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Tue, 22 Aug 2023 14:06:51 +0200 Subject: Add control for scale selection and rcol notifs --- src/drawing.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src/drawing.c') diff --git a/src/drawing.c b/src/drawing.c index 3922e09..3aa5de8 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -409,8 +409,7 @@ draw_scale() { draw_rect(x, y, x + R_COL_W - 2, y + SCALE_H - 3, COL_FG); txt_drawf_small("SCALE", x + 3, y - 10, COL_FG); - // TODO: Switch for different scales here - txt_drawf("CHRM", x + 2, y + 2, COL_FG); + txt_drawf(scale_short[current_scale], x + 2, y + 2, COL_FG); } void @@ -1657,6 +1656,36 @@ draw_notif_bar() { } return; } + if (input_handler == handle_right_col_selection) { + switch (right_col_selection_loc) { + case R_COL_BANK_A: { txt_drawf_small("BANK A", x0 + 2, y0 + 1, color); } break; + case R_COL_BANK_B: { txt_drawf_small("BANK B", x0 + 2, y0 + 1, color); } break; + case R_COL_BANK_C: { txt_drawf_small("BANK C", x0 + 2, y0 + 1, color); } break; + case R_COL_BANK_D: { txt_drawf_small("BANK D", x0 + 2, y0 + 1, color); } break; + case R_COL_BANK_E: { txt_drawf_small("BANK E", x0 + 2, y0 + 1, color); } break; + case R_COL_BANK_F: { txt_drawf_small("BANK F", x0 + 2, y0 + 1, color); } break; + case R_COL_STOP: { + txt_drawf_small("STOP", x0 + 2, y0 + 1, color); + } break; + case R_COL_PLAY: { + if (play_status == 0) { + txt_drawf_small("PLAY", x0 + 2, y0 + 1, color); + } else { + txt_drawf_small("PAUSE", x0 + 2, y0 + 1, color); + } + } break; + case R_COL_SETTINGS: { + txt_drawf_small("SETTINGS", x0 + 2, y0 + 1, color); + } break; + case R_COL_SCALE: { + txt_drawf_small("SCALE: %s", x0 + 2, y0 + 1, color, scale_long[current_scale]); + } break; + case R_COL_BPM: { + txt_drawf_small("TEMPO: %d bpm", x0 + 2, y0 + 1, color, patterns[pattern_selection_loc].bpm); + } break; + } + return; + } if (chain.len != 0) { u8 x = x0 + 2; -- cgit v1.2.1