KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Completed

Browse Source
pwm
erikkaashoek 3 years ago
parent d291f63b25
commit 14250c2b99
7 changed files with 185 additions and 148 deletions
Show Stats Download Patch File Download Diff File

4
halconf.h
Unescape View File

@ -115,7 +115,11 @@
* @brief Enables the PWM subsystem. * @brief Enables the PWM subsystem.
*/ */
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
#ifdef TINYSA_F303
#define HAL_USE_PWM TRUE #define HAL_USE_PWM TRUE
#else
#define HAL_USE_PWM FALSE
#endif
#endif #endif
/** /**

2
main.c
Unescape View File

@ -2579,7 +2579,6 @@ void pwm_stop(void)
{ {
pwmDisableChannel(&PWM_TIMER, PWM_CHANNEL); pwmDisableChannel(&PWM_TIMER, PWM_CHANNEL);
} }
#endif
static uint16_t audio_mode = A_DAC; static uint16_t audio_mode = A_DAC;
@ -2597,6 +2596,7 @@ void set_audio_mode(uint16_t new_mode)
} }
audio_mode = new_mode; audio_mode = new_mode;
} }
#endif
static const GPTConfig gpt4cfg = { static const GPTConfig gpt4cfg = {
8000000, // 8 MHz timer clock. 8000000, // 8 MHz timer clock.

27
nanovna.h
Unescape View File

@ -18,7 +18,7 @@
*/ */
#include "ch.h" #include "ch.h"
//#ifdef TINYSA_F303 #ifdef TINYSA_F303
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303" #error "Remove comment for #ifdef TINYSA_F303"
#endif #endif
@ -26,7 +26,7 @@
#define TINYSA4 #define TINYSA4
#endif #endif
#define TINYSA4_PROTO #define TINYSA4_PROTO
//#endif #endif
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#ifdef TINYSA_F303 #ifdef TINYSA_F303
@ -88,8 +88,9 @@
#define __MCU_CLOCK_SHIFT__ #define __MCU_CLOCK_SHIFT__
#endif #endif
#ifdef TINYSA4 #ifdef TINYSA4
#define __GUARD__ #define __BANDS__
#define __BEEP__ #define __BEEP__
#define __MULTI_BAND__
#define __MCU_CLOCK_SHIFT__ #define __MCU_CLOCK_SHIFT__
#define __ULTRA__ #define __ULTRA__
#define __USE_RTC__ // Enable RTC clock #define __USE_RTC__ // Enable RTC clock
@ -120,7 +121,7 @@
//#define __USE_FREQ_TABLE__ // Enable use table for frequency list //#define __USE_FREQ_TABLE__ // Enable use table for frequency list
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
#define __PWM__ #define __PWM__
#endif #endif
@ -350,8 +351,8 @@ enum { A_DAC, A_PWM };
void set_audio_mode(uint16_t new_mode); void set_audio_mode(uint16_t new_mode);
void pwm_start(int f); void pwm_start(int f);
void pwm_stop(void); void pwm_stop(void);
#ifdef __GUARD__ #ifdef __BANDS__
void reset_guard(void); void reset_band(void);
#endif #endif
#endif #endif
@ -1158,14 +1159,14 @@ void spi_init(void);
* flash.c * flash.c
*/ */
#ifdef __GUARD__ #ifdef __BANDS__
#define GUARDS_MAX 8 #define BANDS_MAX 8
typedef struct { typedef struct {
bool enabled; bool enabled;
freq_t start; freq_t start;
freq_t end; freq_t end;
float level; float level;
} guard_t; } band_t;
#endif #endif
@ -1183,8 +1184,8 @@ typedef struct setting
bool pulse; // bool bool pulse; // bool
bool stored[TRACES_MAX]; // enum bool stored[TRACES_MAX]; // enum
bool normalized[TRACES_MAX]; // enum bool normalized[TRACES_MAX]; // enum
#ifdef __GUARD__ #ifdef __BANDS__
guard_t guards[GUARDS_MAX]; band_t bands[BANDS_MAX];
#endif #endif
uint8_t mode; // enum uint8_t mode; // enum
@ -1766,9 +1767,9 @@ void interpolate_maximum(int m);
void calibrate_modulation(int modulation, int8_t *correction); void calibrate_modulation(int modulation, int8_t *correction);
enum { enum {
M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_SNR, M_PASS_BAND, M_LINEARITY, M_AM, M_FM, M_THD, M_CP, M_NF_TINYSA, M_NF_STORE, M_NF_VALIDATE, M_NF_AMPLIFIER, M_GUARD, M_DECONV,M_MAX M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_SNR, M_PASS_BAND, M_LINEARITY, M_AM, M_FM, M_THD, M_CP, M_NF_TINYSA, M_NF_STORE, M_NF_VALIDATE, M_NF_AMPLIFIER, M_BANDS, M_DECONV,M_MAX
}; };
#define MEASUREMENT_TEXT "OFF","IMD","OIP3","PN","SNR","PASS","LIN","AM","FM","THD","CP","NF T","NF S","NF V","NF A","GUARD","DECONF" #define MEASUREMENT_TEXT "OFF","IMD","OIP3","PN","SNR","PASS","LIN","AM","FM","THD","CP","NF T","NF S","NF V","NF A","MULTI","DECONF"
enum { enum {
T_AUTO, T_NORMAL, T_SINGLE, T_DONE, T_UP, T_DOWN, T_MODE, T_PRE, T_POST, T_MID, T_BEEP, T_AUTO, T_NORMAL, T_SINGLE, T_DONE, T_UP, T_DOWN, T_MODE, T_PRE, T_POST, T_MID, T_BEEP,

10
plot.c
Unescape View File

@ -1116,16 +1116,6 @@ draw_cell(int m, int n)
if ((uint32_t)(x + x0 - CELLOFFSETX) <= WIDTH + CELLOFFSETX) if ((uint32_t)(x + x0 - CELLOFFSETX) <= WIDTH + CELLOFFSETX)
cell_buffer[tp * CELLWIDTH + x] = c; cell_buffer[tp * CELLWIDTH + x] = c;
} }
#ifdef __GUARD__XX
if (setting.measurement == M_GUARD) {
int tp = get_guard_level() - y0;
if (tp>=0 && tp < h)
for (x = 0; x < w; x++)
if ((uint32_t)(x + x0 - CELLOFFSETX) <= WIDTH + CELLOFFSETX)
cell_buffer[tp * CELLWIDTH + x] = c;
}
#endif
#if 1 #if 1
// Only right cells // Only right cells
if (m >= (GRID_X_TEXT)/CELLWIDTH) if (m >= (GRID_X_TEXT)/CELLWIDTH)

81
sa_core.c
Unescape View File

@ -18,7 +18,7 @@
#include "si4432.h" // comment out for simulation #include "si4432.h" // comment out for simulation
//#endif //#endif
#include "stdlib.h" #include "stdlib.h"
#define TINYSA4 //#define TINYSA4
#pragma GCC push_options #pragma GCC push_options
#ifdef TINYSA4 #ifdef TINYSA4
@ -67,8 +67,8 @@ freq_t maxFreq = 520000000;
static float old_a = -150; // cached value to reduce writes to level registers static float old_a = -150; // cached value to reduce writes to level registers
int spur_gate = 100; int spur_gate = 100;
#ifdef __GUARD__ #ifdef __BANDS__
uint16_t current_guard = 0; uint16_t current_band = 0;
#endif #endif
#ifdef __ULTRA__ #ifdef __ULTRA__
@ -1409,11 +1409,6 @@ void limits_update(void)
} }
#endif #endif
#ifdef __GUARD__
void guards_update(void) {
}
#endif
void copy_trace(int f, int t) void copy_trace(int f, int t)
{ {
if (f == t) if (f == t)
@ -4798,11 +4793,11 @@ again: // Spur redu
static uint8_t low_count = 0; static uint8_t low_count = 0;
static uint8_t sweep_counter = 0; // Only used for HW refresh static uint8_t sweep_counter = 0; // Only used for HW refresh
#ifdef __GUARD__ #ifdef __BANDS__
static int last_guard = -1; static int last_band = -1;
void reset_guard(void) { void reset_band(void) {
last_guard = -1; last_band = -1;
} }
#endif #endif
@ -4881,34 +4876,38 @@ static bool sweep(bool break_on_operation)
#ifdef __MARKER_CACHE__ #ifdef __MARKER_CACHE__
clear_marker_cache(); clear_marker_cache();
#endif #endif
uint16_t triggered = false;
again: // Waiting for a trigger jumps back to here again: // Waiting for a trigger jumps back to here
#ifdef __GUARD__ #ifdef __BANDS__
if (setting.measurement == M_GUARD) { if (setting.measurement == M_BANDS) {
do { do {
current_guard++; current_band++;
if (current_guard > GUARDS_MAX) if (current_band > BANDS_MAX)
current_guard = 0; current_band = 0;
} }
while(!(setting.guards[current_guard].enabled)); while(!(setting.bands[current_band].enabled));
if (setting.guards[current_guard].end > setting.guards[current_guard].start && last_guard != current_guard) { if (setting.bands[current_band].end > setting.bands[current_band].start && last_band != current_band) {
last_guard = current_guard; last_band = current_band;
set_sweep_frequency(ST_START, setting.guards[current_guard].start); set_sweep_frequency(ST_START, setting.bands[current_band].start);
set_sweep_frequency(ST_STOP, setting.guards[current_guard].end); set_sweep_frequency(ST_STOP, setting.bands[current_band].end);
set_step_delay(SD_FAST); set_step_delay(SD_FAST);
set_rbw(8000); set_rbw(8000);
set_sweep_points((setting.guards[current_guard].end - setting.guards[current_guard].start) / 800000); set_sweep_points((setting.bands[current_band].end - setting.bands[current_band].start) / 800000);
setting.trigger_level = setting.bands[current_band].level;
setting.auto_attenuation = false;
} }
set_audio_mode(A_PWM); set_audio_mode(A_PWM);
pwm_stop(); pwm_stop();
} else { } else {
last_guard = -1; last_band = -1;
set_audio_mode(A_DAC); set_audio_mode(A_DAC);
} }
#endif #endif
#ifdef __BEEP__ #ifdef __BEEP__
if (setting.trigger_beep && setting.trigger != T_AUTO) { if (setting.trigger_beep) {
set_audio_mode(A_PWM); pwm_stop(); set_audio_mode(A_PWM);
pwm_stop();
} }
else else
set_audio_mode(A_DAC); set_audio_mode(A_DAC);
@ -5241,18 +5240,13 @@ static volatile int dummy;
#endif #endif
if (MODE_INPUT(setting.mode)) { if (MODE_INPUT(setting.mode)) {
#ifdef __GUARD__ if (RSSI >= setting.trigger_level) {
if (setting.measurement == M_GUARD && RSSI > setting.guards[current_guard].level) { triggered = true;
pwm_start(4000);
}
#endif
#ifdef __BEEP__ #ifdef __BEEP__
if (setting.trigger != T_AUTO && setting.frequency_step > 0) { // Trigger active if (setting.trigger_beep) pwm_start(4000);
if (setting.trigger_beep && RSSI >= setting.trigger_level) {
pwm_start(4000);
}
}
#endif #endif
}
for (int t=0; t<TRACES_MAX;t++) { // Calculate all traces for (int t=0; t<TRACES_MAX;t++) { // Calculate all traces
if (setting.stored[t]) if (setting.stored[t])
continue; continue;
@ -5370,14 +5364,9 @@ static volatile int dummy;
goto sweep_again; // Keep repeating sweep loop till user aborts by input goto sweep_again; // Keep repeating sweep loop till user aborts by input
} }
// --------------- check if maximum is above trigger level ----------------- // --------------- check if maximum is above trigger level -----------------
#ifdef __GUARD__XX
if (setting.measurement == M_GUARD) {
if (measured[peakTrace][peakIndex] < setting.guards[current_guard].level)
goto again;
}
#endif
if (setting.trigger != T_AUTO && setting.frequency_step > 0) { // Trigger active if (setting.trigger != T_AUTO && setting.frequency_step > 0) { // Trigger active
if (measured[peakTrace][peakIndex] < setting.trigger_level) { // if (measured[peakTrace][peakIndex] < setting.trigger_level) {
if (!triggered) {
goto again; // not yet, sweep again goto again; // not yet, sweep again
} else { } else {
if (setting.trigger == T_SINGLE) { if (setting.trigger == T_SINGLE) {
@ -5558,7 +5547,8 @@ static volatile int dummy;
} else if (actual_max_level > target_level && setting.attenuate_x2 < 60) { } else if (actual_max_level > target_level && setting.attenuate_x2 < 60) {
delta = actual_max_level - target_level; delta = actual_max_level - target_level;
} }
if ((chVTGetSystemTimeX() - sweep_elapsed > MS2ST(1000) && ( delta < -5 || delta > +5)) || delta > 10 ) { if (chVTGetSystemTimeX() - sweep_elapsed > MS2ST(1000)){
if (( delta < -5 || delta > +5) || delta > 10 ) {
setting.attenuate_x2 += delta + delta; setting.attenuate_x2 += delta + delta;
if (setting.attenuate_x2 < 0) if (setting.attenuate_x2 < 0)
setting.attenuate_x2 = 0; setting.attenuate_x2 = 0;
@ -5566,6 +5556,7 @@ static volatile int dummy;
setting.attenuate_x2 = 60; setting.attenuate_x2 = 60;
changed = true; changed = true;
sweep_elapsed = chVTGetSystemTimeX(); sweep_elapsed = chVTGetSystemTimeX();
}
} }
// Try update settings // Try update settings

171
ui.c
Unescape View File

@ -1333,8 +1333,8 @@ enum {
#ifdef __LIMITS__ #ifdef __LIMITS__
KM_LIMIT_FREQ, KM_LIMIT_LEVEL, KM_LIMIT_FREQ, KM_LIMIT_LEVEL,
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
KM_GUARD_START, KM_GUARD_END, KM_GUARD_LEVEL, KM_BAND_START, KM_BAND_END, KM_BAND_LEVEL,
#endif #endif
KM_MARKER_TIME, KM_MARKER_TIME,
// #35 // #35
@ -1416,10 +1416,10 @@ static const struct {
[KM_LIMIT_FREQ] = {keypads_freq , "FREQ"}, // KM_LIMIT_FREQ [KM_LIMIT_FREQ] = {keypads_freq , "FREQ"}, // KM_LIMIT_FREQ
[KM_LIMIT_LEVEL] = {keypads_plusmin_unit , "LEVEL"}, // KM_LIMIT_LEVEL [KM_LIMIT_LEVEL] = {keypads_plusmin_unit , "LEVEL"}, // KM_LIMIT_LEVEL
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
[KM_GUARD_START] = {keypads_freq , "START\nFREQ"}, // KM_GUARD_START [KM_BAND_START] = {keypads_freq , "START\nFREQ"}, // KM_BAND_START
[KM_GUARD_END] = {keypads_freq , "END\nFREQ"}, // KM_GUARD_END [KM_BAND_END] = {keypads_freq , "END\nFREQ"}, // KM_BAND_END
[KM_GUARD_LEVEL] = {keypads_plusmin_unit , "LEVEL"}, // KM_GUARD_LEVEL [KM_BAND_LEVEL] = {keypads_plusmin_unit , "LEVEL"}, // KM_BAND_LEVEL
#endif #endif
[KM_MARKER_TIME] = {keypads_time , "MARKER\nTIME"}, // KM_MARKER_TIME [KM_MARKER_TIME] = {keypads_time , "MARKER\nTIME"}, // KM_MARKER_TIME
[KM_VAR] = {keypads_freq , "JOG\nSTEP"}, // jog step [KM_VAR] = {keypads_freq , "JOG\nSTEP"}, // jog step
@ -1467,9 +1467,9 @@ static const menuitem_t menu_subtract_trace[];
static const menuitem_t menu_limit_modify[]; static const menuitem_t menu_limit_modify[];
static const menuitem_t menu_limit_select[]; static const menuitem_t menu_limit_select[];
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
static const menuitem_t menu_guard_modify[]; static const menuitem_t menu_BAND_modify[];
static const menuitem_t menu_guard_select[]; static const menuitem_t menu_BAND_select[];
#endif #endif
static const menuitem_t menu_average[]; static const menuitem_t menu_average[];
static const menuitem_t menu_reffer[]; static const menuitem_t menu_reffer[];
@ -2874,9 +2874,9 @@ validate:
} }
break; break;
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
case M_GUARD: case M_BANDS:
menu_push_submenu(menu_guard_select); menu_push_submenu(menu_BAND_select);
goto leave; goto leave;
break; break;
#endif #endif
@ -3182,25 +3182,25 @@ static UI_FUNCTION_ADV_CALLBACK(menu_limit_select_acb)
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
uint8_t active_guard = 0; uint8_t active_band = 0;
static UI_FUNCTION_ADV_CALLBACK(menu_guard_select_acb) static UI_FUNCTION_ADV_CALLBACK(menu_band_select_acb)
{ {
(void)item; (void)item;
if(b){ if(b){
int count = 0; int count = 0;
for (int i=0;i<GUARDS_MAX;i++) {if (setting.guards[i].enabled) count++; } for (int i=0;i<BANDS_MAX;i++) {if (setting.bands[i].enabled) count++; }
if (count == 0) setting.guards[0].enabled = true; if (count == 0) setting.bands[0].enabled = true;
b->icon = (setting.guards[data].enabled?BUTTON_ICON_CHECK:BUTTON_ICON_NOCHECK) ; b->icon = (setting.bands[data].enabled?BUTTON_ICON_CHECK:BUTTON_ICON_NOCHECK) ;
plot_printf(b->text, sizeof(b->text), "%.6FHz\n%.6FHz", (float)setting.guards[data].start, (float)setting.guards[data].end); plot_printf(b->text, sizeof(b->text), "%.6FHz\n%.6FHz", (float)setting.bands[data].start, (float)setting.bands[data].end);
reset_guard(); reset_band();
return; return;
} }
active_guard = data; active_band = data;
setting.guards[active_guard].enabled = true; setting.bands[active_band].enabled = true;
dirty = true; dirty = true;
// guards_update(); // BANDs_update();
menu_push_submenu(menu_guard_modify); menu_push_submenu(menu_BAND_modify);
} }
#endif #endif
@ -3328,22 +3328,22 @@ static UI_FUNCTION_CALLBACK(menu_limit_disable_cb)
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
static UI_FUNCTION_CALLBACK(menu_guard_disable_cb) static UI_FUNCTION_CALLBACK(menu_BAND_disable_cb)
{ {
(void)item; (void)item;
(void)data; (void)data;
int count = 0; int count = 0;
for (int i=0;i<GUARDS_MAX;i++) {if (setting.guards[i].enabled) count++; } for (int i=0;i<BANDS_MAX;i++) {if (setting.bands[i].enabled) count++; }
if (count == 1 && setting.guards[active_guard].enabled) { if (count == 1 && setting.bands[active_band].enabled) {
drawMessageBox("Error", "At least one entry",1000); drawMessageBox("Error", "At least one entry",1000);
return; return;
} }
if (active_guard<GUARDS_MAX){ if (active_band<BANDS_MAX){
setting.guards[active_guard].enabled = false; setting.bands[active_band].enabled = false;
dirty = true; dirty = true;
// guards_update(); // BANDs_update();
menu_move_back(false); menu_move_back(false);
} }
} }
@ -3425,10 +3425,14 @@ static UI_FUNCTION_ADV_CALLBACK(menu_trigger_acb)
{ {
(void)item; (void)item;
if(b){ if(b){
if (data == T_MODE) { if (data == T_MODE)
b->param_1.text = mode_text[setting.trigger_mode - T_PRE]; b->param_1.text = mode_text[setting.trigger_mode - T_PRE];
} else if (data == T_UP || data == T_DOWN) else if (data == T_UP || data == T_DOWN)
#if 0
b->icon = setting.trigger_direction == data ? BUTTON_ICON_GROUP_CHECKED : BUTTON_ICON_GROUP; b->icon = setting.trigger_direction == data ? BUTTON_ICON_GROUP_CHECKED : BUTTON_ICON_GROUP;
#else
b->param_1.text = setting.trigger_direction == T_UP ? "UP" : "DOWN";
#endif
#ifdef __BEEP__ #ifdef __BEEP__
else if (data == T_BEEP) else if (data == T_BEEP)
b->icon = setting.trigger_beep ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK; b->icon = setting.trigger_beep ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
@ -3446,10 +3450,15 @@ static UI_FUNCTION_ADV_CALLBACK(menu_trigger_acb)
} else if (data == T_BEEP) { } else if (data == T_BEEP) {
setting.trigger_beep = !setting.trigger_beep; setting.trigger_beep = !setting.trigger_beep;
#endif #endif
} else if (data != T_DONE) { } else if (data == T_UP || data == T_DOWN) {
set_trigger(data); if (setting.trigger_direction == T_UP)
setting.trigger_direction = T_DOWN;
else
setting.trigger_direction = T_UP;
} else if (data != T_DONE) {
set_trigger(data);
// menu_move_back(false); // menu_move_back(false);
ui_mode_normal(); ui_mode_normal();
} }
completed = true; completed = true;
} }
@ -3869,8 +3878,8 @@ enum {
FMT_CFG_FILE, FMT_CFG_FILE,
FMT_PRS_FILE, FMT_PRS_FILE,
FMT_TBL_FILE, FMT_TBL_FILE,
#ifdef __GUARD__ #ifdef __BANDS__
FMT_GRD_FILE, FMT_BND_FILE,
#endif #endif
}; };
@ -3885,7 +3894,7 @@ static const char *file_ext[] = {
[FMT_CFG_FILE] = "cfg", [FMT_CFG_FILE] = "cfg",
[FMT_PRS_FILE] = "prs", [FMT_PRS_FILE] = "prs",
[FMT_TBL_FILE] = "tbl", [FMT_TBL_FILE] = "tbl",
[FMT_GRD_FILE] = "grd", [FMT_BND_FILE] = "bnd",
}; };
static void sa_save_file(uint8_t format); static void sa_save_file(uint8_t format);
@ -4148,22 +4157,22 @@ static const menuitem_t menu_limit_select[] = {
}; };
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
static const menuitem_t menu_guard_modify[] = static const menuitem_t menu_BAND_modify[] =
{ {
{ MT_KEYPAD, KM_GUARD_START, "START\n\b%s", "Start"}, { MT_KEYPAD, KM_BAND_START, "START\n\b%s", "Start"},
{ MT_KEYPAD, KM_GUARD_END, "END\n\b%s", "End"}, { MT_KEYPAD, KM_BAND_END, "END\n\b%s", "End"},
{ MT_KEYPAD, KM_GUARD_LEVEL, "LEVEL\n\b%s", "Level"}, { MT_KEYPAD, KM_BAND_LEVEL, "LEVEL\n\b%s", "Level"},
{ MT_CALLBACK,0, "DISABLE", menu_guard_disable_cb}, { MT_CALLBACK,0, "DISABLE", menu_BAND_disable_cb},
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back { MT_NONE, 0, NULL, menu_back} // next-> menu_back
}; };
static const menuitem_t menu_guard_select[] = { static const menuitem_t menu_BAND_select[] = {
{ MT_ADV_CALLBACK | MT_REPEATS, DATA_STARTS_REPEATS(0,GUARDS_MAX), MT_CUSTOM_LABEL, menu_guard_select_acb }, { MT_ADV_CALLBACK | MT_REPEATS, DATA_STARTS_REPEATS(0,BANDS_MAX), MT_CUSTOM_LABEL, menu_band_select_acb },
#ifdef __USE_SD_CARD__ #ifdef __USE_SD_CARD__
{ MT_CALLBACK, FMT_GRD_FILE, "GUARD"S_RARROW"\nSD", menu_sdcard_cb}, { MT_CALLBACK, FMT_BND_FILE, "BANDS"S_RARROW"\nSD", menu_sdcard_cb},
#ifdef __SD_FILE_BROWSER__ #ifdef __SD_FILE_BROWSER__
{ MT_CALLBACK, FMT_GRD_FILE, "SD"S_RARROW"\nGUARD", menu_sdcard_browse_cb }, { MT_CALLBACK, FMT_BND_FILE, "SD"S_RARROW"\nBANDS", menu_sdcard_browse_cb },
#endif #endif
#endif #endif
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back { MT_NONE, 0, NULL, menu_back} // next-> menu_back
@ -4500,8 +4509,8 @@ static const menuitem_t menu_measure2[] = {
#ifdef __NOISE_FIGURE__ #ifdef __NOISE_FIGURE__
{ MT_SUBMENU | MT_LOW, 0, "NOISE\nFIGURE", menu_measure_noise_figure}, { MT_SUBMENU | MT_LOW, 0, "NOISE\nFIGURE", menu_measure_noise_figure},
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
{ MT_ADV_CALLBACK, M_GUARD, "GUARD", menu_measure_acb}, { MT_ADV_CALLBACK, M_BANDS, "MULTI\nBAND", menu_measure_acb},
#endif #endif
#ifdef __FFT_DECONV__ #ifdef __FFT_DECONV__
{ MT_ADV_CALLBACK, M_DECONV, "DECONV", menu_measure_acb}, { MT_ADV_CALLBACK, M_DECONV, "DECONV", menu_measure_acb},
@ -4725,9 +4734,13 @@ static const menuitem_t menu_trigger[] = {
{ MT_ADV_CALLBACK, T_NORMAL, "NORMAL", menu_trigger_acb}, { MT_ADV_CALLBACK, T_NORMAL, "NORMAL", menu_trigger_acb},
{ MT_ADV_CALLBACK, T_SINGLE, "SINGLE", menu_trigger_acb}, { MT_ADV_CALLBACK, T_SINGLE, "SINGLE", menu_trigger_acb},
// { MT_ADV_CALLBACK, T_DONE, "READY", menu_trigger_acb}, // { MT_ADV_CALLBACK, T_DONE, "READY", menu_trigger_acb},
{ MT_KEYPAD, KM_TRIGGER, "TRIGGER LEV\n\b%s", NULL}, { MT_KEYPAD, KM_TRIGGER, "LEVEL\n\b%s", NULL},
{ MT_ADV_CALLBACK, T_UP, "UP\nEDGE", menu_trigger_acb}, #if 0
{ MT_ADV_CALLBACK, T_DOWN, "DOWN\nEDGE", menu_trigger_acb}, { MT_ADV_CALLBACK, T_UP, "EDGE\nUP", menu_trigger_acb},
{ MT_ADV_CALLBACK, T_DOWN, "EDGE\nDOWN", menu_trigger_acb},
#else
{ MT_ADV_CALLBACK, T_UP, "EDGE\n\b%s", menu_trigger_acb},
#endif
{ MT_ADV_CALLBACK, T_MODE, "TRIGGER\n\b%s", menu_trigger_acb}, { MT_ADV_CALLBACK, T_MODE, "TRIGGER\n\b%s", menu_trigger_acb},
{ MT_KEYPAD, KM_TRIGGER_GRID, "INTERVAL\n\b%ss", NULL}, { MT_KEYPAD, KM_TRIGGER_GRID, "INTERVAL\n\b%ss", NULL},
#ifdef __BEEP__ #ifdef __BEEP__
@ -4999,17 +5012,17 @@ static void fetch_numeric_target(uint8_t mode)
plot_printf(uistat.text, sizeof uistat.text, "%.1f", uistat.value); plot_printf(uistat.text, sizeof uistat.text, "%.1f", uistat.value);
break; break;
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
case KM_GUARD_START: case KM_BAND_START:
uistat.freq_value = setting.guards[active_guard].start; uistat.freq_value = setting.bands[active_band].start;
plot_printf(uistat.text, sizeof uistat.text, "%.3QHz", uistat.freq_value); plot_printf(uistat.text, sizeof uistat.text, "%.3QHz", uistat.freq_value);
break; break;
case KM_GUARD_END: case KM_BAND_END:
uistat.freq_value = setting.guards[active_guard].end; uistat.freq_value = setting.bands[active_band].end;
plot_printf(uistat.text, sizeof uistat.text, "%.3QHz", uistat.freq_value); plot_printf(uistat.text, sizeof uistat.text, "%.3QHz", uistat.freq_value);
break; break;
case KM_GUARD_LEVEL: case KM_BAND_LEVEL:
uistat.value = value(setting.guards[active_guard].level); uistat.value = value(setting.bands[active_band].level);
plot_printf(uistat.text, sizeof uistat.text, "%.1f", uistat.value); plot_printf(uistat.text, sizeof uistat.text, "%.1f", uistat.value);
break; break;
#endif #endif
@ -5238,21 +5251,21 @@ set_numeric_value(void)
limits_update(); limits_update();
break; break;
#endif #endif
#ifdef __GUARD__ #ifdef __BANDS__
case KM_GUARD_START: case KM_BAND_START:
setting.guards[active_guard].start = uistat.freq_value - (setting.frequency_offset - FREQUENCY_SHIFT); setting.bands[active_band].start = uistat.freq_value - (setting.frequency_offset - FREQUENCY_SHIFT);
dirty = true; dirty = true;
// guards_update(); // BANDs_update();
break; break;
case KM_GUARD_END: case KM_BAND_END:
setting.guards[active_guard].end = uistat.freq_value - (setting.frequency_offset - FREQUENCY_SHIFT); setting.bands[active_band].end = uistat.freq_value - (setting.frequency_offset - FREQUENCY_SHIFT);
dirty = true; dirty = true;
// guards_update(); // BANDs_update();
break; break;
case KM_GUARD_LEVEL: case KM_BAND_LEVEL:
setting.guards[active_guard].level = to_dBm(uistat.value); setting.bands[active_band].level = to_dBm(uistat.value);
dirty = true; dirty = true;
// guards_update(); // BANDs_update();
break; break;
#endif #endif
case KM_NOISE: case KM_NOISE:
@ -5705,7 +5718,7 @@ redraw_cal_status:
y += YSTEP; y += YSTEP;
if (rounding) if (rounding)
lcd_printf(x, y, "%6.3f", value(setting.trigger_level)); lcd_printf(x, y, "%6.1f", value(setting.trigger_level));
else else
lcd_printf(x, y, "%6.4F", value(setting.trigger_level)); lcd_printf(x, y, "%6.4F", value(setting.trigger_level));
// lcd_printf(x, y, "%4f", value(setting.trigger_level)/setting.unit_scale); // lcd_printf(x, y, "%4f", value(setting.trigger_level)/setting.unit_scale);
@ -7233,14 +7246,14 @@ static void sa_save_file(uint8_t format) {
} }
} }
break; break;
#ifdef __GUARD__ #ifdef __BANDS__
case FMT_GRD_FILE: case FMT_BND_FILE:
for (i = 0; i < GUARDS_MAX && res == FR_OK; i++) { for (i = 0; i < BANDS_MAX && res == FR_OK; i++) {
if (setting.guards[i].enabled) { if (setting.bands[i].enabled) {
char *buf = (char *)spi_buffer; char *buf = (char *)spi_buffer;
buf += plot_printf(buf, 100, "%U, ", setting.guards[i].start); buf += plot_printf(buf, 100, "%U, ", setting.bands[i].start);
buf += plot_printf(buf, 100, "%U, ", setting.guards[i].end); buf += plot_printf(buf, 100, "%U, ", setting.bands[i].end);
buf += plot_printf(buf, 100, "%f ", setting.guards[i].level); buf += plot_printf(buf, 100, "%f ", setting.bands[i].level);
buf += plot_printf(buf, 100, "\r\n"); buf += plot_printf(buf, 100, "\r\n");
res = f_write(fs_file, (char *)spi_buffer, buf - (char *)spi_buffer, &size); res = f_write(fs_file, (char *)spi_buffer, buf - (char *)spi_buffer, &size);
} }

38
vna_browser.c
Unescape View File

@ -147,6 +147,44 @@ finish2:
} }
break; break;
} }
#ifdef __BANDS__
case FMT_BND_FILE:
{
const int buffer_size = 256;
const int line_size = 128;
char *buf_8 = (char *)spi_buffer; // must be greater then buffer_size + line_size
char *line = buf_8 + buffer_size;
uint16_t j = 0, i, count = 0;
while (f_read(fs_file, buf_8, buffer_size, &size) == FR_OK && size > 0) {
for (i = 0; i < size; i++) {
uint8_t c = buf_8[i];
if (c == '\r') { // New line (Enter)
line[j] = 0; j = 0;
char *args[16];
int nargs = parse_line(line, args, 16); // Parse line to 16 args
if (nargs < 2 || args[0][0] == '#' || args[0][0] == '!') continue; // No data or comment or settings
if (count >= BANDS_MAX) {error = "Format err"; goto finish3;}
setting.bands[count].start = my_atoui(args[0]);// Get frequency
setting.bands[count].end = my_atoui(args[1]);// Get frequency
setting.bands[count].level = my_atof(args[2]); // Get frequency
setting.bands[count].enabled = true; // Get frequency
count++;
}
else if (c < 0x20) continue; // Others (skip)
else if (j < line_size) line[j++] = (char)c; // Store
}
}
finish3:
for (; count < BANDS_MAX; i++) {
setting.bands[count].start = 0;
setting.bands[count].end = 0;
setting.bands[count].level = 0;
setting.bands[count].enabled = false;
count++;
}
break;
}
#endif
case FMT_CSV_FILE: case FMT_CSV_FILE:
{ {
const int buffer_size = 256; const int buffer_size = 256;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.