From c76995b1cb36b18c0e04f98eff6d5db3b8e2eae4 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Thu, 9 Jul 2020 09:27:40 +0300 Subject: [PATCH 1/2] Small code cleanup --- sa_core.c | 5 ++--- ui_sa.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sa_core.c b/sa_core.c index 1e3c3d8..f18d72a 100644 --- a/sa_core.c +++ b/sa_core.c @@ -750,7 +750,7 @@ void set_offset(float offset) void set_trigger_level(float trigger_level) { setting.trigger_level = trigger_level; - redraw_request |= REDRAW_TRIGGER; + redraw_request |= REDRAW_TRIGGER | REDRAW_CAL_STATUS | REDRAW_AREA; //dirty = true; // No HW update required, only status panel refresh } @@ -760,10 +760,9 @@ void set_trigger(int trigger) setting.trigger_direction = trigger; } else { setting.trigger = trigger; - redraw_request |= REDRAW_TRIGGER; sweep_mode = SWEEP_ENABLE; } - redraw_request|=REDRAW_TRIGGER; + redraw_request|=REDRAW_TRIGGER | REDRAW_CAL_STATUS; //dirty = true; // No HW update required, only status panel refresh } diff --git a/ui_sa.c b/ui_sa.c index 6dd1497..e4dd2ac 100644 --- a/ui_sa.c +++ b/ui_sa.c @@ -996,7 +996,6 @@ static void menu_trigger_cb(int item, uint8_t data) set_trigger(data); // menu_move_back(); ui_mode_normal(); - redraw_request |= REDRAW_CAL_STATUS; completed = true; } @@ -1976,7 +1975,6 @@ set_numeric_value(void) if (setting.trigger == T_AUTO ) set_trigger(T_NORMAL); set_trigger_level(to_dBm(uistat.value)); - redraw_request |= REDRAW_CAL_STATUS | REDRAW_AREA; completed = true; break; From 39da2683ac00aa07ece16487a4c934b8300199ca Mon Sep 17 00:00:00 2001 From: DiSlord Date: Thu, 9 Jul 2020 10:02:08 +0300 Subject: [PATCH 2/2] Reduce code size --- ui_sa.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ui_sa.c b/ui_sa.c index a595d18..b920cd3 100644 --- a/ui_sa.c +++ b/ui_sa.c @@ -708,14 +708,11 @@ static void menu_modulation_cb(int item, uint8_t data) // draw_cal_status(); } - -const int menu_reffer_value[]={-1,0,1,2,3,4,5,6}; -const char *menu_reffer_text[]={"OFF","30MHz","15MHz","10MHz","4MHz","3MHz","2MHz","1MHz"}; static void menu_reffer_cb(int item, uint8_t data) { (void)item; //Serial.println(item); - set_refer_output(menu_reffer_value[data]); + set_refer_output((int)data - 1); menu_move_back(); // ui_mode_normal(); // Stay in menu mode // draw_cal_status(); @@ -1265,23 +1262,24 @@ static const menuitem_t menu_scale_per[] = { { MT_NONE, 0, NULL, NULL } // sentinel }; +// 0 1 2 3 4 5 6 7 +const char *menu_reffer_text[]={"OFF","30MHz","15MHz","10MHz","4MHz","3MHz","2MHz","1MHz"}; static const menuitem_t menu_reffer2[] = { - { MT_FORM | MT_CALLBACK, 5, "3MHz" , menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 5, "3MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 6, "2MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 7, "1MHz", menu_reffer_cb}, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL }, { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel }; - static const menuitem_t menu_reffer[] = { - { MT_FORM | MT_CALLBACK, 0, "OFF" , menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 1, "30MHz", menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 2, "15MHz", menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 3, "10MHz", menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 4, "4MHz" , menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb}, - { MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 0, "OFF", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 1, "30MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 2, "15MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 3, "10MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 4, "4MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 6, "2MHz", menu_reffer_cb}, + { MT_FORM | MT_CALLBACK, 7, "1MHz", menu_reffer_cb}, // { MT_FORM | MT_SUBMENU, 0, "\033 MORE", menu_reffer2}, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL }, { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel