Skip to content

Commit 1798ee1

Browse files
committed
remove the cycle back to white bg before fft
1 parent c78fedc commit 1798ee1

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

ch32v305/src/ui/ui.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ static ui_display_mode_t s_display_mode = UI_DISPLAY_SPLASH;
145145
static bool s_splash_band_dirty = true;
146146
static ui_splash_appearance_t s_splash_appearance = UI_SPLASH_APPEARANCE_NORMAL;
147147
static ui_splash_appearance_t s_displayed_splash_appearance = UI_SPLASH_APPEARANCE_COUNT;
148-
static uint8_t s_splash_button_phase = 0U;
149148
static uint32_t s_displayed_splash_freq_hz = UINT32_MAX;
150149
static int32_t s_splash_wave_display_peak = kSplashWaveMinimumPeak;
151150
static union
@@ -261,7 +260,7 @@ static void ui_splash_exit_to_waterfall(void)
261260
s_display_mode = UI_DISPLAY_WATERFALL;
262261
s_active_control = UI_CONTROL_FREQ_10_MHZ;
263262
s_splash_band_dirty = false;
264-
s_splash_button_phase = 0U;
263+
s_splash_appearance = UI_SPLASH_APPEARANCE_NORMAL;
265264
s_displayed_splash_freq_hz = UINT32_MAX;
266265
s_displayed_splash_appearance = UI_SPLASH_APPEARANCE_COUNT;
267266
s_redraw_all = true;
@@ -275,16 +274,13 @@ extern "C" void ui_handle_button_press(void)
275274
{
276275
if(s_display_mode == UI_DISPLAY_SPLASH)
277276
{
278-
s_splash_button_phase = (uint8_t)((s_splash_button_phase + 1U) % 3U);
279-
280-
if(s_splash_button_phase == 0U)
277+
if(s_splash_appearance == UI_SPLASH_APPEARANCE_INVERTED)
281278
{
282279
ui_splash_exit_to_waterfall();
283280
return;
284281
}
285282

286-
s_splash_appearance = (s_splash_button_phase == 1U) ? UI_SPLASH_APPEARANCE_INVERTED
287-
: UI_SPLASH_APPEARANCE_NORMAL;
283+
s_splash_appearance = UI_SPLASH_APPEARANCE_INVERTED;
288284
s_splash_band_dirty = true;
289285
s_displayed_splash_freq_hz = UINT32_MAX;
290286
s_displayed_splash_appearance = UI_SPLASH_APPEARANCE_COUNT;
@@ -295,7 +291,7 @@ extern "C" void ui_handle_button_press(void)
295291
{
296292
s_display_mode = UI_DISPLAY_SPLASH;
297293
s_splash_band_dirty = true;
298-
s_splash_button_phase = 0U;
294+
s_splash_appearance = UI_SPLASH_APPEARANCE_NORMAL;
299295
s_displayed_splash_freq_hz = UINT32_MAX;
300296
s_displayed_splash_appearance = UI_SPLASH_APPEARANCE_COUNT;
301297
return;
@@ -1051,7 +1047,7 @@ void UI_Init(void)
10511047
s_recording_blink_inverted = false;
10521048
s_display_mode = UI_DISPLAY_SPLASH;
10531049
s_splash_band_dirty = true;
1054-
s_splash_button_phase = 0U;
1050+
s_splash_appearance = UI_SPLASH_APPEARANCE_NORMAL;
10551051
s_displayed_splash_freq_hz = UINT32_MAX;
10561052
s_displayed_splash_appearance = UI_SPLASH_APPEARANCE_COUNT;
10571053
s_splash_spec_poly_valid = false;

0 commit comments

Comments
 (0)