diff --git a/main.c b/main.c index c72bfed..7717501 100644 --- a/main.c +++ b/main.c @@ -1135,7 +1135,7 @@ void set_marker_time(int m, float f) * Frequency list functions */ #ifdef __USE_FREQ_TABLE__ -static freq_t frequencies[POINTS_COUNT]; +freq_t frequencies[POINTS_COUNT]; static void set_frequencies(freq_t start, freq_t stop, uint16_t points) { @@ -1155,7 +1155,9 @@ set_frequencies(freq_t start, freq_t stop, uint16_t points) setting.frequency_step = delta; dirty = true; } +#ifndef getFrequency freq_t getFrequency(uint16_t idx) {return frequencies[idx];} +#endif #else static freq_t _f_start; static freq_t _f_delta; diff --git a/nanovna.h b/nanovna.h index bd4d319..7f64368 100644 --- a/nanovna.h +++ b/nanovna.h @@ -96,7 +96,7 @@ #else #define __HARMONIC__ #endif -//#define __USE_FREQ_TABLE__ // Enable use table for frequency list +#define __USE_FREQ_TABLE__ // Enable use table for frequency list #ifdef TINYSA3 #define VARIANT(X,Y) (X) @@ -1156,9 +1156,15 @@ extern int16_t lastsaveid; //extern properties_t *active_props; //extern properties_t current_props; - +#ifdef __USE_FREQ_TABLE__ +extern freq_t frequencies[POINTS_COUNT]; +#define getFrequency(idx) frequencies[idx] +#ifndef getFrequency freq_t getFrequency(uint16_t idx); - +#endif +#else +freq_t getFrequency(uint16_t idx); +#endif //#define frequency0 current_props._frequency0 //#define frequency1 current_props._frequency1 #define sweep_points setting._sweep_points