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

fix: fix digit loss of sweep frequency

Browse source
This commit is contained in:
TT 2019-10-05 21:48:00 +09:00
parent 3a6de231c6
commit bfd45c715d
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main.c
View file

@ -827,16 +827,15 @@ freq_mode_centerspan(void)
#define STOP_MAX 1500000000 #define STOP_MAX 1500000000
void void
set_sweep_frequency(int type, float frequency) set_sweep_frequency(int type, uint32_t freq)
{ {
int32_t freq = frequency;
int cal_applied = cal_status & CALSTAT_APPLY; int cal_applied = cal_status & CALSTAT_APPLY;
switch (type) { switch (type) {
case ST_START: case ST_START:
freq_mode_startstop(); freq_mode_startstop();
if (frequency < START_MIN) if (freq < START_MIN)
freq = START_MIN; freq = START_MIN;
if (frequency > STOP_MAX) if (freq > STOP_MAX)
freq = STOP_MAX; freq = STOP_MAX;
if (frequency0 != freq) { if (frequency0 != freq) {
ensure_edit_config(); ensure_edit_config();
@ -849,9 +848,9 @@ set_sweep_frequency(int type, float frequency)
break; break;
case ST_STOP: case ST_STOP:
freq_mode_startstop(); freq_mode_startstop();
if (frequency > STOP_MAX) if (freq > STOP_MAX)
freq = STOP_MAX; freq = STOP_MAX;
if (frequency < START_MIN) if (freq < START_MIN)
freq = START_MIN; freq = START_MIN;
if (frequency1 != freq) { if (frequency1 != freq) {
ensure_edit_config(); ensure_edit_config();
@ -903,7 +902,7 @@ set_sweep_frequency(int type, float frequency)
freq_mode_centerspan(); freq_mode_centerspan();
if (frequency0 != freq || frequency1 != 0) { if (frequency0 != freq || frequency1 != 0) {
ensure_edit_config(); ensure_edit_config();
frequency0 = frequency; frequency0 = freq;
frequency1 = 0; frequency1 = 0;
update_frequencies(); update_frequencies();
} }

2
nanovna.h
View file

@ -71,7 +71,7 @@ enum {
ST_START, ST_STOP, ST_CENTER, ST_SPAN, ST_CW ST_START, ST_STOP, ST_CENTER, ST_SPAN, ST_CW
}; };
void set_sweep_frequency(int type, float frequency); void set_sweep_frequency(int type, uint32_t frequency);
uint32_t get_sweep_frequency(int type); uint32_t get_sweep_frequency(int type);
float my_atof(const char *p); float my_atof(const char *p);