diff --git a/nanovna.h b/nanovna.h index 469dccf..2541b81 100644 --- a/nanovna.h +++ b/nanovna.h @@ -154,7 +154,7 @@ #define FREQ_MULTIPLIER 100 // Multiplier of the 30MHz reference to get accurate frequency correction #define VARIANT(X,Y) (Y) #define DEFAULT_IF ((freq_t)977400000) -#define DEFAULT_IF_PLUS ((freq_t)1070000000) +#define DEFAULT_IF_PLUS ((freq_t)1069000000) #define DEFAULT_SPUR_OFFSET ((freq_t)(actual_rbw_x10 > 3000 ? 1500000 : 1000000)) #define STATIC_DEFAULT_SPUR_OFFSET ((freq_t) 1500000) #define DEFAULT_MAX_FREQ ((freq_t) 800000000) @@ -992,6 +992,7 @@ void markers_reset(void); #define REDRAW_BATTERY (1<<4) #define REDRAW_AREA (1<<5) #define REDRAW_TRIGGER (1<<6) +#define REDRAW_INBETWEEN (1<<7) extern uint16_t redraw_request; /* diff --git a/plot.c b/plot.c index 7145244..88eb03f 100644 --- a/plot.c +++ b/plot.c @@ -1349,7 +1349,7 @@ draw_all(bool flush) draw_all_cells(flush); #ifdef __SCROLL__ // START_PROFILE - if (setting.waterfall) + if (setting.waterfall && !(redraw_request & REDRAW_INBETWEEN)) update_waterfall(); // STOP_PROFILE #endif diff --git a/sa_core.c b/sa_core.c index 25c60ff..8481a64 100644 --- a/sa_core.c +++ b/sa_core.c @@ -5289,7 +5289,7 @@ static bool sweep(bool break_on_operation) if (local_sweep_time > 10 * ONE_SECOND_TIME) { plot_into_index(measured); - redraw_request |= REDRAW_CELLS | REDRAW_BATTERY; + redraw_request |= REDRAW_CELLS | REDRAW_BATTERY | REDRAW_INBETWEEN; // plot trace and other indications as raster draw_all(true); // flush markmap only if scan completed to prevent }