[update] new cf mode

[update] update highz instruction
[update] clean up eis parameter
2022-11-16 11:51:15 +08:00 · 2022-11-15 17:28:51 +08:00 · 2022-11-15 16:08:43 +08:00 · 2022-11-15 16:08:09 +08:00 · 2022-11-15 16:07:58 +08:00 · 2022-11-15 16:03:06 +08:00
5 changed files with 621 additions and 279 deletions
@@ -1537,7 +1537,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
            return None

        if time_stamp != 0 and self._start_return_data == True:
-            if (self._mode == 0):
+            if (self._mode == 0 or self._mode == 5):
                time_stamp, delta, ret_get_time_stamp = self.eis_get_time_stamp(time_stamp)
            else:
                time_stamp, delta, ret_get_time_stamp = self.get_time_stamp(time_stamp)
@@ -1546,7 +1546,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                print("error timeStamp full data:", list(data), datetime.now(), '\n')
                return None
            else:
-                if self.cali_coeff is not None and self._mode == 0:
+                if self.cali_coeff is not None and (self._mode == 0 or self._mode == 5):
                    hsrtia_a = []
                    hsrtia_b = []
                    hsrtia_c = []
@@ -1555,7 +1555,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):

                    voltage_amp = round(self._ac_amp * 800 / 2047) # use UI value

-                if (self._mode == 0):
+                if (self._mode == 0 or self._mode == 5):
                    img = ch1
                    real = ch2
                    freq = ch3
@@ -1615,7 +1615,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                    real_after_cal = impedance * math.cos(round(phase) * math.pi / 180)

                if self._show_data:
-                    if (self._mode == 0):
+                    if (self._mode == 0 or self._mode == 5):
                        print('|', '{:10}'.format(time_stamp),
                            '|', '{:5}'.format(delta),
                            '|', '{:6}'.format(ch1),
@@ -1650,7 +1650,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
            self._mode_stop = 0

        ret = RecordingData(self.device, int(time_stamp * 1000 / 2), 0)
-        if (self._mode == 0):                           #EIS Mode
+        if self._mode == 0 or self._mode == 5:                           #EIS Mode
            ret.append_data(0, ch1)                     #Raw Imag  
            ret.append_data(1, ch2)                     #Raw Real
            ret.append_data(2, ch3 * 10)                #Frequency [mHz]
@@ -1131,7 +1131,7 @@ class CompletedDevice(Device):
                # raise RuntimeError('illegal parameter value : ' + value) from e
            else:
                if name == 'MODE':
-                    if self.library_name.startswith('Elite_EDC'):
+                    if self.library_name.startswith('Elite_EDC') or 'EIS' in self.library_name:
                        self.set_parameter('CTRL_HIGH_Z_15', self.get_parameter('HIGHZ_TABLE')[value])
                        self.set_parameter('TIME_DURATION', 0)

@@ -26,11 +26,43 @@
        "expression": "VALUE"
      }
    },
-    "CHANNEL": {
-      "derzteription": "record channels",
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
    },
    "SAMPLE_RATE": {
      "description": "data sampling rate",
@@ -44,6 +76,12 @@
      },
      "on_change": "set_sample_rate"
    },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
    "AMP_GAIN": {
      "description": "amp gain",
      "record_meta": true,
@@ -59,6 +97,7 @@
        "Chronoamperometric",
        "V-T Graph",
        "R-T Graph",
+        "EIS constant frequency",
        "Dev Mode"
      ]
    },
@@ -75,6 +114,19 @@
      ],
      "on_change": "set_general_hs_rtia"
    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_rtia"
+    },
    "EIS_DC_BIAS": {
      "description": "DC voltage bias",
      "record_meta": true,
@@ -147,57 +199,76 @@
        8
      ]
    },
-
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
      "record_meta": true,
-      "initial": 10000,
+      "initial": 25000,
      "domain": [
-        100001
+        "VOLT_MAX"
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
      "record_meta": true,
-      "initial": 1,
-      "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
-    },
-    "ADC_LEVEL_I_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "3",
-        "auto"
-      ],
-      "on_change": "set_adc_gain_I"
-    },
-    "ADC_LEVEL_V_IN_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 3,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "auto"
+      "initial": 25,
+      "domain": [
+        2048
      ]
    },
-    "VOLT_INITIAL": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
+      "description": "Point spacing pattern",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
+    },
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        101
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
+      "record_meta": true,
+      "initial": 8,
+      "value": [
+        2,
+        4,
+        6,
+        8
+      ]
+    },
+    "CV_E_INITIAL": {
      "description": "Initial Voltage of Scan",
      "record_meta": true,
      "initial": 25000,
@@ -208,8 +279,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -219,8 +290,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -230,19 +301,19 @@
        "expression": "VALUE"
      }
    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
      "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
      "domain": [
-        65536
+        100001
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
+    "CA_VOLT": {
+      "description": "Voltage of ca",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -252,7 +323,7 @@
        "expression": "VALUE"
      }
    },
-    "MEASURE_VIN_RANGE": {
+    "VT_MEASURE_VIN_RANGE": {
      "description": "measure range of Vin",
      "record_meta": true,
      "initial": 0,
@@ -275,6 +346,10 @@
      },
      "on_change": "set_para_RT_VOLT_SET"
    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
    "BLE_WRITE": {
      "description": "send msg to elite",
      "domain": {
@@ -306,10 +381,11 @@
        "expression": "MODE",
        "when": {
          "0": "set_general_hs_rtia",
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I",
-          "3": "set_adc_gain_I",
-          "4": "set_adc_gain_I"
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
        }
      },
      {
@@ -317,22 +393,25 @@
        "when": {
          "0": "curve_eis",
          "1": "curve_cv3",
-          "2": "curve_const_vscan",
+          "2": "curve_ca",
          "3": "curve_vt",
-          "4": "curve_rt"
+          "4": "curve_rt",
+          "5": "curve_cf"
        }
      },
      {
        "expression": "MODE",
        "when": {
          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
        }
      },
      {
        "expression": "MODE",
        "when": {
-          "0": "curve_eis_mode"
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
        }
      },
      "_sync(True)",
@@ -358,6 +437,12 @@
        "1XFF;1X70;1B>GENERAL_HS_RTIA"
      ]
    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
    "set_sample_rate": {
      "type": "RIS",
      "parameter": {
@@ -367,16 +452,10 @@
        "XE0;2B>va"
      ]
    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
    "set_ctrl_highZ": {
      "type": "RIS",
      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
+        "1XFF;1X72;1B>CTRL_HIGH_Z_15"
      ]
    },
    "curve_eis": {
@@ -419,13 +498,51 @@
        "1X12;1XFF"
      ]
    },
+    "curve_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
+      ]
+    },
    "curve_cv3": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -436,10 +553,10 @@
    "curve_cv3_para2": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -447,19 +564,18 @@
        "1X09;1X02;4B>ve;2B>vf;2B>cn"
      ]
    },
-    "curve_const_vscan": {
+    "curve_ca": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "1X0B;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -468,15 +584,14 @@
      "type": "RIS",
      "parameter": {
        "va": "RT_VOLT_SET",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "X04;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -484,15 +599,14 @@
    "curve_vt": {
      "type": "RIS",
      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE",
-        "va": "MEASURE_VIN_RANGE"
+        "va": "VT_MEASURE_VIN_RANGE"
      },
      "data": [
        "X05;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe;",
        "1B>va"
@@ -26,11 +26,43 @@
        "expression": "VALUE"
      }
    },
-    "CHANNEL": {
-      "derzteription": "record channels",
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
    },
    "SAMPLE_RATE": {
      "description": "data sampling rate",
@@ -44,6 +76,12 @@
      },
      "on_change": "set_sample_rate"
    },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
    "AMP_GAIN": {
      "description": "amp gain",
      "record_meta": true,
@@ -59,6 +97,7 @@
        "Chronoamperometric",
        "V-T Graph",
        "R-T Graph",
+        "EIS constant frequency",
        "Dev Mode"
      ]
    },
@@ -75,6 +114,19 @@
      ],
      "on_change": "set_general_hs_rtia"
    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_rtia"
+    },
    "EIS_DC_BIAS": {
      "description": "DC voltage bias",
      "record_meta": true,
@@ -147,57 +199,76 @@
        8
      ]
    },
-
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
      "record_meta": true,
-      "initial": 10000,
+      "initial": 25000,
      "domain": [
-        100001
+        "VOLT_MAX"
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
      "record_meta": true,
-      "initial": 1,
-      "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
-    },
-    "ADC_LEVEL_I_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "3",
-        "auto"
-      ],
-      "on_change": "set_adc_gain_I"
-    },
-    "ADC_LEVEL_V_IN_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 3,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "auto"
+      "initial": 25,
+      "domain": [
+        2048
      ]
    },
-    "VOLT_INITIAL": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
+      "description": "Point spacing pattern",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
+    },
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        101
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
+      "record_meta": true,
+      "initial": 8,
+      "value": [
+        2,
+        4,
+        6,
+        8
+      ]
+    },
+    "CV_E_INITIAL": {
      "description": "Initial Voltage of Scan",
      "record_meta": true,
      "initial": 25000,
@@ -208,8 +279,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -219,8 +290,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -230,19 +301,19 @@
        "expression": "VALUE"
      }
    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
      "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
      "domain": [
-        65536
+        100001
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
+    "CA_VOLT": {
+      "description": "Voltage of ca",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -252,7 +323,7 @@
        "expression": "VALUE"
      }
    },
-    "MEASURE_VIN_RANGE": {
+    "VT_MEASURE_VIN_RANGE": {
      "description": "measure range of Vin",
      "record_meta": true,
      "initial": 0,
@@ -275,6 +346,10 @@
      },
      "on_change": "set_para_RT_VOLT_SET"
    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
    "BLE_WRITE": {
      "description": "send msg to elite",
      "domain": {
@@ -306,10 +381,11 @@
        "expression": "MODE",
        "when": {
          "0": "set_general_hs_rtia",
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I",
-          "3": "set_adc_gain_I",
-          "4": "set_adc_gain_I"
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
        }
      },
      {
@@ -317,22 +393,25 @@
        "when": {
          "0": "curve_eis",
          "1": "curve_cv3",
-          "2": "curve_const_vscan",
+          "2": "curve_ca",
          "3": "curve_vt",
-          "4": "curve_rt"
+          "4": "curve_rt",
+          "5": "curve_cf"
        }
      },
      {
        "expression": "MODE",
        "when": {
          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
        }
      },
      {
        "expression": "MODE",
        "when": {
-          "0": "curve_eis_mode"
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
        }
      },
      "_sync(True)",
@@ -358,6 +437,12 @@
        "1XFF;1X70;1B>GENERAL_HS_RTIA"
      ]
    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
    "set_sample_rate": {
      "type": "RIS",
      "parameter": {
@@ -367,16 +452,10 @@
        "XE0;2B>va"
      ]
    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
    "set_ctrl_highZ": {
      "type": "RIS",
      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
+        "1XFF;1X72;1B>CTRL_HIGH_Z_15"
      ]
    },
    "curve_eis": {
@@ -419,13 +498,51 @@
        "1X12;1XFF"
      ]
    },
+    "curve_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
+      ]
+    },
    "curve_cv3": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -436,10 +553,10 @@
    "curve_cv3_para2": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -447,19 +564,18 @@
        "1X09;1X02;4B>ve;2B>vf;2B>cn"
      ]
    },
-    "curve_const_vscan": {
+    "curve_ca": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "1X0B;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -468,15 +584,14 @@
      "type": "RIS",
      "parameter": {
        "va": "RT_VOLT_SET",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "X04;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -484,15 +599,14 @@
    "curve_vt": {
      "type": "RIS",
      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE",
-        "va": "MEASURE_VIN_RANGE"
+        "va": "VT_MEASURE_VIN_RANGE"
      },
      "data": [
        "X05;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe;",
        "1B>va"
@@ -26,11 +26,43 @@
        "expression": "VALUE"
      }
    },
-    "CHANNEL": {
-      "derzteription": "record channels",
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
    },
    "SAMPLE_RATE": {
      "description": "data sampling rate",
@@ -44,6 +76,12 @@
      },
      "on_change": "set_sample_rate"
    },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
    "AMP_GAIN": {
      "description": "amp gain",
      "record_meta": true,
@@ -59,6 +97,7 @@
        "Chronoamperometric",
        "V-T Graph",
        "R-T Graph",
+        "EIS constant frequency",
        "Dev Mode"
      ]
    },
@@ -75,6 +114,19 @@
      ],
      "on_change": "set_general_hs_rtia"
    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_rtia"
+    },
    "EIS_DC_BIAS": {
      "description": "DC voltage bias",
      "record_meta": true,
@@ -147,57 +199,76 @@
        8
      ]
    },
-
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
      "record_meta": true,
-      "initial": 10000,
+      "initial": 25000,
      "domain": [
-        100001
+        "VOLT_MAX"
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
      "record_meta": true,
-      "initial": 1,
-      "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
-    },
-    "ADC_LEVEL_I_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "3",
-        "auto"
-      ],
-      "on_change": "set_adc_gain_I"
-    },
-    "ADC_LEVEL_V_IN_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 3,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "auto"
+      "initial": 25,
+      "domain": [
+        2048
      ]
    },
-    "VOLT_INITIAL": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
+      "description": "Point spacing pattern",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
+    },
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        101
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
+      "record_meta": true,
+      "initial": 8,
+      "value": [
+        2,
+        4,
+        6,
+        8
+      ]
+    },
+    "CV_E_INITIAL": {
      "description": "Initial Voltage of Scan",
      "record_meta": true,
      "initial": 25000,
@@ -208,8 +279,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -219,8 +290,8 @@
        "expression": "VALUE"
      }
    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -230,19 +301,19 @@
        "expression": "VALUE"
      }
    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
      "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
      "domain": [
-        65536
+        100001
      ],
      "value": {
        "expression": "VALUE"
      }
    },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
+    "CA_VOLT": {
+      "description": "Voltage of ca",
      "record_meta": true,
      "initial": 25000,
      "domain": [
@@ -252,7 +323,7 @@
        "expression": "VALUE"
      }
    },
-    "MEASURE_VIN_RANGE": {
+    "VT_MEASURE_VIN_RANGE": {
      "description": "measure range of Vin",
      "record_meta": true,
      "initial": 0,
@@ -275,6 +346,10 @@
      },
      "on_change": "set_para_RT_VOLT_SET"
    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
    "BLE_WRITE": {
      "description": "send msg to elite",
      "domain": {
@@ -306,10 +381,11 @@
        "expression": "MODE",
        "when": {
          "0": "set_general_hs_rtia",
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I",
-          "3": "set_adc_gain_I",
-          "4": "set_adc_gain_I"
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
        }
      },
      {
@@ -317,22 +393,25 @@
        "when": {
          "0": "curve_eis",
          "1": "curve_cv3",
-          "2": "curve_const_vscan",
+          "2": "curve_ca",
          "3": "curve_vt",
-          "4": "curve_rt"
+          "4": "curve_rt",
+          "5": "curve_cf"
        }
      },
      {
        "expression": "MODE",
        "when": {
          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
        }
      },
      {
        "expression": "MODE",
        "when": {
-          "0": "curve_eis_mode"
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
        }
      },
      "_sync(True)",
@@ -358,6 +437,12 @@
        "1XFF;1X70;1B>GENERAL_HS_RTIA"
      ]
    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
    "set_sample_rate": {
      "type": "RIS",
      "parameter": {
@@ -367,16 +452,10 @@
        "XE0;2B>va"
      ]
    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
    "set_ctrl_highZ": {
      "type": "RIS",
      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
+        "1XFF;1X72;1B>CTRL_HIGH_Z_15"
      ]
    },
    "curve_eis": {
@@ -419,13 +498,51 @@
        "1X12;1XFF"
      ]
    },
+    "curve_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
+      ]
+    },
    "curve_cv3": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -436,10 +553,10 @@
    "curve_cv3_para2": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
        "vf": "SAMPLE_RATE",
        "cn": "CYCLE_NUMBER"
      },
@@ -447,19 +564,18 @@
        "1X09;1X02;4B>ve;2B>vf;2B>cn"
      ]
    },
-    "curve_const_vscan": {
+    "curve_ca": {
      "type": "RIS",
      "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "1X0B;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -468,15 +584,14 @@
      "type": "RIS",
      "parameter": {
        "va": "RT_VOLT_SET",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE"
      },
      "data": [
        "X04;",
        "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe"
      ]
@@ -484,15 +599,14 @@
    "curve_vt": {
      "type": "RIS",
      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "pa": "GENERAL_LP_RTIA",
        "pd": "CTRL_HIGH_Z_15",
        "pe": "SAMPLE_RATE",
-        "va": "MEASURE_VIN_RANGE"
+        "va": "VT_MEASURE_VIN_RANGE"
      },
      "data": [
        "X05;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
        "4b>0;4b>pd;",
        "2B>pe;",
        "1B>va"
Author	SHA1	Message	Date
Roy	c540013d19	[update] new cf mode	2022-11-16 11:51:15 +08:00
Roy	7f0b00a323	[update] update highz instruction	2022-11-15 17:28:51 +08:00
Roy	4828c85668	[update] clean up eis parameter	2022-11-15 16:08:43 +08:00
Roy	4ce9fe5b8d	[update] remove ADC_LEVEL_V_IN_15 parameter	2022-11-15 16:08:09 +08:00
Roy	d74f09254e	[update] update high z status	2022-11-15 16:07:58 +08:00
Roy	79ecff69cc	[update] update VT_MEASURE_VIN_RANGE parameter	2022-11-15 16:03:06 +08:00
Roy	df45126ead	[update] update CA_VOLT parameter	2022-11-15 16:00:53 +08:00
Roy	9fade3469a	[update] update CV_SCAN_RATE parameter	2022-11-15 15:51:42 +08:00
Roy	a77331176c	[update] update CV_E2 parameter	2022-11-15 15:47:49 +08:00
Roy	8f98337267	[update] update CV_E1 parameter	2022-11-15 15:44:42 +08:00
Roy	205d39cb11	[update] update CV_E_INITIAL parameter	2022-11-15 15:41:38 +08:00
Roy	a5ea3243fa	[update] new lprtia function	2022-11-15 15:39:31 +08:00