diff --git a/nanovna.h b/nanovna.h index f98fa2d..c2eafc7 100644 --- a/nanovna.h +++ b/nanovna.h @@ -18,7 +18,6 @@ */ #include "ch.h" -//#define TINYSA_F303 #ifdef TINYSA_F303 #ifdef TINYSA_F072 #error "Remove comment for #ifdef TINYSA_F303" @@ -27,7 +26,7 @@ #define TINYSA4 #endif #define TINYSA4_PROTO -//#endif +#endif #ifdef TINYSA_F072 #ifdef TINYSA_F303 @@ -220,8 +219,7 @@ typedef uint32_t freq_t; #define CORRECTION_LOW_OUT_DIRECT 7 #define CORRECTION_LOW_OUT_ADF 8 #define CORRECTION_LOW_OUT_MIXER 9 - #define CORRECTION_HIGH 10 - #define CORRECTION_SIZE 11 + #define CORRECTION_SIZE 10 #endif typedef float measurement_t[TRACES_MAX][POINTS_COUNT]; extern measurement_t measured; diff --git a/sa_cmd.c b/sa_cmd.c index bc33d55..f58b9d5 100644 --- a/sa_cmd.c +++ b/sa_cmd.c @@ -32,6 +32,7 @@ VNA_SHELL_FUNCTION(cmd_mode) shell_printf("usage: mode low %s\r\n", cmd_in_out); #else shell_printf("usage: mode %s %s\r\n", cmd_low_high,cmd_in_out); +#endif return; } #ifdef TINYSA3 diff --git a/sa_core.c b/sa_core.c index 231c683..fe9c13d 100644 --- a/sa_core.c +++ b/sa_core.c @@ -2154,10 +2154,12 @@ pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI c { pureRSSI_t cv = 0; int c=CORRECTION_LOW; +#ifdef TINYSA3 if (setting.mode == M_GENHIGH) { c = CORRECTION_HIGH; return float_TO_PURE_RSSI(0.0); } +#endif #ifdef TINYSA4 if (setting.mode == M_LOW) {