cleanup

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
@@ -1503,7 +1503,7 @@ void calibrate(void);
 float to_dBm(float);
 float dBm_to_Watt(float);
 uint32_t calc_min_sweep_time_us(void);
-pureRSSI_t perform(bool b, int i, freq_t f, int e);
+static pureRSSI_t perform(bool b, int i, freq_t f, int e);
 void interpolate_maximum(int m);
 void calibrate_modulation(int modulation, int8_t *correction);
 

sa_core.c

@@ -2768,7 +2768,7 @@ static float old_temp = 0.0;
 #endif
 
 
-pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking)     // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup
+static pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking)     // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup
 {
   int modulation_delay = 0;
   int modulation_index = 0;
@@ -3177,10 +3177,12 @@ modulation_again:
         enable_ultra(false);
         enable_direct(false);
         enable_high(false);
+        enable_ultra(false);
+      }
 #else
       enable_ultra(false);
 #endif
-      }
+
     }
 #endif
     // -------------------------------- Acquisition loop for one requested frequency covering spur avoidance and vbwsteps ------------------------