corrected for tinySA3

main.c

@@ -1140,7 +1140,7 @@ config_t config = {
 
 //properties_t current_props;
 //properties_t *active_props = &current_props;
-
+#ifdef TINYSA4
 const freq_t v5_2_correction_frequency[CORRECTION_SIZE][CORRECTION_POINTS]=
 {
  /* low */   {   100000,     400000,     1000000,    80000000,   180000000,  260000000,  270000000,  300000000,  320000000,  390000000,  490000000,  660000000,  680000000,  690000000,  750000000,  790000000,  800000000,  810000000,  820000000,  830000000},
@@ -1172,7 +1172,7 @@ const float  v5_2_correction_value[CORRECTION_SIZE][CORRECTION_POINTS]=
 const float v5_2_harmonic_level_offset = 10;
 const float v5_2_lna_level_offset = 7;
 
-
+#endif
 
 static const marker_t def_markers[MARKERS_MAX] = {
     {M_TRACKING, M_ENABLED,               0, TRACE_ACTUAL, 30, 0 },
@@ -2974,6 +2974,7 @@ int main(void)
       clear_backup();
     }
   }
+#ifdef TINYSA4
   if (max2871) {
     ULTRA_MAX_FREQ      = 7250000000ULL + config.overclock;        // Start of harmonic mode
     MAX_LO_FREQ         = 6300000000ULL + config.overclock;
@@ -2986,6 +2987,7 @@ int main(void)
     MIN_BELOW_IF_FREQ   = 2310000000ULL + config.overclock;           // Range to use for below IF
   }
   set_jump_freq( MAX_ABOVE_IF_FREQ, ULTRA_MAX_FREQ);
+#endif
   config.cor_am = 0;        // Should be removed from config
   config.cor_nfm = 0;
   config.cor_wfm = 0;

nanovna.h

@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-//#ifdef TINYSA_F303
+#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-//#endif
+#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303

ui.c

@@ -1428,8 +1428,8 @@ static const struct {
 [KM_LEVELSWEEP]   = {keypads_plusmin     , "LEVEL\nSWEEP"},    // KM_LEVELSWEEP
 [KM_SWEEP_TIME]   = {keypads_time        , "SWEEP\nSECONDS"},    // KM_SWEEP_TIME
 [KM_OFFSET_DELAY] = {keypads_positive    , "OFFSET\nDELAY"}, // KM_OFFSET_DELAY #20
-[KM_FAST_SPEEDUP] = {keypads_positive    , "FAST\nSPEEDUP"}, // KM_FAST_SPEEDUP
+[KM_FAST_SPEEDUP] = {keypads_positive    , "NARROW\nSPEEDUP"}, // KM_FAST_SPEEDUP
-[KM_FASTER_SPEEDUP] = {keypads_positive  , "FASTER\nSPEEDUP"}, // KM_FAST_SPEEDUP
+[KM_FASTER_SPEEDUP] = {keypads_positive  , "WIDE\nSPEEDUP"}, // KM_FAST_SPEEDUP
 [KM_GRIDLINES]    = {keypads_positive    , "MINIMUM\nGRIDLINES"}, // KM_GRIDLINES
 [KM_MARKER]       = {keypads_freq        , "MARKER\nFREQ"}, // KM_MARKER
 [KM_MODULATION]   = {keypads_freq        , "MODULATION\nFREQ"}, // KM_MODULATION
@@ -1538,8 +1538,8 @@ static const menuitem_t  menu_settings3[];
 static const menuitem_t  menu_measure_noise_figure[];
 static const menuitem_t  menu_calibrate_harmonic[];
 static const menuitem_t  menu_calibrate_max[];
-static const menuitem_t  menu_calibrate[];
 #endif
+static const menuitem_t  menu_calibrate[];
 static const menuitem_t  menu_sweep[];
 static const menuitem_t  menu_settings[];
 static const menuitem_t  menu_settings2[];
@@ -2209,7 +2209,11 @@ static UI_FUNCTION_CALLBACK(menu_config_cb)
     show_version();
     break;
   case CONFIG_MENUITEM_CALIBRATE:
+#ifdef TINYSA4
     menu_push_submenu(max2871?menu_calibrate_max:menu_calibrate);
+#else
+    menu_push_submenu(menu_calibrate);
+#endif
     return;
   }
   ui_mode_normal();
@@ -4493,12 +4497,8 @@ static const menuitem_t menu_sweep_speed[] =
  { MT_ADV_CALLBACK | MT_LOW,SD_FAST,   "FAST",            menu_scanning_speed_acb},
 #endif
  { MT_ADV_CALLBACK,     SD_NOISE_SOURCE,      "NOISE\nSOURCE",   menu_scanning_speed_acb},
-#ifdef TINYSA4
+ { MT_KEYPAD,           KM_FAST_SPEEDUP,"NSPEEDUP\n\b%s",  "2..20, 0=disable"},
- { MT_KEYPAD,           KM_FAST_SPEEDUP,"SPEEDUP\n\b%s",  "2..20, 0=disable"},
+ { MT_KEYPAD,           KM_FASTER_SPEEDUP,"WSPEEDUP\n\b%s",  "2..20, 0=disable"},
- { MT_KEYPAD,           KM_FASTER_SPEEDUP,"FASTER\n\b%s",  "2..10, 0=disable"},
-#else
- { MT_KEYPAD   | MT_LOW,KM_FAST_SPEEDUP,"SPEEDUP\n\b%s",  "2..20, 0=disable"},
-#endif
  { MT_NONE,     0, NULL, menu_back} // next-> menu_back
 };