ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add threshold command

Browse source
This commit is contained in:
TT 2019-10-05 19:56:38 +09:00
parent 18c529984b
commit 94659a22ba
3 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
main.c
View file

@ -43,7 +43,8 @@ bool sweep(bool break_on_operation);
static MUTEX_DECL(mutex); static MUTEX_DECL(mutex);
#define DRIVE_STRENGTH_AUTO (-1) #define DRIVE_STRENGTH_AUTO (-1)
#define FREQ_HARMONICS 300000000 //#define FREQ_HARMONICS 300000000
#define FREQ_HARMONICS (config.harmonic_freq_threshold)
int32_t frequency_offset = 5000; int32_t frequency_offset = 5000;
int32_t frequency = 10000000; int32_t frequency = 10000000;
@ -354,6 +355,18 @@ static void cmd_dac(BaseSequentialStream *chp, int argc, char *argv[])
dacPutChannelX(&DACD2, 0, value); dacPutChannelX(&DACD2, 0, value);
} }
static void cmd_threshold(BaseSequentialStream *chp, int argc, char *argv[])
{
int value;
if (argc != 1) {
chprintf(chp, "usage: threshold {frequency in harmonic mode}\r\n");
chprintf(chp, "current: %d\r\n", config.harmonic_freq_threshold);
return;
}
value = atoi(argv[0]);
config.harmonic_freq_threshold = value;
}
static void cmd_saveconfig(BaseSequentialStream *chp, int argc, char *argv[]) static void cmd_saveconfig(BaseSequentialStream *chp, int argc, char *argv[])
{ {
(void)argc; (void)argc;
@ -590,16 +603,16 @@ float cal_data[5][101][2];
#endif #endif
config_t config = { config_t config = {
/* magic */ CONFIG_MAGIC, .magic = CONFIG_MAGIC,
/* dac_value */ 1922, .dac_value = 1922,
/* grid_color */ 0x1084, .grid_color = 0x1084,
/* menu_normal_color */ 0xffff, .menu_normal_color = 0xffff,
/* menu_active_color */ 0x7777, .menu_active_color = 0x7777,
/* trace_colors[4] */ { RGB565(0,255,255), RGB565(255,0,40), RGB565(0,0,255), RGB565(50,255,0) }, .trace_color = { RGB565(0,255,255), RGB565(255,0,40), RGB565(0,0,255), RGB565(50,255,0) },
///* touch_cal[4] */ { 620, 600, 160, 190 }, .touch_cal = { 693, 605, 124, 171 }, //{ 620, 600, 160, 190 },
/* touch_cal[4] */ { 693, 605, 124, 171 }, .default_loadcal = 0,
/* default_loadcal */ 0, .harmonic_freq_threshold = 300000000,
/* checksum */ 0 .checksum = 0
}; };
properties_t current_props = { properties_t current_props = {
@ -1981,6 +1994,7 @@ static const ShellCommand commands[] =
{ "capture", cmd_capture }, { "capture", cmd_capture },
{ "vbat", cmd_vbat }, { "vbat", cmd_vbat },
{ "transform", cmd_transform }, { "transform", cmd_transform },
{ "threshold", cmd_threshold },
{ NULL, NULL } { NULL, NULL }
}; };

1
nanovna.h
View file

@ -195,6 +195,7 @@ typedef struct {
uint16_t trace_color[TRACES_MAX]; uint16_t trace_color[TRACES_MAX];
int16_t touch_cal[4]; int16_t touch_cal[4];
int8_t default_loadcal; int8_t default_loadcal;
int32_t harmonic_freq_threshold;
int32_t checksum; int32_t checksum;
} config_t; } config_t;

5
si5351.c
View file

@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "hal.h" #include "hal.h"
#include "nanovna.h"
#include "si5351.h" #include "si5351.h"
#define SI5351_I2C_ADDR (0x60<<1) #define SI5351_I2C_ADDR (0x60<<1)
@ -309,10 +310,10 @@ si5351_set_frequency_with_offset(int freq, int offset, uint8_t drive_strength)
int delay = 3; int delay = 3;
uint32_t ofreq = freq + offset; uint32_t ofreq = freq + offset;
uint32_t rdiv = SI5351_R_DIV_1; uint32_t rdiv = SI5351_R_DIV_1;
if (freq > 900000000) { if (freq > config.harmonic_freq_threshold * 3) {
freq /= 5; freq /= 5;
ofreq /= 7; ofreq /= 7;
} else if (freq > 300000000) { } else if (freq > config.harmonic_freq_threshold) {
freq /= 3; freq /= 3;
ofreq /= 5; ofreq /= 5;
} }