Merge branch 'DiSlord_test_branch'

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
 }
 

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();
@@ -997,7 +994,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;
 }
 
@@ -1266,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
@@ -1981,7 +1978,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;