From 0e895853ddfcfcfdaa2c64628507317ebb1f177a Mon Sep 17 00:00:00 2001 From: DiSlord Date: Wed, 9 Jun 2021 21:56:47 +0300 Subject: [PATCH] Move init plot and ui to sweep thread, draw grid on startup --- main.c | 15 ++++++++------- plot.c | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index a71af43..2245227 100644 --- a/main.c +++ b/main.c @@ -114,14 +114,19 @@ static THD_FUNCTION(Thread1, arg) { (void)arg; chRegSetThreadName("sweep"); + // Init UI and plot grid + area_height = AREA_HEIGHT_NORMAL; + ui_init(); + //Initialize graph plotting + plot_init(); #ifdef __SD_CARD_LOAD__ sd_card_load_config("autoload.ini"); #endif -#ifndef TINYSA4 - ui_process(); -#endif +//#ifndef TINYSA4 +// ui_process(); +//#endif while (1) { // START_PROFILE @@ -2284,10 +2289,6 @@ int main(void) i2sStart(&I2SD2, &i2sconfig); i2sStartExchange(&I2SD2); #endif - area_height = AREA_HEIGHT_NORMAL; - ui_init(); - //Initialize graph plotting - plot_init(); setup_sa(); // if (setting.mode != -1) { diff --git a/plot.c b/plot.c index e4db0ad..31140d5 100644 --- a/plot.c +++ b/plot.c @@ -2019,7 +2019,8 @@ disable_waterfall(void) void plot_init(void) { - force_set_markmap(); + redraw_request|= REDRAW_AREA | REDRAW_BATTERY | REDRAW_CAL_STATUS | REDRAW_FREQUENCY; + draw_all(true); } #pragma GCC pop_options