From aa4faa5a6e7419f95251ff481dfe0b2d5a5c89cc Mon Sep 17 00:00:00 2001
From: cho45 <cho45@lowreal.net>
Date: Wed, 11 Sep 2019 23:05:01 +0900
Subject: [PATCH] rename TDR -> TD

---
 main.c    | 18 +++++++++---------
 nanovna.h | 26 +++++++++-----------------
 ui.c      | 24 ++++++++++++------------
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/main.c b/main.c
index 8f88c27..40a9b1b 100644
--- a/main.c
+++ b/main.c
@@ -140,27 +140,27 @@ transform_domain(void)
   float* tmp = (float*)spi_buffer;
 
   uint8_t window_size, offset;
-  switch (domain_mode & TDR_FUNC) {
-      case TDR_FUNC_BANDPASS:
+  switch (domain_mode & TD_FUNC) {
+      case TD_FUNC_BANDPASS:
           offset = 0;
           window_size = 101;
           break;
-      case TDR_FUNC_LOWPASS_IMPULSE:
-      case TDR_FUNC_LOWPASS_STEP:
+      case TD_FUNC_LOWPASS_IMPULSE:
+      case TD_FUNC_LOWPASS_STEP:
           offset = 101;
           window_size = 202;
           break;
   }
 
   float beta = 0.0;
-  switch (domain_mode & TDR_WINDOW) {
-      case TDR_WINDOW_MINIMUM:
+  switch (domain_mode & TD_WINDOW) {
+      case TD_WINDOW_MINIMUM:
           beta = 0.0; // this is rectangular
           break;
-      case TDR_WINDOW_NORMAL:
+      case TD_WINDOW_NORMAL:
           beta = 6.0;
           break;
-      case TDR_WINDOW_MAXIMUM:
+      case TD_WINDOW_MAXIMUM:
           beta = 13;
           break;
   }
@@ -184,7 +184,7 @@ transform_domain(void)
           measured[ch][i][0] /= 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++) {
               measured[ch][i][0] += measured[ch][i-1][0];
               measured[ch][i][1] += measured[ch][i-1][1];
diff --git a/nanovna.h b/nanovna.h
index 7465d44..e60924d 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -25,14 +25,6 @@
 
 extern float measured[2][101][2];
 
-enum {
-  DOMAIN_FREQ, DOMAIN_TIME
-};
-
-enum {
-  TDR_IMPULSE, TDR_STEP
-};
-
 #define CAL_LOAD 0
 #define CAL_OPEN 1
 #define CAL_SHORT 2
@@ -61,14 +53,14 @@ enum {
 #define DOMAIN_MODE (1<<0)
 #define DOMAIN_FREQ (0<<0)
 #define DOMAIN_TIME (1<<0)
-#define TDR_FUNC (0b11<<1)
-#define TDR_FUNC_BANDPASS (0b00<<1)
-#define TDR_FUNC_LOWPASS_IMPULSE (0b01<<1)
-#define TDR_FUNC_LOWPASS_STEP    (0b10<<1)
-#define TDR_WINDOW (0b11<<3)
-#define TDR_WINDOW_NORMAL (0b00<<3)
-#define TDR_WINDOW_MINIMUM (0b01<<3)
-#define TDR_WINDOW_MAXIMUM (0b10<<3)
+#define TD_FUNC (0b11<<1)
+#define TD_FUNC_BANDPASS (0b00<<1)
+#define TD_FUNC_LOWPASS_IMPULSE (0b01<<1)
+#define TD_FUNC_LOWPASS_STEP    (0b10<<1)
+#define TD_WINDOW (0b11<<3)
+#define TD_WINDOW_NORMAL (0b00<<3)
+#define TD_WINDOW_MINIMUM (0b01<<3)
+#define TD_WINDOW_MAXIMUM (0b10<<3)
 
 void cal_collect(int type);
 void cal_done(void);
@@ -303,7 +295,7 @@ typedef struct {
   trace_t _trace[TRACES_MAX];
   marker_t _markers[4];
   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; // %
 
   int32_t checksum;
diff --git a/ui.c b/ui.c
index 7023c6f..686e032 100644
--- a/ui.c
+++ b/ui.c
@@ -670,15 +670,15 @@ menu_transform_window_cb(int item)
   // TODO
   switch (item) {
     case 0:
-      domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_MINIMUM;
+      domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_MINIMUM;
       ui_mode_normal();
       break;
     case 1:
-      domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_NORMAL;
+      domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_NORMAL;
       ui_mode_normal();
       break;
     case 2:
-      domain_mode = (domain_mode & ~TDR_WINDOW) | TDR_WINDOW_MAXIMUM;
+      domain_mode = (domain_mode & ~TD_WINDOW) | TD_WINDOW_MAXIMUM;
       ui_mode_normal();
       break;
   }
@@ -699,15 +699,15 @@ menu_transform_cb(int item)
       ui_mode_normal();
       break;
     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();
       break;
     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();
       break;
     case 3:
-      domain_mode = (domain_mode & ~TDR_FUNC) | TDR_FUNC_BANDPASS;
+      domain_mode = (domain_mode & ~TD_FUNC) | TD_FUNC_BANDPASS;
       ui_mode_normal();
       break;
     case 5:
@@ -1318,17 +1318,17 @@ menu_item_modify_attribute(const menuitem_t *menu, int item,
     }
   } else if (menu == menu_transform) {
       if ((item == 0 && (domain_mode & DOMAIN_MODE) == DOMAIN_TIME)
-       || (item == 1 && (domain_mode & TDR_FUNC) == TDR_FUNC_LOWPASS_IMPULSE)
-       || (item == 2 && (domain_mode & TDR_FUNC) == TDR_FUNC_LOWPASS_STEP)
-       || (item == 3 && (domain_mode & TDR_FUNC) == TDR_FUNC_BANDPASS)
+       || (item == 1 && (domain_mode & TD_FUNC) == TD_FUNC_LOWPASS_IMPULSE)
+       || (item == 2 && (domain_mode & TD_FUNC) == TD_FUNC_LOWPASS_STEP)
+       || (item == 3 && (domain_mode & TD_FUNC) == TD_FUNC_BANDPASS)
        ) {
         *bg = 0x0000;
         *fg = 0xffff;
       }
   } else if (menu == menu_transform_window) {
-      if ((item == 0 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_MINIMUM)
-       || (item == 1 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_NORMAL)
-       || (item == 2 && (domain_mode & TDR_WINDOW) == TDR_WINDOW_MAXIMUM)
+      if ((item == 0 && (domain_mode & TD_WINDOW) == TD_WINDOW_MINIMUM)
+       || (item == 1 && (domain_mode & TD_WINDOW) == TD_WINDOW_NORMAL)
+       || (item == 2 && (domain_mode & TD_WINDOW) == TD_WINDOW_MAXIMUM)
        ) {
         *bg = 0x0000;
         *fg = 0xffff;