From 8cee2ccdae98b2d5aeff7f8440654e1b37ab73e8 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Thu, 18 Jan 2024 08:21:31 +0100 Subject: [PATCH] marker jump repeat --- sa_core.c | 4 ++-- ui.c | 33 +++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/sa_core.c b/sa_core.c index 986dd17..1ec03fc 100644 --- a/sa_core.c +++ b/sa_core.c @@ -27,7 +27,7 @@ #pragma GCC optimize ("Os") #endif -#if 1 +#if 0 #define TRACE(X) { DAC->DHR12R1 =(uint32_t) ((X)*400); } // Enable for realtime tracing #else #define TRACE(X) // { DAC->DHR12R1 = (X*400); } // Enable for realtime tracing @@ -857,7 +857,7 @@ void set_attack(int d) void set_noise(int d) { - if (d < 2 || d > 50) + if (d < 2 || d > 120) return; setting.noise = d; dirty = true; diff --git a/ui.c b/ui.c index f44defa..046fc69 100644 --- a/ui.c +++ b/ui.c @@ -4453,7 +4453,7 @@ const menuitem_t menu_marker_search[] = { { MT_ADV_CALLBACK, M_TRACKING, "TRACKING",menu_marker_modify_acb }, #ifdef TINYSA4 { MT_ADV_CALLBACK, 0, "JOG JUMP\nMAX",menu_jog_jump_acb }, - { MT_KEYPAD, KM_NOISE, "PEAK\n\b%s", "2..20 dB"}, + { MT_KEYPAD, KM_NOISE, "PEAK\n\b%s", "2..120 dB"}, #endif { MT_NONE, 0, NULL, menu_back} // next-> menu_back }; @@ -7264,18 +7264,21 @@ static void lever_search_marker(int status) { int i = -1; - if (active_marker != MARKER_INVALID) { - if (status & EVT_DOWN) - i = marker_search_left_max(active_marker); - else if (status & EVT_UP) - i = marker_search_right_max(active_marker); - if (i != -1) { - markers[active_marker].index = i; - interpolate_maximum(active_marker); - markers[active_marker].mtype &= ~M_TRACKING; + do { + if (active_marker != MARKER_INVALID) { + if (status & EVT_DOWN) + i = marker_search_left_max(active_marker); + else if (status & EVT_UP) + i = marker_search_right_max(active_marker); + if (i != -1) { + markers[active_marker].index = i; + interpolate_maximum(active_marker); + markers[active_marker].mtype &= ~M_TRACKING; + } + redraw_marker(active_marker); } - redraw_marker(active_marker); - } + status = btn_wait_release(); + } while (status != 0); } // ex. 10942 -> 10000 @@ -7343,6 +7346,12 @@ ui_process_normal_lever(void) { int status = btn_check(); if (status != 0) { +#ifdef TINYSA + if (status & EVT_BUTTON_LONG_DOWN) { + setting.jog_jump != setting.jog_jump; + } + else +#endif if (status & EVT_BUTTON_SINGLE_CLICK) { ui_mode_menu(); } else {