Remove __ULTRA_SA__

main.c

@@ -2426,7 +2426,7 @@ static const VNAShellCommand commands[] =
 #ifdef TINYSA4
    { "g", cmd_g,    CMD_WAIT_MUTEX },
    #endif
-#ifdef __ULTRA_SA__
+#ifdef __ADF4351__
     { "x", cmd_x,    0 },
 #endif
     {NULL          , NULL            , 0}
@@ -2824,9 +2824,6 @@ int main(void)
   }
 #endif
 
-#ifdef __ULTRA_SA__
-  ADF4351_Setup();
-#endif
   /*
  * SPI LCD Initialize
  */

nanovna.h

@@ -47,7 +47,6 @@
 #define __FAST_SWEEP__          // Pre-fill SI4432 RSSI buffer  to get fastest sweep in zero span mode
 #define __HAM_BAND__
 //#define __ULTRA__             // Add harmonics mode on low input.
-//#define __ULTRA_SA__            // Adds ADF4351 control for extra high 1st IF stage
 #define __SPUR__                // Does spur reduction by shifting IF
 //#define __USE_SERIAL_CONSOLE__  // Enable serial I/O connection (need enable HAL_USE_SERIAL as TRUE in halconf.h)
 #ifdef TINYSA3

sa_cmd.c

@@ -384,7 +384,7 @@ VNA_SHELL_FUNCTION(cmd_selftest)
   sweep_mode = SWEEP_SELFTEST;
 }
 
-#ifdef __ULTRA_SA__
+#ifdef __ADF4351__
 VNA_SHELL_FUNCTION(cmd_x)
 {
   uint32_t reg;

sa_core.c

@@ -80,13 +80,8 @@ void update_min_max_freq(void)
     maxFreq = DEFAULT_MAX_FREQ;
     break;
   case M_HIGH:
-#ifdef __ULTRA_SA__
-    minFreq = 00000000;
-    maxFreq = 2000000000;
-#else
     minFreq = HIGH_MIN_FREQ_MHZ * 1000000;
     maxFreq = HIGH_MAX_FREQ_MHZ * 1000000;
-#endif
     break;
   case M_GENHIGH:
     minFreq = 240000000;
@@ -1170,11 +1165,6 @@ void set_freq(int V, unsigned long freq)    // translate the requested frequency
     }
 #endif
   }
-#ifdef __ULTRA_SA__
-  else {
-    ADF4351_set_frequency(V-2,freq,3);
-  }
-#endif
   old_freq[V] = freq;
 }
 
@@ -1813,17 +1803,11 @@ modulation_again:
     } else
 #endif
     {                                           // Else set LO ('s)
-#ifdef __ULTRA_SA__
-      set_freq (2, config.frequency_IF2  + lf);                 // Scanning LO up to IF2
-      set_freq (3, config.frequency_IF2  - DEFAULT_IF);          // Down from IF2 to fixed second IF in Ultra SA mode
-      set_freq (SI4432_LO, DEFAULT_IF);                 // Second IF fixed in Ultra SA mode
-#else
 #ifdef __SI4432__
       if (setting.mode == M_LOW && !setting.tracking && S_STATE(setting.below_IF)) // if in low input mode and below IF
         set_freq (SI4432_LO, local_IF-lf);                                                 // set LO SI4432 to below IF frequency
       else
         set_freq (SI4432_LO, local_IF+lf);                                                 // otherwise to above IF
-#endif
 #endif
     }
 

si4432.c

@@ -779,7 +779,7 @@ float Simulated_SI4432_RSSI(uint32_t i, int s)
 #endif
 //------------------------------- ADF4351 -------------------------------------
 
-#ifdef __ULTRA_SA__
+#ifdef __ADF4351__
 
 #define bitRead(value, bit) (((value) >> (bit)) & 0x01)
 #define bitSet(value, bit) ((value) |= (1UL << (bit)))

ui.c

@@ -55,11 +55,7 @@ uistat_t uistat = {
 #define BIT_DOWN1   1
 
 #define READ_PORT() palReadPort(GPIOA)
-#ifdef __ULTRA_SA__
-#define BUTTON_MASK 0
-#else
 #define BUTTON_MASK 0b1110
-#endif
 
 static uint16_t last_button = 0b0000;
 static uint32_t last_button_down_ticks;
@@ -2669,13 +2665,8 @@ static void extcb1(EXTDriver *extp, expchannel_t channel)
 static const EXTConfig extcfg = {
   {
     {EXT_CH_MODE_DISABLED, NULL},
-#ifdef __ULTRA_SA__
-    {EXT_CH_MODE_DISABLED, NULL},
-    {EXT_CH_MODE_DISABLED, NULL},
-#else
     {EXT_CH_MODE_RISING_EDGE | EXT_CH_MODE_AUTOSTART | EXT_MODE_GPIOA, extcb1},
     {EXT_CH_MODE_RISING_EDGE | EXT_CH_MODE_AUTOSTART | EXT_MODE_GPIOA, extcb1},
-#endif
     {EXT_CH_MODE_RISING_EDGE | EXT_CH_MODE_AUTOSTART | EXT_MODE_GPIOA, extcb1},
     {EXT_CH_MODE_DISABLED, NULL},
     {EXT_CH_MODE_DISABLED, NULL},