Merge remote-tracking branch 'origin/dev/RT_mode' into EIS_10test

python/biopro/devlib/data.py

@@ -1429,25 +1429,25 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             index = 60
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[1] 20k
             index = 80
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[2] 5k
             index = 100
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[3] 200R
             index = 120
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             index = 140
             g = 1
@@ -1568,12 +1568,17 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     freq = ch3
                     fre_idx = 0
 
-                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
+                    rolloff_cali = cutoff_freq/1e5
+                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 /  rolloff_cali ** 2 / 1e4)
 
                     # if (gain == 3):
                     #     current = hsrtia_a[gain] * math.exp(hsrtia_b[gain] * voltage_mag) + hsrtia_c[gain] * math.exp(hsrtia_d[gain] * voltage_mag)
                     # else:
-                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain]
+                    # current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+
                     # print(current)
                     # print(voltage_mag)
                     # print(hsrtia_a[gain])

python/res/devlib/json/Elite_EIS_1.1.devlib.json

@@ -290,7 +290,7 @@
         "auto"
       ]
     },
-    "DAC_VOLT": {
+    "RT_VOLT_SET": {
       "description": "DAC output Voltage",
       "record_meta": true,
       "initial": 37500,
@@ -299,7 +299,8 @@
       ],
       "value": {
         "expression": "VALUE"
-      }
+      },
+      "on_change": "set_para_RT_VOLT_SET"
     },
     "BLE_WRITE": {
       "description": "send msg to elite",
@@ -353,7 +354,7 @@
           "1": "curve_cv3",
           "2": "curve_const_vscan",
           "3": "curve_vt",
-          "4": "curve_zt"
+          "4": "curve_rt"
         }
       },
       {
@@ -486,10 +487,10 @@
         "2B>pe"
       ]
     },
-    "curve_zt": {
+    "curve_rt": {
       "type": "RIS",
       "parameter": {
-        "va": "DAC_VOLT",
+        "va": "RT_VOLT_SET",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pd": "CTRL_HIGH_Z_15",
@@ -520,6 +521,12 @@
         "1B>va"
       ]
     },
+    "set_para_RT_VOLT_SET": {
+      "type": "RIS",
+      "data": [
+        "XE2;X01;2B>RT_VOLT_SET"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"