Added save/recall commands and changed auto reflevel target to -30

pull/4/head
erikkaashoek 5 years ago
parent 140a1be1a8
commit abef8aa051

@ -1620,6 +1620,7 @@ VNA_SHELL_FUNCTION(cmd_cal)
} }
shell_printf("usage: cal [%s]\r\n", cmd_cal_list); shell_printf("usage: cal [%s]\r\n", cmd_cal_list);
} }
#endif
VNA_SHELL_FUNCTION(cmd_save) VNA_SHELL_FUNCTION(cmd_save)
{ {
@ -1654,7 +1655,6 @@ VNA_SHELL_FUNCTION(cmd_recall)
usage: usage:
shell_printf("recall {id}\r\n"); shell_printf("recall {id}\r\n");
} }
#endif
static const struct { static const struct {
const char *name; const char *name;
@ -2308,9 +2308,9 @@ static const VNAShellCommand commands[] =
{"resume" , cmd_resume , 0}, {"resume" , cmd_resume , 0},
#ifdef __VNA__ #ifdef __VNA__
{"cal" , cmd_cal , CMD_WAIT_MUTEX}, {"cal" , cmd_cal , CMD_WAIT_MUTEX},
#endif
{"save" , cmd_save , 0}, {"save" , cmd_save , 0},
{"recall" , cmd_recall , CMD_WAIT_MUTEX}, {"recall" , cmd_recall , CMD_WAIT_MUTEX},
#endif
{"trace" , cmd_trace , CMD_WAIT_MUTEX}, {"trace" , cmd_trace , CMD_WAIT_MUTEX},
{"trigger" , cmd_trigger , 0}, {"trigger" , cmd_trigger , 0},
{"marker" , cmd_marker , 0}, {"marker" , cmd_marker , 0},

@ -2029,18 +2029,18 @@ sweep_again: // stay in sweep loop when output mo
// -------------------------- auto attenuate ---------------------------------- // -------------------------- auto attenuate ----------------------------------
#define AUTO_TARGET_LEVEL -30
if (!in_selftest && setting.mode == M_LOW && setting.auto_attenuation && max_index[0] > 0) { // calculate and apply auto attenuate if (!in_selftest && setting.mode == M_LOW && setting.auto_attenuation && max_index[0] > 0) { // calculate and apply auto attenuate
setting.atten_step = false; // No step attenuate in low mode auto attenuate setting.atten_step = false; // No step attenuate in low mode auto attenuate
int changed = false; int changed = false;
float actual_max_level = actual_t[max_index[0]] - get_attenuation(); float actual_max_level = actual_t[max_index[0]] - get_attenuation();
if (actual_max_level < - 31 && setting.attenuate >= 10) { if (actual_max_level < AUTO_TARGET_LEVEL - 11 && setting.attenuate >= 10) {
setting.attenuate -= 10.0; setting.attenuate -= 10.0;
changed = true; changed = true;
} else if (actual_max_level < - 26 && setting.attenuate >= 5) { } else if (actual_max_level < AUTO_TARGET_LEVEL - 6 && setting.attenuate >= 5) {
setting.attenuate -= 5.0; setting.attenuate -= 5.0;
changed = true; changed = true;
} else if (actual_max_level > - 19 && setting.attenuate <= 20) { } else if (actual_max_level > AUTO_TARGET_LEVEL + 2 && setting.attenuate <= 20) {
setting.attenuate += 10.0; setting.attenuate += 10.0;
changed = true; changed = true;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.