From 8d39e434719c464bf5c71322a0977e8cbaf96bda Mon Sep 17 00:00:00 2001 From: TT Date: Tue, 13 Dec 2016 00:01:17 +0900 Subject: [PATCH] rename freq_start/stop --- main.c | 83 ++++++++++++++++++++++++++++--------------------------- nanovna.h | 8 +++--- plot.c | 32 ++++++++++----------- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/main.c b/main.c index 96ffcb6..fca60d3 100644 --- a/main.c +++ b/main.c @@ -335,8 +335,8 @@ static void cmd_gamma(BaseSequentialStream *chp, int argc, char *argv[]) } #if 0 -int32_t freq_start = 1000000; -int32_t freq_stop = 300000000; +int32_t frequency0 = 1000000; +int32_t frequency1 = 300000000; int16_t sweep_points = 101; uint32_t frequencies[101]; @@ -346,8 +346,8 @@ float cal_data[5][101][2]; config_t current_config = { /* magic */ CONFIG_MAGIC, - /* freq_start */ 1000000, - /* freq_stop */ 300000000, + /* frequency0 */ 1000000, + /* frequency1 */ 300000000, /* sweep_points */ 101, /* cal_status */ 0, /* frequencies */ {}, @@ -389,8 +389,8 @@ static void cmd_scan(BaseSequentialStream *chp, int argc, char *argv[]) (void)argv; pause_sweep(); - freq = freq_start; - step = (freq_stop - freq_start) / (sweep_points-1); + freq = frequency0; + step = (frequency1 - frequency0) / (sweep_points-1); delay = set_frequency(freq); delay += 2; for (i = 0; i < sweep_points; i++) { @@ -456,12 +456,13 @@ update_frequencies(void) int i; int32_t span; int32_t start; - if (freq_stop > 0) { - start = freq_start; - span = (freq_stop - freq_start)/100; + if (frequency1 > 0) { + start = frequency0; + span = (frequency1 - frequency0)/100; } else { - span = -freq_stop; - start = freq_start - span/2; + int center = frequency0; + span = -frequency1; + start = center - span/2; span /= 100; } @@ -476,22 +477,22 @@ update_frequencies(void) void freq_mode_startstop(void) { - if (freq_stop <= 0) { - int center = freq_start; - int span = -freq_stop; - freq_start = center - span/2; - freq_stop = center + span/2; + if (frequency1 <= 0) { + int center = frequency0; + int span = -frequency1; + frequency0 = center - span/2; + frequency1 = center + span/2; } } void freq_mode_centerspan(void) { - if (freq_stop > 0) { - int start = freq_start; - int stop = freq_stop; - freq_start = (start + stop)/2; // center - freq_stop = -(stop - start); // span + if (frequency1 > 0) { + int start = frequency0; + int stop = frequency1; + frequency0 = (start + stop)/2; // center + frequency1 = -(stop - start); // span } } @@ -508,8 +509,8 @@ set_sweep_frequency(int type, int frequency) freq_mode_startstop(); if (frequency < START_MIN) frequency = START_MIN; - if (freq_start != frequency) { - freq_start = frequency; + if (frequency0 != frequency) { + frequency0 = frequency; update_frequencies(); } break; @@ -518,25 +519,25 @@ set_sweep_frequency(int type, int frequency) freq_mode_startstop(); if (frequency > STOP_MAX) frequency = STOP_MAX; - if (freq_stop != frequency) { - freq_stop = frequency; + if (frequency1 != frequency) { + frequency1 = frequency; update_frequencies(); } break; case ST_CENTER: ensure_edit_config(); freq_mode_centerspan(); - if (freq_start != frequency) { - freq_start = frequency; - int center = freq_start; - int span = -freq_stop; + if (frequency0 != frequency) { + frequency0 = frequency; + int center = frequency0; + int span = -frequency1; if (center-span/2 < START_MIN) { span = (center - START_MIN) * 2; - freq_stop = -span; + frequency1 = -span; } if (center+span/2 > STOP_MAX) { span = (STOP_MAX - center) * 2; - freq_stop = -span; + frequency1 = -span; } update_frequencies(); } @@ -544,17 +545,17 @@ set_sweep_frequency(int type, int frequency) case ST_SPAN: ensure_edit_config(); freq_mode_centerspan(); - if (freq_stop != -frequency) { - freq_stop = -frequency; - int center = freq_start; - int span = -freq_stop; + if (frequency1 != -frequency) { + frequency1 = -frequency; + int center = frequency0; + int span = -frequency1; if (center-span/2 < START_MIN) { center = START_MIN + span/2; - freq_start = center; + frequency0 = center; } if (center+span/2 > STOP_MAX) { center = STOP_MAX - span/2; - freq_start = center; + frequency0 = center; } update_frequencies(); } @@ -562,9 +563,9 @@ set_sweep_frequency(int type, int frequency) case ST_CW: ensure_edit_config(); freq_mode_centerspan(); - if (freq_start != frequency || freq_stop != 0) { - freq_start = frequency; - freq_stop = 0; + if (frequency0 != frequency || frequency1 != 0) { + frequency0 = frequency; + frequency1 = 0; update_frequencies(); } break; @@ -574,7 +575,7 @@ set_sweep_frequency(int type, int frequency) static void cmd_sweep(BaseSequentialStream *chp, int argc, char *argv[]) { if (argc == 0) { - chprintf(chp, "%d %d %d\r\n", freq_start, freq_stop, sweep_points); + chprintf(chp, "%d %d %d\r\n", frequency0, frequency1, sweep_points); return; } else if (argc > 3) { chprintf(chp, "usage: sweep {start(Hz)} [stop] [points]\r\n"); diff --git a/nanovna.h b/nanovna.h index f557a8e..cae92eb 100644 --- a/nanovna.h +++ b/nanovna.h @@ -211,8 +211,8 @@ float my_atof(const char *p); typedef struct { int32_t magic; - int32_t _freq_start; - int32_t _freq_stop; + int32_t _frequency0; // start or center + int32_t _frequency1; // stop or span int16_t _sweep_points; uint16_t _cal_status; @@ -232,8 +232,8 @@ extern int16_t lastsaveid; extern config_t *active; extern config_t current_config; -#define freq_start current_config._freq_start -#define freq_stop current_config._freq_stop +#define frequency0 current_config._frequency0 +#define frequency1 current_config._frequency1 #define sweep_points current_config._sweep_points #define cal_status current_config._cal_status #define frequencies current_config._frequencies diff --git a/plot.c b/plot.c index 88af7e2..01b0c11 100644 --- a/plot.c +++ b/plot.c @@ -72,12 +72,12 @@ void update_grid(void) int32_t gdigit = 100000000; int32_t fstart, fspan; int32_t grid; - if (freq_stop > 0) { - fstart = freq_start; - fspan = freq_stop - freq_start; + if (frequency1 > 0) { + fstart = frequency0; + fspan = frequency1 - frequency0; } else { - fspan = -freq_stop; - fstart = freq_start - fspan/2; + fspan = -frequency1; + fstart = frequency0 - fspan/2; } while (gdigit > 100) { @@ -1236,20 +1236,20 @@ void draw_frequencies(void) { char buf[24]; - if (freq_stop > 0) { + if (frequency1 > 0) { chsnprintf(buf, 24, "START %d.%03d %03d MHz ", - (int)(freq_start / 1000000), - (int)((freq_start / 1000) % 1000), - (int)(freq_start % 1000)); + (int)(frequency0 / 1000000), + (int)((frequency0 / 1000) % 1000), + (int)(frequency0 % 1000)); ili9341_drawstring_5x7(buf, OFFSETX, 233, 0xffff, 0x0000); chsnprintf(buf, 24, "STOP %d.%03d %03d MHz", - (int)(freq_stop / 1000000), - (int)((freq_stop / 1000) % 1000), - (int)(freq_stop % 1000)); + (int)(frequency1 / 1000000), + (int)((frequency1 / 1000) % 1000), + (int)(frequency1 % 1000)); ili9341_drawstring_5x7(buf, 205, 233, 0xffff, 0x0000); - } else if (freq_stop < 0) { - int fcenter = freq_start; - int fspan = -freq_stop; + } else if (frequency1 < 0) { + int fcenter = frequency0; + int fspan = -frequency1; chsnprintf(buf, 24, "CENTER %d.%03d %03d MHz ", (int)(fcenter / 1000000), (int)((fcenter / 1000) % 1000), @@ -1261,7 +1261,7 @@ draw_frequencies(void) (int)(fspan % 1000)); ili9341_drawstring_5x7(buf, 205, 233, 0xffff, 0x0000); } else { - int fcenter = freq_start; + int fcenter = frequency0; chsnprintf(buf, 24, "CW %d.%03d %03d MHz ", (int)(fcenter / 1000000), (int)((fcenter / 1000) % 1000),