Revert "Merge remote-tracking branch 'origin/dev/fix_no_data' into release/v1.6.7/scheduler_debug"

This reverts commit 4243a13536, reversing
changes made to 97188abff8.

python/biopro/device/device_cc2650.py

@@ -662,7 +662,7 @@ class CC2650Device(Device):
         elif device_type == 'EISZeroOne':
             i = 0
             request_times = 0
-            while i < 13:
+            while i < 7:
                 try:
                     # send
                     code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)

python/biopro/devlib/data.py

@@ -1,7 +1,6 @@
 import abc
 import struct
 import math
-import numpy
 from typing import Optional, TypeVar, Generic, Tuple, Dict, List, AnyStr
 from datetime import datetime
 
@@ -1381,27 +1380,12 @@ class EISZeroOneDataDecoder(RecDataDecoder):
     def _decode_cali_coeff(cali_coeff: bytes) -> Optional[List[Tuple[int, int]]]:
         if cali_coeff != b'':
             cali_table = []
+            phase_para_a = []
+            phase_para_b = []
             hsrtia_a = []
             hsrtia_b = []
             hsrtia_c = []
             hsrtia_d = []
-            phase_coeff = []
-            phase_offset = []
-            
-            # phase_coeff = [[0]*4 for i in range(4)]
-            # phase_offset = [[0]*4 for i in range(4)]
-
-            phase_coeff = numpy.zeros([4, 4], dtype = int)
-            phase_offset = numpy.zeros([4, 4], dtype = int)  
-
-            ########################################
-            # phase_coeff
-            # [[gain0, g1, g2, g3] ----->最高頻
-            #  [gain0, g1, g2, g3] ----->中頻
-            #  [gain0, g1, g2, g3] ----->低頻
-            #  [gain0, g1, g2, g3] ----->最低頻
-            # ]
-            #######################################
 
             # print('cali_coeff', cali_coeff)
             cutoff_freq = struct.unpack('>I', cali_coeff[1:5])[0] * 100     #4
@@ -1412,19 +1396,15 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             # hsrtia_160k = struct.unpack('>I', cali_coeff[8:12])[0]         #4
 
             index = 20
-            g = 0
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
+            for i in range(index, index+16, 8):
+                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
+                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0])
+
             index = 40
-            g = 0
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
+            for i in range(index, index+16, 8):
+                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
+                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0]) 
+
             #Lv[0] 160k
             index = 60
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
@@ -1449,58 +1429,18 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             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)
 
-            index = 140
-            g = 1
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 160
-            g = 1
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 180
-            g = 2
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 200
-            g = 2
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 220
-            g = 3
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 240
-            g = 3
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            # hsrtia_a.append(struct.unpack('>I', cali_coeff[index+1:index+5])[0])
+            # hsrtia_b.append(struct.unpack('>I', cali_coeff[index+5:index+9])[0]/1e6)
+            # hsrtia_c.append(struct.unpack('>I', cali_coeff[index+9:index+13])[0]/1e5)
 
             # print('cutoff_freq', cutoff_freq)
             # print('hsrtia_a', hsrtia_a)
             # print('hsrtia_b', hsrtia_b)
             # print('hsrtia_c', hsrtia_c)
-            # print('phase_coeff')
-            # print(phase_coeff)
-            # print('phase_offset')
-            # print(phase_offset)
+            # print('phase_para_a', phase_para_a)
+            # print('phase_para_b', phase_para_b)
 
-            cali_table.append((cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
+            cali_table.append((cutoff_freq, phase_para_a, phase_para_b, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
 
             return cali_table
         else:
@@ -1550,12 +1490,13 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                 return None
             else:
                 if self.cali_coeff is not None and self._mode == 0:
+                    phase_para_a = []
+                    phase_para_b = []
                     hsrtia_a = []
                     hsrtia_b = []
                     hsrtia_c = []
                     hsrtia_d = []
-                    cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
-
+                    cutoff_freq, phase_para_a, phase_para_b, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
                     voltage_amp = round(self._ac_amp * 800 / 2047) # use UI value
                     if (self._freq_start > self._freq_stop):
                         self._freq_direction = 0
@@ -1566,7 +1507,6 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     img = ch1
                     real = ch2
                     freq = ch3
-                    fre_idx = 0
 
                     voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
 
@@ -1589,13 +1529,13 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     raw_phase = math.atan2(img , real) * 180 / math.pi
 
                     if (freq >= 1000000): # 10000 Hz
-                        fre_idx = 0
+                        i = 0
                     elif (freq >= 10000): # 100 Hz
-                        fre_idx = 1
+                        i = 1
                     elif (freq >= 1000): # 10 Hz
-                        fre_idx = 2
+                        i = 2
                     elif (freq >= 1): # 0.01 Hz
-                        fre_idx = 3
+                        i = 3
                     
                     ideal_raw_phase = phase_coeff[gain][fre_idx] /1e10 * freq + phase_offset[gain][fre_idx] / 1e6
                     phase = raw_phase - ideal_raw_phase

python/biopro/impl/ext_mem.py

@@ -35,7 +35,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                  '_pin_ram_sel_value', '_pin_mem_sel_value', '_pin_mem_req_value',
                  '_read_green_times','_read_red_times',
                  '_elite_data_len', '_mem_header_len', '_mem_tailer_len', '_single_data_len',
-                 '_head_wrong_cnt', '_pin_busy_value')
+                 '_head_wrong_cnt')
 
     def __init__(self,
                  select: Selector,
@@ -50,11 +50,11 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
 
         # buffer
-        self._tx_buffer_header = [0] * 64
+        self._tx_buffer_header = [0] * 19
         self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
 
         # memory control pin
-        self.pin_busy: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_BZY)
+        self.pin_busy = OutputPin.get_used(P3Pin.MEM_BZY, True)
         self.pin_mem_req = OutputPin.get_used(P3Pin.MEM_REQ, False)
         self.pin_mem_sel = OutputPin.get_used(P3Pin.MEM_RST, True) # MEM_RST -> actually which memory board is assign
         self.pin_ram_sel: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_SEL) # MEM_SEL -> actually is RAM_SEL, which RAM is assign
@@ -62,7 +62,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._pin_ram_sel_value = [bool(self.pin_ram_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_sel_value = [bool(self.pin_mem_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_req_value = [bool(self.pin_mem_req) for _ in range(Selector.SIZE)]
-        self._pin_busy_value = [bool(self.pin_busy) for _ in range(Selector.SIZE)]
 
         self._read_green_times = 0
         self._read_red_times = 0
@@ -99,14 +98,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             self._pin_ram_sel_value[channel] = True
         return self._pin_ram_sel_value[channel]
 
-    def get_pin_busy(self):
-        channel = self.select
-        if self.pin_busy.input() == 0:
-            self._pin_busy_value[channel] = False
-        else:
-            self._pin_busy_value[channel] = True
-        return self._pin_busy_value[channel]
-
     @property
     def select(self) -> int:
         return self._selector.channel
@@ -225,9 +216,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         return
 
     def recv_memory(self, device: int) -> Optional[bytes]:
-        # self.pin_busy.output(False)
-
-        print('mem_req==ram_sel,[', self._pin_mem_req_value[device], ',', self._pin_ram_sel_value[device], ']')
+        self.pin_busy.output(False)
 
         rx = []
 
@@ -311,9 +300,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 print("green data print:", data, device, datetime.now())
                 return None
 
-            # print('data=', list(data))
-            print('Ram:', data[62])
-
             if (length >= 4000):
                 flag_print = True
                 print("green data: big length:", length)
@@ -429,9 +415,9 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         except BaseException as e:
             print(e)
 
-        # finally:
-        #     # print("\n")
-        #     self.pin_busy.output(True)
+        finally:
+            # print("\n")
+            self.pin_busy.output(True)
 
         return bytes(rx)
 

python/biopro/server/data.py

@@ -646,7 +646,6 @@ class DataServer(SocketServer, DataAPI):
     def whether_to_record(self, device):
         # if user click "start", return True; if user click "stop", return False;
         if device in self._configurations.keys() and self._configurations[device] is not None:
-            # print(self._configurations.keys(), ',', device, datetime.now())
             return True
         else:
             return False
@@ -655,9 +654,6 @@ class DataServer(SocketServer, DataAPI):
         ret = False
         sync = self.get_spi_obj()
 
-        busy = sync.get_pin_busy()
-        print('pin_busy=', busy, device, datetime.now())
-
         if sync.get_pin_mem_req() == sync.get_pin_ram_sel():
             spi_data = sync.recv_memory(device)
             signal = sync.get_pin_mem_req()
@@ -666,7 +662,6 @@ class DataServer(SocketServer, DataAPI):
 
         else:
             data = None
-            print('data=None, mem_req!=ram_sel, [', sync.get_pin_mem_req(), ', ', sync.get_pin_ram_sel(), ']', device, datetime.now())
 
         if data is not None:
             if self._configurations.get(device, None) != None:

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

@@ -71,7 +71,7 @@
       "description": "DPV current recording period start",
       "record_meta": true,
       "initial": [
-        13333333,
+        13422819,
         7
       ],
       "domain": {