Merge branch 'master' into tinySA-V4-SI4463

sa_cmd.c

@@ -153,7 +153,7 @@ VNA_SHELL_FUNCTION(cmd_output)
   } else
     goto usage;
 #endif
-  int m = generic_option_cmd("output", "off|on", argc, argv[0]);
+  int m = generic_option_cmd("output", "on|off", argc, argv[0]);
   if (m>=0) {
     setting.mute = m;
     dirty = true;

ui_sa.c

@@ -1225,14 +1225,21 @@ static UI_FUNCTION_ADV_CALLBACK(menu_harmonic_acb)
 }
 #endif
 
+
+#define AUTO_ICON(S) (S>=2?BUTTON_ICON_CHECK_AUTO:S)            // Depends on order of ICONs!!!!!
+
 static UI_FUNCTION_ADV_CALLBACK(menu_settings_agc_acb){
   (void)item;
   (void)data;
   if(b){
+#if 0
     if (S_IS_AUTO(setting.agc))
       b->icon = BUTTON_ICON_CHECK_AUTO;
     else
       b->icon = setting.agc ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
+#else
+    b->icon = AUTO_ICON(setting.agc);
+#endif
     return;
   }
   toggle_AGC();