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

rename TDR -> TD

Browse source
This commit is contained in:
cho45 2019-09-11 23:05:01 +09:00
parent 472b895d5b
commit aa4faa5a6e
3 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main.c
View file

@ -140,27 +140,27 @@ transform_domain(void)
float* tmp = (float*)spi_buffer; float* tmp = (float*)spi_buffer;
uint8_t window_size, offset; uint8_t window_size, offset;
switch (domain_mode & TDR_FUNC) { switch (domain_mode & TD_FUNC) {
case TDR_FUNC_BANDPASS: case TD_FUNC_BANDPASS:
offset = 0; offset = 0;
window_size = 101; window_size = 101;
break; break;
case TDR_FUNC_LOWPASS_IMPULSE: case TD_FUNC_LOWPASS_IMPULSE:
case TDR_FUNC_LOWPASS_STEP: case TD_FUNC_LOWPASS_STEP:
offset = 101; offset = 101;
window_size = 202; window_size = 202;
break; break;
} }
float beta = 0.0; float beta = 0.0;
switch (domain_mode & TDR_WINDOW) { switch (domain_mode & TD_WINDOW) {
case TDR_WINDOW_MINIMUM: case TD_WINDOW_MINIMUM:
beta = 0.0; // this is rectangular beta = 0.0; // this is rectangular
break; break;
case TDR_WINDOW_NORMAL: case TD_WINDOW_NORMAL:
beta = 6.0; beta = 6.0;
break; break;
case TDR_WINDOW_MAXIMUM: case TD_WINDOW_MAXIMUM:
beta = 13; beta = 13;
break; break;
} }
@ -184,7 +184,7 @@ transform_domain(void)
measured[ch][i][0] /= 128.0; measured[ch][i][0] /= 128.0;
measured[ch][i][1] /= 128.0; measured[ch][i][1] /= 128.0;
} }
if ( (domain_mode & TDR_FUNC) == TDR_FUNC_LOWPASS_STEP ) { if ( (domain_mode & TD_FUNC) == TD_FUNC_LOWPASS_STEP ) {
for (int i = 1; i < 101; i++) { for (int i = 1; i < 101; i++) {
measured[ch][i][0] += measured[ch][i-1][0]; measured[ch][i][0] += measured[ch][i-1][0];
measured[ch][i][1] += measured[ch][i-1][1]; measured[ch][i][1] += measured[ch][i-1][1];

26
nanovna.h
View file

@ -25,14 +25,6 @@
extern float measured[2][101][2]; extern float measured[2][101][2];
enum {
DOMAIN_FREQ, DOMAIN_TIME
};
enum {
TDR_IMPULSE, TDR_STEP
};
#define CAL_LOAD 0 #define CAL_LOAD 0
#define CAL_OPEN 1 #define CAL_OPEN 1
#define CAL_SHORT 2 #define CAL_SHORT 2
@ -61,14 +53,14 @@ enum {
#define DOMAIN_MODE (1<<0) #define DOMAIN_MODE (1<<0)
#define DOMAIN_FREQ (0<<0) #define DOMAIN_FREQ (0<<0)
#define DOMAIN_TIME (1<<0) #define DOMAIN_TIME (1<<0)
#define TDR_FUNC (0b11<<1) #define TD_FUNC (0b11<<1)
#define TDR_FUNC_BANDPASS (0b00<<1) #define TD_FUNC_BANDPASS (0b00<<1)
#define TDR_FUNC_LOWPASS_IMPULSE (0b01<<1) #define TD_FUNC_LOWPASS_IMPULSE (0b01<<1)
#define TDR_FUNC_LOWPASS_STEP (0b10<<1) #define TD_FUNC_LOWPASS_STEP (0b10<<1)
#define TDR_WINDOW (0b11<<3) #define TD_WINDOW (0b11<<3)
#define TDR_WINDOW_NORMAL (0b00<<3) #define TD_WINDOW_NORMAL (0b00<<3)
#define TDR_WINDOW_MINIMUM (0b01<<3) #define TD_WINDOW_MINIMUM (0b01<<3)
#define TDR_WINDOW_MAXIMUM (0b10<<3) #define TD_WINDOW_MAXIMUM (0b10<<3)
void cal_collect(int type); void cal_collect(int type);
void cal_done(void); void cal_done(void);
@ -303,7 +295,7 @@ typedef struct {
trace_t _trace[TRACES_MAX]; trace_t _trace[TRACES_MAX];
marker_t _markers[4]; marker_t _markers[4];
int _active_marker; int _active_marker;
uint8_t _domain_mode; /* 0bxxxxxffm : where ff: TDR_FUNC m: DOMAIN_MODE */ uint8_t _domain_mode; /* 0bxxxxxffm : where ff: TD_FUNC m: DOMAIN_MODE */
uint8_t _velocity_factor; // % uint8_t _velocity_factor; // %
int32_t checksum; int32_t checksum;

24
ui.c
View file

@ -670,15 +670,15 @@ menu_transform_window_cb(int item)
// TODO // TODO
switch (item) { switch (item) {
case 0: case 0:
domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_MINIMUM; domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_MINIMUM;
ui_mode_normal(); ui_mode_normal();
break; break;
case 1: case 1:
domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_NORMAL; domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_NORMAL;
ui_mode_normal(); ui_mode_normal();
break; break;
case 2: case 2:
domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_MAXIMUM; domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_MAXIMUM;
ui_mode_normal(); ui_mode_normal();
break; break;
} }
@ -699,15 +699,15 @@ menu_transform_cb(int item)
ui_mode_normal(); ui_mode_normal();
break; break;
case 1: case 1:
domain_mode = (domain_mode & ~TDR_FUNC) | TDR_FUNC_LOWPASS_IMPULSE; domain_mode = (domain_mode & ~TD_FUNC) | TD_FUNC_LOWPASS_IMPULSE;
ui_mode_normal(); ui_mode_normal();
break; break;
case 2: case 2:
domain_mode = (domain_mode & ~TDR_FUNC) | TDR_FUNC_LOWPASS_STEP; domain_mode = (domain_mode & ~TD_FUNC) | TD_FUNC_LOWPASS_STEP;
ui_mode_normal(); ui_mode_normal();
break; break;
case 3: case 3:
domain_mode = (domain_mode & ~TDR_FUNC) | TDR_FUNC_BANDPASS; domain_mode = (domain_mode & ~TD_FUNC) | TD_FUNC_BANDPASS;
ui_mode_normal(); ui_mode_normal();
break; break;
case 5: case 5:
@ -1318,17 +1318,17 @@ menu_item_modify_attribute(const menuitem_t *menu, int item,
} }
} else if (menu == menu_transform) { } else if (menu == menu_transform) {
if ((item == 0 && (domain_mode & DOMAIN_MODE) == DOMAIN_TIME) if ((item == 0 && (domain_mode & DOMAIN_MODE) == DOMAIN_TIME)
|| (item == 1 && (domain_mode & TDR_FUNC) == TDR_FUNC_LOWPASS_IMPULSE) || (item == 1 && (domain_mode & TD_FUNC) == TD_FUNC_LOWPASS_IMPULSE)
|| (item == 2 && (domain_mode & TDR_FUNC) == TDR_FUNC_LOWPASS_STEP) || (item == 2 && (domain_mode & TD_FUNC) == TD_FUNC_LOWPASS_STEP)
|| (item == 3 && (domain_mode & TDR_FUNC) == TDR_FUNC_BANDPASS) || (item == 3 && (domain_mode & TD_FUNC) == TD_FUNC_BANDPASS)
) { ) {
*bg = 0x0000; *bg = 0x0000;
*fg = 0xffff; *fg = 0xffff;
} }
} else if (menu == menu_transform_window) { } else if (menu == menu_transform_window) {
if ((item == 0 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_MINIMUM) if ((item == 0 && (domain_mode & TD_WINDOW) == TD_WINDOW_MINIMUM)
|| (item == 1 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_NORMAL) || (item == 1 && (domain_mode & TD_WINDOW) == TD_WINDOW_NORMAL)
|| (item == 2 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_MAXIMUM) || (item == 2 && (domain_mode & TD_WINDOW) == TD_WINDOW_MAXIMUM)
) { ) {
*bg = 0x0000; *bg = 0x0000;
*fg = 0xffff; *fg = 0xffff;