[remove] pyc file untracked

.gitignore

@@ -1,7 +1,5 @@
 .DS_Store
 *.cpython-37.opt-2.pyc
-*.cpython-39-arm-linux-gnueabihf.so
-*.
 *.pyc
 */__pycache__
 /.vscode

README.md

@@ -4,7 +4,7 @@ New goal on pi4 without kotlin and django, and with only one dataserver.
 # Installation
 ### Get Raspbrain into SD card
 
-###### Download Raspbian Bullseye Lite
+###### Download Raspbian Buster Lite
 
 >https://www.raspberrypi.org/downloads/raspberry-pi-os/
 
@@ -14,7 +14,7 @@ New goal on pi4 without kotlin and django, and with only one dataserver.
 lsblk
 
 # copy data to sd card
-sudo dd bs=4M if=yyyy-mm-dd-raspios-bullseye-armhf-lite.img of=/dev/sdX conv=fsync status=progress
+sudo dd bs=4M if=yyyy-mm-dd-raspbian-buster.img of=/dev/sdX conv=fsync status=progress
 
 # enable ssh on first boot
 add ssh.txt in boot folder
@@ -77,22 +77,18 @@ add ssh.txt in boot folder
 
 
 ###### Install dependencies
-    sudo apt-get install vim git wiringpi build-essential libi2c-dev i2c-tools python-dev libffi-dev python3-pip postgresql npm
-
-###### wiringpi conflict
-need to install wiringpi:  https://github.com/WiringPi/WiringPi
-install instructions:  https://github.com/WiringPi/WiringPi/blob/master/INSTALL
+    sudo apt-get install vim git wiringpi build-essential libi2c-dev i2c-tools python-dev libffi-dev python3-pip postgresql
 
 ### Setup project
-###### Clone data server project
+###### Clone project
 ```
 cd ~
-git clone https://gitlab.com/wisetop/controller/wisetopdataserver.git
+git clone https://gitlab.com/bioproscientific/bioprorelife.git
 ```
 
 ###### Install python dependencies
 ```
- cd ~/wisetopdataserver
+cd ~/bioprorelife
 pip3 install -r requirements.txt
 ```
 ##### Packages version
@@ -116,14 +112,14 @@ psycopg2                      2.8.5
 
 ###### Build C extension
 ```
-cd ~/wisetopdataserver/python/biopro/ext/
+cd ~/bioprorelife/python/biopro/ext/
 rm -rf *.so build
 python3 setup.py build_ext --inplace
 ```
 
 ###### Check setup-uart file
 ```
-cd ~/wisetopdataserver/
+cd ~/bioprorelife
 sudo vim ./run-setup-uart.sh
 ```
 ##### Modify the code as following
@@ -153,72 +149,44 @@ sudo raspi-config
 reboot
 ```
 
-###### Set pi password
-```
-$cd ~
-$passwd
-Current password:raspberry
-New password:5k6zj454778225
-Retype new password:5k6zj454778225
-```
-
 ###### Auto run program when device start
 ```
 sudo vim /etc/rc.local
 ```
-###### add the code following as:
+add the code following as:
 ```
-sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.data_server.out &
-#sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.wisetop_data_$now.out &
+sudo -H -u pi nohup /home/pi/bioprorelife/run-data-server.sh > /home/pi/.data_server.out &
 ```
-##### /etc/rc.local
-```
-_IP=$(hostname -I) || true
-if [ "$_IP" ]; then
-  printf "My IP address is %s\n" "$_IP"
-fi
 
-now=$(date +'%F_%T')
-
-sudo nohup systemctl restart apache2
-sudo nohup systemctl restart mosquitto
-
-nohup node /home/pi/wisetopapiserver/dist/app.js > /home/pi/.api_server.out &
-
-sleep 5
-
-sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.data_server.out &
-#sudo -H -u pi nohup /home/pi/wisetopdataserver/run-data-server.sh > /home/pi/.wisetop_data_$now.out &
-
-exit 0
-```
 ### MQTT broker install
 
-###### 1.Install mosquitto
-$sudo apt-get install mosquitto mosquitto-clients
-
-
-###### 2.Enable Remote Access
-$sudo vim /etc/mosquitto/conf.d/default.conf
+1. Install mosquitto
+```
+sudo apt-get install mosquitto mosquitto-clients
+```
 
+2. Enable Remote Access
+```
+sudo vim /etc/mosquitto/conf.d/default.conf
+```
 add the code following as:
 ```
 listener 1883
 protocol mqtt
 listener 8083
 protocol websockets
-allow_anonymous true
 ```
-###### 3.restart mqtt broker
-$sudo systemctl restart mosquitto
+restart mqtt broker
+```
+sudo systemctl restart mosquitto
+```
 
-###### 4.Robust MQTT
+3. Robust MQTT
 create mosquitto_restart.sh
-
-$cd ~
-$sudo vim mosquitto_restart.sh
-
-
+```
+cd ~
+sudo vim mosquitto_restart.sh
+```
 add the code following as:
 ```
 if [ "`ps -aux | grep /usr/sbin/mosquitto | wc -l`" == "1" ]
@@ -232,129 +200,25 @@ fi
 echo "$SERVICE is currently running" >> /home/ubuntu/cron.log
 exit 0
 ```
-###### 5.add mosquitto_restart.sh to root routing
-$sudo chmod +x mosquitto_restart.sh
-$sudo  -i
-$crontab -e
-
+add mosquitto_restart.sh to root routing
+```
+sudo chmod +x mosquitto_restart.sh
+sudo  -i
+crontab -e
+```
 add the code following as:
 ```
 */5 * * * * /home/pi/mosquitto_restart.sh
 ```
-###### 6.Auto run MQTT broker when when pi-start
-$sudo vim /etc/rc.local
-
+3. Auto run MQTT broker when when pi-start
+```
+sudo vim /etc/rc.local
+```
 add the code following as:
 ```
 sudo nohup systemctl restart mosquitto
 ```
 
-### Setting up a Routed Wireless Access Point
-###### 1.Install AP and Management Software
-$sudo apt install hostapd
-$sudo systemctl unmask hostapd
-$sudo systemctl enable hostapd
-$sudo apt install dnsmasq
-$sudo DEBIAN_FRONTEND=noninteractive apt install -y netfilter-persistent iptables-persistent
-
-###### 2.Set up the Network Router
-$sudo nano /etc/dhcpcd.conf
-```
-interface wlan0
-    static ip_address=192.168.2.1/24
-    nohook wpa_supplicant
-```
-$sudo nano /etc/sysctl.d/routed-ap.conf
-```
-# Enable IPv4 routing
-net.ipv4.ip_forward=1
-```
-
-$sudo iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-$sudo netfilter-persistent save
-$sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-
-
-$sudo nano /etc/dnsmasq.conf
-
-```
-interface=wlan0 # Listening interface
-dhcp-range=192.168.2.2,192.168.2.255,255.255.255.0,24h
-                # Pool of IP addresses served via DHCP
-domain=wlan     # Local wireless DNS domain
-address=/gw.wlan/192.168.2.1
-                # Alias for this router
-```
-###### 3.Ensure Wireless Operation
-$sudo rfkill unblock wlan
-
-###### 4.Configure the AP Software
-$sudo nano /etc/hostapd/hostapd.conf
-
-```
-country_code=TW
-interface=wlan0
-ssid=WTP_NONE
-hw_mode=g
-channel=7
-macaddr_acl=0
-auth_algs=1
-ignore_broadcast_ssid=0
-wpa=2
-wpa_passphrase=00000000
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP
-rsn_pairwise=CCMP
-
-# 802.11n support
-ieee80211n=1
-# make raspberry pi dongle fast
-wme_enabled=1
-# ht_capab: HT capabilities, enable 40MHz
-ht_capab=[HT40+][SHORT-GI-40]
-```
-###### 5.Running the new Wireless AP
-$sudo systemctl reboot
-
-
-### Set web site
-$sudo vim ./sites-available/000-default.conf
-```
-<VirtualHost *:8080> #80------>8080
-        # The ServerName directive sets the request scheme, hostname and port that
-        # the server uses to identify itself. This is used when creating
-        # redirection URLs. In the context of virtual hosts, the ServerName
-        # specifies what hostname must appear in the request's Host: header to
-        # match this virtual host. For the default virtual host (this file) this
-        # value is not decisive as it is used as a last resort host regardless.
-        # However, you must set it for any further virtual host explicitly.
-        #ServerName www.example.com
-
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/html
-
-        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-        # error, crit, alert, emerg.
-        # It is also possible to configure the loglevel for particular
-        # modules, e.g.
-        #LogLevel info ssl:warn
-
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-        # For most configuration files from conf-available/, which are
-        # enabled or disabled at a global level, it is possible to
-        # include a line for only one particular virtual host. For example the
-        # following line enables the CGI configuration for this host only
-        # after it has been globally disabled with "a2disconf".
-        #Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerAdmin bioprovue@localhost
-    DocumentRoot /var/www/bioprovuebuild
-</VirtualHost>
-```
-
+### Setup routed wireless access point
 ##### raspberry website document:
 > https://www.raspberrypi.org/documentation/configuration/wireless/access-point-routed.md

python/biopro/api/controller.py

@@ -18,10 +18,9 @@ class ControllerAPI():
     @staticmethod
     def getByMac(mac_address):
         try:
-            if mac_address != None:
-                ret = requests.get(API_URL + 'api/controller/get_by_mac/' + mac_address, headers= AuthAPI.get_key())
-                if ret.status_code == 200:
-                    return ret.json()
+            ret = requests.get(API_URL + 'api/controller/get_by_mac/' + mac_address, headers= AuthAPI.get_key())
+            if ret.status_code == 200:
+                return ret.json()
         except (requests.exceptions.ConnectionError, json.decoder.JSONDecodeError) as e:
             print('get controller fail', e)
         return []

python/biopro/controller.py

@@ -1576,18 +1576,7 @@ class ControlAPI(metaclass=Router):
         should handle this exit code and re-run server process.
         """
         raise NotImplementedError()
-    
-    def run_project(self, project) -> bool:
-        raise NotImplementedError()
 
-    def get_running_project(self) -> bool:
-        raise NotImplementedError()
-    
-    def stop_project(self, project) -> bool:
-        raise NotImplementedError()
-    
-    def show_device_data(self, device) -> bool:
-        raise NotImplementedError()
 
 # noinspection PyAbstractClass
 class ControlClient(SocketClient, ControlAPI, metaclass=SocketClientMacro(ControlAPI)):

python/biopro/data.py

@@ -130,14 +130,6 @@ class DataAPI(metaclass=abc.ABCMeta):
     def hardware_test(self) -> JSON_OBJECT:
         """"""
         pass
-    
-    @abc.abstractmethod
-    def show_data(self, device: Union[int, Device]):
-        """show device data
-
-        :param device: device ID
-        """
-        pass
 
 
 # noinspection PyAbstractClass
@@ -199,9 +191,6 @@ class DataClient(SocketClient, DataAPI, metaclass=SocketClientMacro(DataAPI)):
 
     def stop_sync(self, *device: Union[int, Device]):
         self.send_command('stop_sync', *self._to_device_id(*device))
-    
-    def show_data(self, device: int):
-        self.send_command('show_data', device)
 
     @staticmethod
     def _to_device_id(*device: Union[int, Device]) -> Tuple[int, ...]:

python/biopro/device/device_cc2650.py

@@ -536,7 +536,7 @@ class CC2650Device(Device):
             self._master.log_warn('device', self.device_id, 'update_battery_info no response')
 
         else:
-            if data is not None and len(data) > 2 :
+            if data is not None and len(data) == 4 :
                 battery = struct.unpack('<H', data[1:3])[0]
                 if battery is not None:
                     self._battery = battery
@@ -2035,7 +2035,6 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         # print("local_name = ", local_name)
 
         # addr type is don't care in BMD380
-        print('scan_response:', list(scan_response))
         local_addr_type = int(scan_response[index:index + 1][0])
         # local_addr_type = 0xFF
         index = index + 1

python/biopro/device/manager.py

@@ -253,7 +253,6 @@ class DeviceInternalCommandHandler:
         return True
 
 
-# why inherit MasterDevice ?
 class DeviceManager(MasterDevice, Synchronized):
     """device manager. It manager the device libraries, found device, connected device
     and the control of the master device.
@@ -268,6 +267,7 @@ class DeviceManager(MasterDevice, Synchronized):
                  options: DeviceManagerOptions,
                  handler: Optional[DeviceInternalCommandHandler] = None):
         """
+
         :param options: manager options.
         :param handler: device internal command handler
         """
@@ -277,7 +277,6 @@ class DeviceManager(MasterDevice, Synchronized):
         if handler is None:
             handler = DeviceInternalCommandHandler()
 
-        # control server api
         self._handler: DeviceInternalCommandHandler = handler
         self._options: DeviceManagerOptions = options
 
@@ -287,9 +286,7 @@ class DeviceManager(MasterDevice, Synchronized):
         # hardware
         self._interface = options.interface
         self._master: Optional[MasterDevice] = None
-        # memory board
         self._centralMaster: Optional[MasterDevice] = None
-        # connected device
         self._device: List[CompletedDevice] = []
 
         # demo device
@@ -339,10 +336,6 @@ class DeviceManager(MasterDevice, Synchronized):
     def library_path(self) -> List[Path]:
         return self._repository.library_path
 
-    def get_device_status(self, mac_address) -> Optional[DeviceLibrary]:
-        device = self.get_device(mac_address)
-        return device.status
-
     @logging_info
     def reload_library(self):
         """reload device library"""
@@ -581,7 +574,7 @@ class DeviceManager(MasterDevice, Synchronized):
 
         elif isinstance(device, str):
             for slave in self._device:
-                if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device.lower():
+                if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device:
                     return slave
 
         elif isinstance(device, DeviceInfo):
@@ -1030,9 +1023,15 @@ class DeviceManager(MasterDevice, Synchronized):
             raise RuntimeError(DEVICE_NOT_FOUND, device)
 
         if DeviceCommonInstruction(instruction) is not None:
+            # print('deviceCommonInstr')
+            # print(instruction)
             device.call_instruction(instruction)
+
         elif instruction in device.library.instruction_table:
+            # print('instruction')
+            # print(instruction)
             device.call_instruction(instruction)
+
         else:
             raise RuntimeError(INSTRUCTION_UNKNOWN, instruction)
 

python/biopro/devlib/data.py

@@ -853,7 +853,7 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
 
     __slots__ = ('_message', '_cycle_number', '_start_return_data', '_time_stamp',
                  '_total_time_stamp', '_mode', '_cycle_start_time',
-                 '_mode_stop', '_show_data')
+                 '_mode_stop')
 
     def __init__(self):
         super().__init__()
@@ -868,8 +868,6 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         self._mode = 0
         self._cycle_start_time = []
 
-        self._show_data = False
-
     @property
     def name(self) -> str:
         return self.NAME
@@ -883,20 +881,22 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
     def decode(self, data: bytes) -> Optional[RecordingData]:
         if len(data) < 18:
             return None
-        voltage = 0
-        mem_cnt = data[1]
-        time_stamp: float = struct.unpack('<I', data[4:8])[0]  # unit: ms 0x18030000
-        current = struct.unpack('<i', data[8:12])[0]  # unit: nA
-        voltage = struct.unpack('<i', data[12:16])[0]  # unit: uV
-        impedance = struct.unpack('<i', data[16:20])[0]  # unit: mOm
 
-        cycle_number = struct.unpack('<H', data[20:22])[0]
-        finish_mode_falg = data[22]
-        battery = struct.unpack('<i', data[23:27])[0]
-        elite_notify_times = data[27]
+        current = struct.unpack('>i', data[1:5])[0]  # unit: 1/1000 nA
+        voltage = struct.unpack('>i', data[5:9])[0]  # unit: mV
+        impedance = struct.unpack('>i', data[9:13])[0]  # unit: kOm
+        time_stamp: float = struct.unpack('<I', data[13:17])[0]  # unit: ms
+        cycle_number = struct.unpack('>H', data[17:19])[0]
+        finish_mode_falg = data[19]
 
-        mem_wrong_information = struct.unpack('<i', data[43:47])[0] # mem_wrong_information = green retry, green wrong, red retry, red wrong
-        ram_num = data[47]
+        mem_wrong_information = struct.unpack('>i', data[40:40+4])[0]
+
+        # print('decode', list(data[20:]))
+        mem_wrong = data[40]
+        mem_retry_cnt = data[41]
+        mem_green_wrong = data[42]
+        mem_green_retry_cnt = data[43]
+        ram_num = data[44]
         broken_flag = data[-1]
 
         if (finish_mode_falg & 0b11110000 == 0b10100000):
@@ -917,14 +917,10 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 print("error timeStamp full data:", list(data), datetime.now(), '\n')
                 return None
             else:
-                if self._show_data:
-                    print('|', time_stamp, '|', delta, '|', int(time_stamp * 1000 / 2),
-                        '|', current, '|', voltage, '|', impedance,
-                        '|', cycle_number, '|', finishMode, '@', str(self.device))
-
+                # print('|', time_stamp, '|', delta, '|', current, '|', voltage, '|', impedance,
+                #       '|', cycle_number, '|', finishMode, '@', str(self.device))
                 # print('|', '{:10}'.format(time_stamp),
-                #       '|', '{:4}'.format(delta),
-                #       '|', '{:10}'.format(int(time_stamp * 1000 / 2)),
+                #       '|', '{:10}'.format(delta),
                 #       '|', '{:10}'.format(current),
                 #       '|', '{:10}'.format(voltage),
                 #       '|', '{:10}'.format(impedance),
@@ -932,9 +928,13 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 #       '|', '{:1}'.format(finishMode),
                 #       '@', str(self.device), '|')
 
-                # print('|', '{:5}'.format(mem_wrong_information),
-                #       '|', '{:2}'.format(ram_num),
-                #       '|', '{:2}'.format(broken_flag),
+                # print('|', '{:5}'.format(mem_wrong),
+                #       '|', '{:5}'.format(mem_retry_cnt),
+                #       '|', '{:5}'.format(mem_green_wrong),
+                #       '|', '{:5}'.format(mem_green_retry_cnt),
+                #       '|', '{:5}'.format(mem_wrong_information),
+                #       '|', '{:5}'.format(ram_num),
+                #       '|', '{:5}'.format(broken_flag),
                 #       '@', str(self.device), '|')
                 pass
 
@@ -949,20 +949,16 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         ret.append_data(1, voltage)
         ret.append_data(2, impedance)
         ret.append_data(3, cycle_number)
-        # ret.append_data(4, battery)
-        # ret.append_data(5, elite_notify_times)
-        # ret.append_data(6, mem_cnt)
-
-        # # memoryboard information
-        # ret.append_data(7, ram_num)
-        # ret.append_data(8, broken_flag)
-        # try:
-        #     ret.append_data(9, mem_wrong_information)
-        #     # print('append_data success, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
-        # except:
-        #     print('append_data fail, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
-
 
+        # memoryboard information
+        # ret.append_data(4, mem_wrong)
+        # ret.append_data(5, mem_retry_cnt)
+        # ret.append_data(6, mem_green_wrong)
+        # ret.append_data(7, mem_green_retry_cnt)
+        ret.append_data(4, ram_num)
+        ret.append_data(5, broken_flag)
+        ret.append_data(6, mem_wrong_information)
+        # ret.append_data(4, ram_num)
     
         if cycle_number != self._cycle_number:
             # notify cycle_number change
@@ -1400,33 +1396,39 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             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_d.append(struct.unpack('>B', cali_coeff[index+13:index+14])[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_d.append(struct.unpack('>B', cali_coeff[index+13:index+14])[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_d.append(struct.unpack('>B', cali_coeff[index+13:index+14])[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_d.append(struct.unpack('>B', cali_coeff[index+13:index+14])[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)
+            # hsrtia_d.append(struct.unpack('>I', cali_coeff[index+13:index+17])[0]/1e6)
 
             # print('cutoff_freq', cutoff_freq)
             # print('hsrtia_a', hsrtia_a)
             # print('hsrtia_b', hsrtia_b)
             # print('hsrtia_c', hsrtia_c)
+            # print('hsrtia_d', hsrtia_d)
             # print('phase_para_a', phase_para_a)
             # print('phase_para_b', phase_para_b)
 
@@ -1454,12 +1456,12 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         if len(data) < 18:
             return None
 
-        ch1 = struct.unpack('>i', data[1+3:5+3])[0]  # unit: 1/1000 nA
-        ch2 = struct.unpack('>i', data[5+3:9+3])[0]  # unit: mV
-        ch3 = struct.unpack('>i', data[9+3:13+3])[0]  # unit: kOm
-        time_stamp: float = struct.unpack('<I', data[13+3:17+3])[0]  # unit: ms
-        cycle_number = struct.unpack('>H', data[17+3:19+3])[0]
-        d19 = data[19+3]
+        ch1 = struct.unpack('>i', data[1:5])[0]  # unit: 1/1000 nA
+        ch2 = struct.unpack('>i', data[5:9])[0]  # unit: mV
+        ch3 = struct.unpack('>i', data[9:13])[0]  # unit: kOm
+        time_stamp: float = struct.unpack('<I', data[13:17])[0]  # unit: ms
+        cycle_number = struct.unpack('>H', data[17:19])[0]
+        d19 = data[19]
         gain = (d19 & 0x0F)
         finishMode = (d19 & 0x80) >> 7        
         
@@ -1583,10 +1585,10 @@ class EISZeroOneDataDecoder(RecDataDecoder):
 
         ret = RecordingData(self.device, int(time_stamp * 1000 / 2), 0)
         if (self._mode == 0):                           #EIS Mode
+            ret.append_data(3, cycle_number)
             ret.append_data(0, ch1)                     #Raw Imag  
             ret.append_data(1, ch2)                     #Raw Real
             ret.append_data(2, ch3 * 10)                #Frequency [mHz]
-            ret.append_data(3, cycle_number)
             ret.append_data(4, round(imag_after_cal))   #Z_imag [Ohm]
             ret.append_data(5, round(real_after_cal))   #Z_real [Ohm]
             ret.append_data(6, round(impedance))        #Impedance [Ohm]
@@ -1595,10 +1597,10 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             ret.append_data(9, gain)                    #Gain Level
 
         else:                                           #CV Mode
+            ret.append_data(3, cycle_number)
             ret.append_data(0, ch1)                     #Iin     [nA]
             ret.append_data(1, ch2)                     #Vset    [nV]
             ret.append_data(2, ch3)                     #Vout    [nV]
-            ret.append_data(3, cycle_number)
 
         if cycle_number != self._cycle_number:
             # notify cycle_number change

python/biopro/devlib/device.py

@@ -651,9 +651,17 @@ class DeviceInstruction:
     VIS_DEVICE_DONE = 0x20
     """identify device done"""
 
+    VIS_CC_ZERO = 0x40
+
+    VIS_ASK = 0x30
+    """ask in virtual instruction"""
+
     VIS_STI = 0xC0
     """stimulation on virtual instruction"""
 
+    VIS_FUH = 0x90
+    """flush virtual instruction"""
+
     VIS_INT = 0x60
     """interrupt virtual instruction"""
 
@@ -724,6 +732,7 @@ class DeviceCommonInstruction:
     STOP_STIMULATE = "stop_stimulate"
     VIS_DEVICE_DETECT = 'VIS_DEVICE_DETECT'
     VIS_DEVICE_DONE = 'VIS_DEVICE_DONE'
+    VIS_CC_ZERO = 'VIS_CC_ZERO'
     CIS_VOLT = 'CIS_VOLT'
     CIS_VERSION = 'CIS_VERSION'
 
@@ -741,12 +750,16 @@ class DeviceCommonInstruction:
             return '_sync(False)', '_notify(False)', 'VIS_INT'
         elif instruction == cls.CLOSE:
             return '_sync(False)', '_notify(False)', 'VIS_INT'
+        elif instruction == cls.FLUSH:
+            return 'VIS_FUH',
         elif instruction == cls.CALL:
             return 'VIS_CAL',
         elif instruction == cls.VIS_DEVICE_DETECT:
             return 'VIS_DEVICE_DETECT',
         elif instruction == cls.VIS_DEVICE_DONE:
             return 'VIS_DEVICE_DONE',
+        elif instruction == cls.VIS_CC_ZERO:
+            return 'VIS_CC_ZERO',
         elif instruction == cls.RECORD:
             return 'VIS_STARTR',
         elif instruction == cls.RECORD_ALL:

python/biopro/devlib/domain.py

@@ -4,7 +4,6 @@ from biopro.util.text import part_suffix
 from . import *
 from .expression import *
 
-import json
 
 class DeviceParameterError(RuntimeError):
     __slots__ = ()
@@ -310,8 +309,6 @@ class ParameterValueDomain(ParameterDomain, metaclass=abc.ABCMeta):
                 return f
 
     def valid_para(self, value: Any) -> bool:
-        if isinstance(value, list):
-            return True
         f, t = self.range
         return f <= float(value) < t
 
@@ -492,12 +489,8 @@ class ParameterCollectionValueOperator(metaclass=abc.ABCMeta):
 
     @classmethod
     def parse(cls, expr: Union[int, str]) -> 'ParameterCollectionValueOperator':
-        # parse epression then create value_operator
         if isinstance(expr, int):
             return SingleValueOperator(None, expr)
-        
-        elif isinstance(expr, list):
-            return CollectValueOperator((0, len(expr)), expr)
 
         elif expr == '*':
             return AddAllValueOperator
@@ -505,10 +498,6 @@ class ParameterCollectionValueOperator(metaclass=abc.ABCMeta):
         elif expr == ':=':
             return CollectValueOperator((None, None), [])
 
-        elif '[' in expr and ']' in expr:
-            v = json.loads(expr)
-            return CollectValueOperator((0, len(v)), v)
-
         elif '=' in expr:
             a, v = part_suffix(expr, '=')
 
@@ -519,7 +508,6 @@ class ParameterCollectionValueOperator(metaclass=abc.ABCMeta):
                     return CollectValueOperator((None, None), v)
 
                 else:
-                    # get list length (old way)
                     a, b = part_suffix(a, ':')
                     a = int(a) if len(a) else None
                     b = int(b) if len(b) else None
@@ -614,8 +602,8 @@ class ParameterCollectionDomain(ParameterDomain, metaclass=abc.ABCMeta):
     def __init__(self, domain: ParameterDomain):
         super().__init__()
 
-        # if isinstance(domain, ParameterCollectionDomain):
-        #     raise RuntimeError('cannot compose with parameter collection domain')
+        if isinstance(domain, ParameterCollectionDomain):
+            raise RuntimeError('cannot compose with parameter collection domain')
 
         self._domain = domain
 
@@ -737,7 +725,6 @@ class ParameterListDomain(ParameterCollectionDomain):
         if oper == AddAllValueOperator:
             raise ValueError("list parameter cannot accept '*' (all) value")
 
-        # d: domain, sz: lsit length, i: slice(a, b), v: list value
         d = self.element_domain
         sz = len(target)
         i = oper.index(sz)

python/biopro/devlib/encoder.py

@@ -119,10 +119,7 @@ class DeviceConfigurationEncoder:
                 e.write(b'L\0')
 
             else:
-                parameter_type = cls._value_type(max(value))
-                for v in value:
-                    if isinstance(v, int) and v < 0:
-                        parameter_type = parameter_type.lower()
+                parameter_type = cls._value_type(value[0])
                 e.write(b'L')
                 e.write(parameter_type.encode())
                 e.u8(sz)
@@ -156,8 +153,7 @@ class DeviceConfigurationEncoder:
         if isinstance(value, bool):
             e.u8(1 if value else 0)
 
-        elif isinstance(value, str) or isinstance(value, list):
-            value = str(value)
+        elif isinstance(value, str):
             e.encode_string(value)
 
         elif isinstance(value, int):
@@ -174,7 +170,7 @@ class DeviceConfigurationEncoder:
         if isinstance(value, bool):
             return '?'
 
-        elif isinstance(value, str) or isinstance(value, list):
+        elif isinstance(value, str):
             return 'p'
 
         elif isinstance(value, int):

python/biopro/devlib/instruction.py

@@ -1268,15 +1268,14 @@ class InstructionTable(DictNode['Instruction']):
                          instruction: str):
         """call instruction. chain context with :class:`DeviceInternalInstructionScope`
 
-        :param master: DeviceManager
-        :param device: CompletedDevice
+        :param master: master device
+        :param device: device
         :param context: scope
         :param instruction: instruction name
         :raises InstructionNotFound: If instruction not found.
         """
 
         try:
-            # ex. start 
             ins = self[instruction]
 
         except KeyError as e:
@@ -1285,7 +1284,6 @@ class InstructionTable(DictNode['Instruction']):
         else:
             context = context.chain(InstructionTableScope(self))
 
-            # ex. _data_format, _sync, _notify
             for single in ins.eval_instruction(context):
                 if isinstance(single, InternalInstruction):
                     if not single.handle_internal_instruction(master, device, context):

python/biopro/devlib/library.py

@@ -510,10 +510,9 @@ class DeviceParameter(JsonSerialize):
         :param para: parameter name
         :param oper: operator expression
         """
-        # parse operator return CollectValueOperator instance
         if not isinstance(oper, ParameterCollectionValueOperator):
             oper = ParameterCollectionValueOperator.parse(oper)
-        
+
         table = self._library.parameter_table
         info = table[para]
         domain = info.domain
@@ -529,7 +528,6 @@ class DeviceParameter(JsonSerialize):
             old = list(target)
 
         try:
-            # replace target with new oper
             domain.oper_para(target, oper, self._context)
         except RuntimeError as e:
             raise IllegalParameterValueError(para, str(oper)) from e
@@ -968,7 +966,7 @@ class CompletedDevice(Device):
     """
     __slots__ = ('_master', '_device_id', '_device', '_library', '_context',
                  '_parameter', '_configuration', '_lock', '_feature_mask',
-                 '_cache_battery', '_cache_battery_timestamp', '_coeff', '_status')
+                 '_cache_battery', '_cache_battery_timestamp', '_coeff')
 
     def __init__(self, master: MasterDevice, library: DeviceLibrary, device_id: int, device: Device):
         """
@@ -978,15 +976,11 @@ class CompletedDevice(Device):
         :param device_id: device id
         :param device: slave device implementation
         """
-        # DeviceManager
         self._master = master
         self._device = device
         self._device_id = device_id
         self._library = library
 
-        # device status ( 0: idle, 1: working, 2: error, 3: power off)
-        self._status = 0
-
         # context
         s1 = library.constant
         s2 = DeviceScope(self)
@@ -1014,10 +1008,6 @@ class CompletedDevice(Device):
     def device_id(self) -> int:
         return self._device_id
 
-    @property
-    def memory_board(self) -> int:
-        return self._device_id
-
     @property
     def device_name(self) -> str:
         return self._device.device_name
@@ -1030,10 +1020,6 @@ class CompletedDevice(Device):
     def mac_address(self) -> ADDRESS:
         return self._device.mac_address
 
-    @property
-    def mac_address_in_str(self) -> str:
-        return ':'.join('{:02x}'.format(b) for b in self._device.mac_address)
-
     @property
     def device(self) -> Device:
         return self._device
@@ -1070,18 +1056,11 @@ class CompletedDevice(Device):
         return self._library
 
     # device lock
+
     @property
     def lock(self) -> DeviceLock:
         return self._lock
 
-    @property
-    def status(self) -> int:
-        return self._status
-    
-    @status.setter
-    def status(self, new_status):
-        self._status = new_status
-
     # device parameter getter/setter
 
     def parameters(self) -> List[str]:
@@ -1103,11 +1082,6 @@ class CompletedDevice(Device):
         :return: parameter V value
         """
         return self._configuration.get_parameter(name, False)
-    
-    def set_multi_parameters(self, parameter):
-        for (name, value) in parameter[0].items():
-            if name != 'target':
-                self.set_parameter(name, value)
 
     def set_parameter(self, name: str, value: Union[int, str]):
         """replace parameter value with *value*
@@ -1136,8 +1110,7 @@ class CompletedDevice(Device):
                 self._master.log_warn('on_change instruction not found : ' + on_change)
 
             else:
-                if self._status == 1:
-                    self.call_instruction(on_change)
+                self.call_instruction(on_change)
 
     # device instruction call
 
@@ -1280,20 +1253,14 @@ class CompletedDevice(Device):
 
     def as_json(self) -> JSON_OBJECT:
         return {
-            'id': self.device_id,
-            'name': self.device_name,
-            'status': self._status,
             'device_id':       self.device_id,
             'device_name':     self.device_name,
             'device_address':  list(self.mac_address),
-            'device_status': self._status,
-            'mac_address': self.mac_address_in_str,
-            'memory_board': self.memory_board,
-            'serial_number':   self.serial_number.as_json(),
-            'version':  self.device_version,
             'battery':         self.battery,
             'parent':          self.parent,
             'recording_file_name':      self.recording_file_name,
+            'device_version':  self.device_version,
+            'serial_number':   self.serial_number.as_json(),
             'library_name':    self._library.name,
             'library_version': str(self._library.version),
             'configuration':   self.configuration.as_json(list_hide=True),

python/biopro/impl/ext_mem.py

@@ -24,10 +24,8 @@ def zero_buffer(size: int) -> List[int]:
     return [0] * size
 
 class MultiExtMemSpiInterface(LowLevelHardwareInterface):
-    MEM_INS_MARKED1 = [MEM_INS_WRITE, 0, 2, 0x5A, 0xA5]
-    MEM_INS_MARKED2 = [MEM_INS_WRITE, 0, 6, 0x5A, 0xA5]
-    MEM_INS_MARKED3 = [MEM_INS_WRITE, 0, 10, 0x5A, 0xA5]
-    # MEM_INS_RESET  = [MEM_INS_WRITE, 0, 2, 1, 1, 0, 0xFF]
+    MEM_INS_MARKED = [MEM_INS_WRITE, 0, 2, 1, 1]
+    MEM_INS_RESET  = [MEM_INS_WRITE, 0, 2, 1, 1, 0, 0xFF]
 
     __slots__ = ('_selector', '_wait_for_first_data', '_spi', '_tx_buffer_header', '_tx_buffer_data',
                  'pin_busy', 'pin_mem_req', 'pin_mem_sel', 'pin_ram_sel',
@@ -46,11 +44,11 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
         self._elite_data_len = 40
         self._mem_header_len = 3
-        self._mem_tailer_len = 6
+        self._mem_tailer_len = 8
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
 
         # buffer
-        self._tx_buffer_header = [0] * 19
+        self._tx_buffer_header = [0] * 11
         self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
 
         # memory control pin
@@ -76,8 +74,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
     def set_pin_mem_req(self, value: bool):
         channel = self.select
-        # if self._pin_mem_req_value[channel] == value:
-        #     print('last_req_sig[channel] == value', channel, self._pin_mem_req_value[channel], value, datetime.now())
         self.pin_mem_req.output(value)
         self._pin_mem_req_value[channel] = value
 
@@ -169,52 +165,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         print("read red data times", self._read_red_times)
         return data
 
-    def _compare_green_data_addr_and_flag(self, data: Union[bytes, List[int]], device: int):
-
-        green_data_section1 = data[3:7]
-        green_data_section2 = data[7:11]
-        green_data_section3 = data[11:15]
-        green_data_section = []
-
-        if green_data_section1 == green_data_section2:
-            green_data_section = green_data_section1
-
-        elif(green_data_section2 == green_data_section3 or green_data_section1 == green_data_section3):
-            print("green data not equal: = ", data[3:15])
-            print("green data print:", data, device, datetime.now())
-            green_data_section = green_data_section3
-
-        else:
-            print("green data not equal: = ", data[3:15])
-            print("green data print:", data, device, datetime.now())
-            green_data_section = green_data_section3 # use last data
-
-
-        return green_data_section
-
-    def _print_ram_all_data(self):
-        addr = 0
-        red_length = int(7000 / 2)
-        tx_temp = [0] * (red_length + 3)
-
-        while True:
-            tx_temp[0] = MEM_INS_READ
-            tx_temp[1] = ((addr >> 8) & 0xFF)
-            tx_temp[2] = (addr & 0xFF)
-
-            ram_data = []
-            ram_data = self._spi.send_byte(tx_temp)
-            ram_data[0:3] = [255, 255, 255]
-            print(list(ram_data), len(ram_data), addr)
-            addr += len(ram_data) - 3
-
-            if (7000 < addr + len(ram_data)):
-                del ram_data
-                break
-        print()
-
-        return
-
     def recv_memory(self, device: int) -> Optional[bytes]:
         self.pin_busy.output(False)
 
@@ -241,7 +191,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
                 if (self._head_wrong_cnt[device] <= 5): # print 5 times
                     print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-                    print(list(data))
+                    print(list(data[0:7]))
 
             data[0:3] = [255, 255, 255]
             # ----------------------------------------------------------------------------------------------
@@ -260,13 +210,13 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
             #     if (self._head_wrong_cnt[device] < 10):
             #         print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_first))
+            #         print(list(data_first[0:7]))
 
             # if (data_second[0] != 255 or data_second[1] != 255 or data_second[2] != 255):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
             #     if (self._head_wrong_cnt[device] < 10):
             #         print('data_second[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_second))
+            #         print(list(data_second[0:7]))
 
             # if (data_first[3:] == data_second[3:]):
             #     data = data_first
@@ -278,47 +228,59 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             #     data = self.compare_green_data(data_first, data_second, data_third, len(tx_h))
             # ----------------------------------------------------------------------------------------------
 
-            green_data_section = self._compare_green_data_addr_and_flag(data, device)
+            # debug use
+            # green_data = []
+            # green_data = data
+            # print("_[Debug] @ spi green data = ", green_data)
 
-            length = (green_data_section[0] << 8) | green_data_section[1]
-            header = data[15]
-            elite_data_len = data[17]
-
-            if length <= 12:
-                if length < 12:
-                    print("length < 12")
-                    print("green data print:", data, device, datetime.now())
-
-                # if length == 0:
-                #     self._print_ram_all_data()
+            length = (data[3] << 8) | data[4]
+            header = data[7]
+            elite_data_len = data[9]
 
+            if length <= 4:
+                # print("length <= 4")
+                # print("green data print:", data, device, datetime.now())
                 return None
 
-            if green_data_section[2] != 0xA5 or green_data_section[3] != 0x5A:
+            if data[5] != 0 or data[6] != 0:
                 # give a default length if the data header did not update
-                print("green data: is not [0xA5, 0x5A], = ", data[5:7])
+                length = 7000
+                print("green data: is not [0,0], = ", data[5:7])
                 print("green data print:", data, device, datetime.now())
                 return None
 
-            if (length >= 4000):
+            if (length >= 7000):
                 flag_print = True
                 print("green data: big length:", length)
 
             if (header != 255):
                 flag_print = True
                 print("green data: header is not 255: ", header)
-                # self._print_ram_all_data()
 
             if (elite_data_len != self._elite_data_len):
                 flag_print = True
                 print("green data: length is not", self._elite_data_len, ": ", elite_data_len)
 
             if (flag_print):
-                print("green data print:", data, device, datetime.now(), '\n')
+                print("green data print:", data, device, datetime.now())
 
-            address = 12
+            # neulive
+            # address += len(data) - 11
+            # tx_d = self._tx_buffer_data
+            # red_length = len(tx_d)
+
+            # elite read all data of ram
+            # address = 4
+            # red_length = length - 1 
+            # tx_d = [0] * red_length
+
+            address = 4
             red_length = int(length / 2)
-            tx_d = [0] * (red_length + 3)
+            tx_d = [0] * red_length
+
+            # elite read len(_tx_buffer_data) byte
+            # address = 4
+            # tx_d = self._tx_buffer_data
 
             while True:
                 tx_d[0] = MEM_INS_READ
@@ -357,60 +319,22 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                     address += len(data) - 3
                     del data
 
-            # last_index = 0
-            # print("_[Debug] @ spi recv data rx, ram_select:", self._pin_ram_sel_value[device], ",", datetime.now())
+            # print("_[Debug] @ spi recv data rx = ")
             # for i in range(0, len(rx), self._single_data_len):
-            #     last_index = i
-            #     # print(rx[i:i+self._single_data_len])
-            #     if i == 0:
-            #         print(rx[0:8], 'ram:', rx[47])
-
-            # if last_index != 0:
-            #     print(rx[last_index:last_index+8], 'ram:', rx[last_index+47])
+            #     print(rx[i:i+self._single_data_len])
             # print()
 
             # /* 
             #  * red data formate:
             #  * ramHdr, ramHdr, ramHdr,                                   (3B)
             #  * 255, #, data_length,                                      (3B)
-            #  * data,                                                     (40B)
+            #  * data,                                                     (20B)
             #  * red_wrong, red_retry_cnt, green_wrong, green_retry_cnt,   (4B)
-            #  * check_num,                                                (1B)
+            #  * 255, #, data_length,                                      (3B) 
             #  *                                                                  */
 
-            # read again if check num is wrong
-            index = 0
-            check_number_print = False
-            for i in range(0, len(rx), self._single_data_len):
-                check_sum = sum(rx[i : i + self._single_data_len - 1]) & 0b11111111
-                # print(check_sum, rx[i + self._single_data_len - 1])
-
-                if (check_sum != rx[i + self._single_data_len - 1]):
-                    # print('check_sum wrong, origin value:', 'check_sum =', check_sum, rx[i : i + self._single_data_len])
-                    tx_d = [0] * (self._single_data_len + 3)
-                    address = 12 + self._single_data_len * index
-                    tx_d[0] = MEM_INS_READ
-                    tx_d[1] = ((address >> 8) & 0xFF)
-                    tx_d[2] = (address & 0xFF)
-
-                    data = []
-                    data = self._spi.send_byte(tx_d)
-                    data[0:3] = [255, 255, 255]
-                    rx[i : i + self._single_data_len] = data[3:]
-                    print('check_sum wrong, read again:', 'check_sum =', check_sum, rx[i : i + self._single_data_len])
-                    check_number_print = True
-                index = index + 1
-
-            if check_number_print:
-                print('check_sum wrong:', device, datetime.now())
-                for i in range(0, len(rx), self._single_data_len):
-                    print(rx[i:i+self._single_data_len])
-                print()
-
             # mark read
-            self._spi.send_byte(self.MEM_INS_MARKED1)
-            self._spi.send_byte(self.MEM_INS_MARKED2)
-            self._spi.send_byte(self.MEM_INS_MARKED3)
+            self._spi.send_byte(self.MEM_INS_MARKED)
 
         except BaseException as e:
             print(e)

python/biopro/impl/selector.py

@@ -118,13 +118,13 @@ class Selector:
         self._p2.output(p[2])
 
         # if (value == 4 and self._last_sel != 6):
-        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel, datetime.now())
+        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel)
         # elif (value == 5 and self._last_sel != 4):
-        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel, datetime.now())
+        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel)
         # elif (value == 7 and self._last_sel != 5):
-        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel, datetime.now())
+        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel)
         # elif (value == 6 and self._last_sel != 7):
-        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel, datetime.now())
+        #     print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel)
             
         self._last_sel = value
 

python/biopro/project/action.py

@@ -1,26 +0,0 @@
-
-class Action():
-    def __init__(self, action_id, action):
-        self._id: str = action_id
-        self._type: str = action['type']
-        self._target: str = action['target']
-        self._condition : list[str] = action['condition']
-        # self._duration = action.get('duration', None)
-        # self._goto = action.get('goto', None)
-        # self._cycle = action.get('cycle', None)
-    
-    @property
-    def id(self):
-        return self._id
-
-    @property
-    def type(self):
-        return self._type
-    
-    @property
-    def target(self):
-        return self._target
-    
-    @property
-    def condition(self):
-        return self._condition

python/biopro/project/condition.py

@@ -1,96 +0,0 @@
-from datetime import datetime
-from time import time
-
-class Condition():
-    def __init__(self, id, condition):
-        self._id = id
-        self._type = condition['type']
-        self._comparsion = condition['comparsion']
-        self._value = condition['value']
-        self._active = False
-    
-    @property
-    def id(self):
-        return self._id
-
-    @property
-    def type(self):
-        return self._type
-
-    @property
-    def comparsion(self):
-        return self._comparsion
-
-    @property
-    def value(self):
-        return self._value
-    
-    @id.setter
-    def id(self, new_id):
-        self._id = new_id
-    
-    @type.setter
-    def type(self, new_type):
-        self._type = new_type
-
-    @comparsion.setter
-    def comparsion(self, new_comparsion):
-        self._comparsion = new_comparsion    
-    
-    @value.setter
-    def value(self, new_value):
-        self._value = new_value
-
-    def compareWith(self, operator, x, y) -> bool:
-        # print(operator, x, y)
-        cases = {
-            "equal": lambda a, b: a == b,
-            "bigger": lambda a, b: a > b,
-            "smaller": lambda a, b: a < b,
-        }
-
-        return cases[operator](x, y)
-
-    def match_or_not(self, **kwargs):
-        # print(self._type, self._comparsion, self._value)
-        return getattr(self, self.type)(**kwargs)
-       
-    def absolute_time(self, **kwargs):
-        now = int(time())
-        time_condition = round(self.datetime_to_timestamp(self.str_to_datetime(self._value)))
-
-        return self.compareWith(self.comparsion, now, time_condition)
-
-    def after_project_run(self, **kwargs):
-        project_start_time = kwargs['project_start_time']
-        delay_time = kwargs['delay_time']
-
-        time_diff = int(time() - project_start_time - delay_time)
-        return self.compareWith(self.comparsion, time_diff, int(self._value))
-    
-    def after_task_run(self, **kwargs):
-        # print('relative_time_from_task', kwargs,kwargs['task_start_time'],kwargs['delay_time'])
-        if len(kwargs['task_start_time']) == 0:
-            return False
-        task_start_time = kwargs['task_start_time'][-1]
-        delay_time = kwargs['delay_time']
-
-        time_diff = int(time() - task_start_time - delay_time)
-        # print('time_diff',  time_diff)
-        return self.compareWith(self.comparsion, time_diff, int(self._value))
-    
-    def device(self, **kwargs):
-        print('device')
-    
-    def previous_task_done(self, **kwargs):
-        running_task = kwargs['running_task']
-        if running_task.status == 2 and self._active == False:
-            self._active = True
-            return True
-        return False
-
-    def str_to_datetime(self, time_str):
-        return datetime.strptime(time_str,'%Y-%m-%dT%H:%M')
-
-    def datetime_to_timestamp(self, date):
-        return datetime.timestamp(date)

python/biopro/project/instruction.py

@@ -1,32 +0,0 @@
-
-class Instruction():
-    def  __init__(self):
-        self._instruction_set = {
-            'set_file_name': {
-                'method': 'update_recording_file_name_info',
-                'arguments': ['file_name']
-            },
-            'set_parent': {
-                'method': 'update_parent_info',
-                'arguments': ['parent']
-            },
-            'set_parameter':{
-                'method': 'set_multi_parameters',
-                'arguments': ['parameter']
-            },
-            'call_instruction': {
-                'method': 'call_instruction',
-                'arguments': ['instruction']
-            },
-        }
-    
-        self._start_instruction = list(map(lambda ins: self._instruction_set[ins] ,['set_file_name', 'set_parent', 'set_parameter', 'call_instruction']))
-        self._stop_instruction = list(map(lambda ins: self._instruction_set[ins] ,['call_instruction']))
-    
-    @property
-    def start(self) -> list:
-        return self._start_instruction
-    
-    @property
-    def stop(self) -> list:
-        return self._stop_instruction

python/biopro/project/project.py

@@ -1,227 +0,0 @@
-import sys
-import json
-import threading
-
-from time import time, sleep
-from datetime import datetime
-from collections import deque
-from copy import copy
-from uuid import uuid4
-
-from .task import Task
-from .task_manager import TaskManager
-from .instruction import Instruction
-from biopro.device.manager import DeviceManager
-from biopro.text import *
-
-key_list = {
-  'deviceList': 'device',
-}
-
-class Project(threading.Thread):
-  def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
-    super(Project, self).__init__(name = name)
-    self._project = project
-    self._device_manager = device_manager
-    self._mqtt_thread = mqttThread
-    self._time_interval = 1
-    self._start_time = None
-    self._end_time = None
-
-    self._id = None
-    self._uuid = str(uuid4())
-    self._name = None
-    self._desc = None
-    self._device = None
-    self._complete_device = []
-    self._status = 0
-
-    self._instruction_set = Instruction()
-    self._stop_flag  = False
-
-    self._task_manager = None
-
-    self.setup_project(project)
-    self.setup_device(self._device)
-  
-  def setup_project(self, project):
-    for (key, value) in project.items():
-      if key in key_list.keys():
-        key = key_list[key]
-
-      if key == 'task':
-        self._task_manager = TaskManager(project['task'])
-      elif key == 'uuid':
-        pass
-      else:
-        setattr(self, key, value)
-      
-  def setup_device(self, device_list):
-    for device in device_list:
-      complete_device = self._device_manager.get_device(device['connectDevice']['device_address'])
-      self._complete_device.append(complete_device)
-
-  @property
-  def id(self) -> int:
-    return self._id
-  
-  @id.setter
-  def id(self, new_id):
-    self._id = new_id
-  
-  @property
-  def uuid(self) -> str:
-    return self._uuid
-  
-  @uuid.setter
-  def uuid(self, new_uuid):
-    self._uuid = new_uuid
-
-  @property
-  def name(self) -> str:
-    return self._name
-  
-  @name.setter
-  def name(self, new_name):
-    self._name = new_name
-
-  @property
-  def desc(self) -> str:
-    return self._desc
-  
-  @desc.setter
-  def desc(self, new_desc):
-    self._desc = new_desc
-  
-  @property
-  def status(self) -> str:
-    return self._status
-  
-  @status.setter
-  def status(self, new_status):
-    self._status = new_status
-
-  @property
-  def device(self) -> list:
-    return self._device
-  
-  @device.setter
-  def device(self, new_device):
-    self._device = new_device
-  
-  @property
-  def task_list(self):
-    return self._task_manager.export_task_list
-
-  @property
-  def mqtt_thread(self):
-    return self._mqtt_thread
-
-  def run(self):
-      self._status = 1
-      self._start_time = time()
-      self.mqtt_thread.broadcast_command('project:' + self._name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-      
-      while not self._stop_flag :
-        # check running task first
-        delay_time = 0
-        check_list = copy(self._task_manager.check_list)
-
-        for task in check_list:
-          if task != None:
-            now = time()
-            # print('round task', task.name)
-            # print('running task', self._task_manager.running_task.name, self._task_manager.running_task.status)
-            # if self._task_manager.prev_task != None:
-            #   print('previous_task', self._task_manager.prev_task.name, self._task_manager.prev_task.status)
-
-            match_condition_list = task.check_condition(
-              project_start_time = self._start_time,
-              delay_time = delay_time,
-              running_task= self._task_manager.running_task,
-              previous_task =  self._task_manager.prev_task
-            )
-            # print('match_condition_list', match_condition_list)
-            for condition in match_condition_list:
-              match_action_list = task.get_match_action(condition.id)
-              for action in match_action_list:
-                # print('match_action', action.type, action.target)
-                if action.type == 'start' and task.status != 1:
-                  self._task_manager.set_running_task(task)
-                  self.mqtt_thread.broadcast_command('project:task ' + task.name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-
-                device = self._complete_device[action.target]
-                task_info = task.get_task_info(action)
-                instruction_set = getattr(self._instruction_set, action.type, None)
-                # print('instruction_set',instruction_set)
-                
-                if instruction_set != None:
-                  for instruction in instruction_set:
-                    args = list(map(lambda arg: task_info[arg], instruction['arguments']))
-                    threading.Thread(target=getattr(device, instruction['method'])(*args))
-            
-            delay_time += (time() - now)
-
-        # check task not running then stop
-        if self.check_running_task_not_run() == True:
-          self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-          self._task_manager.running_task.stop()
-        
-        # check project done then close project
-        if self.check_project_done() == True:
-          print('project stop at', datetime.now())
-          self.close()
-        
-        if self._time_interval - delay_time > 0:
-          sleep(self._time_interval - delay_time)
-
-  def pause(self):
-    # TODO
-    pass
-
-  def stop(self):
-    self._task_manager.running_task.stop()
-    self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-    self._status = 2
-    self._end_time = time()
-    self._stop_flag  = True
-    self.mqtt_thread.broadcast_command('project:project ' + str(self._name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-
-  def close(self):
-    self._status = 2
-    self._end_time = time()
-    self._stop_flag  = True
-    self.mqtt_thread.broadcast_command('project:project ' + str(self._name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-
-  def check_project_done(self):
-    for task in self._task_manager.task_list:
-      # if task never start or still task is running then reject 
-      if task.status == 1 or task.status == -1:
-        return False
-    return True
-  
-  def check_running_task_not_run(self):
-    # if no running task
-    if self._task_manager.running_task == None:
-      return False
-
-    for device in self._task_manager.running_task.device:
-      if self._complete_device[device].status == 1:
-        return False
-    return True
-  
-  def as_json(self):
-    running_task = None
-    if self._task_manager.running_task is not None:
-      running_task = self._task_manager.running_task.as_json()
-    data = {
-      'id': self._id,
-      'name': self._name,
-      'uuid': self._uuid,
-      'desc': self._desc,
-      'status': self._status,
-      'device': self._device,
-      'task': self.task_list,
-      'running_task': running_task
-    }
-    return data

python/biopro/project/project_manager.py

@@ -1,39 +0,0 @@
-from io import StringIO
-from json import loads as json_parse, dumps as _json_stringify
-from typing import Dict, Optional, Any
-import paho.mqtt.client as mqtt
-from .project import Project
-from biopro.device.manager import DeviceManager
-
-def json_stringify(o: Any) -> str:
-    return _json_stringify(o, separators=(',', ':'))
-
-class ProjectManager():
-    def __init__(self, device_manager: DeviceManager, mqtt_thread=None) :
-        self._project_list = []
-        self._mqtt_thread =  mqtt_thread
-        self._device_manager = device_manager
-    
-    def create(self, project):
-      new_project = Project(project, self._device_manager, self._mqtt_thread)
-      self._project_list.append(new_project)
-      return new_project
-
-    def remove(self, index):
-      self._project_list[index].stop()
-      del self._project_list[index]
-
-    def get(self, project_uuid = None):
-      if project_uuid == None:
-        return self._project_list
-      else:
-        for project in self._project_list:
-          if project.uuid == project_uuid:
-            return project
-
-    def run_project(self, project):
-      project.start()
-
-    def stop_project(self, project):
-      _project = self.get(project)
-      _project.stop()

python/biopro/project/task.py

@@ -1,252 +0,0 @@
-from typing import List
-from .condition import Condition
-from .action import Action
-from time import time
-from datetime import datetime
-
-key_list = {
-  'deviceList': 'device',
-  'parameterSet': 'parameter_set'
-}
-
-class Task:
-  def __init__(self, task):
-    self._id = None
-    self._name = None
-    self._parent = None
-    self._cycle = None
-    self._device = None
-    self._event = None
-    self._trigger = None
-    self._parameter_set = None
-    self._condition = None
-    self._action = None
-    # -1: initial 0: start(idle), 1: running, 2: close(idle)
-    self._status = 0
-    self._next = None
-
-    self._condition_list: List[Condition] = []
-    self._action_list: List[Action] = []
-    self._instruction_list = []
-    self._record_list = []
-
-    self._start_time = []
-    self._idle_time = []
-    self._end_time = []
-    self._period = None
-
-    self.load_task(task)
-  
-  def load_task(self, task) -> None:
-    # update task attribute
-    for key, value in task.items():
-      if key in key_list.keys():
-        key = key_list[key]
-      if key == 'condition':
-        self.update_condition_list(value)
-      if key == 'action':
-        self.update_action_list(value)
-      # print(key, value)
-      setattr(self, key, value)
-    
-  def update_condition_list(self, condition_dict):
-    self._condition_list.clear()
-    for key, condition in condition_dict.items():
-      self._condition_list.append(Condition(key, condition))
-    
-  def update_action_list(self, action_dict):
-    self._action_list.clear()
-    for key, action in action_dict.items():
-      self._action_list.append(Action(key, action))
-
-  @property
-  def id(self) -> str:
-    return self._id
-  
-  @id.setter
-  def id(self, new_id):
-    self._id = new_id
-  
-  @property
-  def uuid(self) -> str:
-    return self._uuid
-  
-  @uuid.setter
-  def uuid(self, new_uuid):
-    self._uuid = new_uuid
-  
-  @property
-  def name(self):
-    return self._name
-  
-  @name.setter
-  def name(self, new_name):
-    self._name = new_name
-
-  @property
-  def parent(self):
-    if self._parent == None:
-      return  {"folder": [2]}
-    return self._parent
-  
-  @parent.setter
-  def parent(self, new_parent):
-    self._parent = new_parent
-
-  @property
-  def cycle(self) -> int:
-    return self._cycle
-  
-  @cycle.setter
-  def cycle(self, new_cycle):
-    self._cycle = new_cycle
-  
-  @property
-  def device(self) -> dict:
-    return self._device
-  
-  @device.setter
-  def device(self, new_device):
-    self._device = new_device
-  
-  @property
-  def event(self) -> list:
-    return self._event
-  
-  @event.setter
-  def event(self, new_event):
-    self._event = new_event
-
-  @property
-  def trigger(self) -> list:
-    return self._trigger
-  
-  @trigger.setter
-  def trigger(self, new_trigger):
-    self._trigger = new_trigger
-  
-  @property
-  def parameter_set(self) -> list:
-    return self._parameter_set
-  
-  @parameter_set.setter
-  def parameter_set(self, new_parameter_set):
-    self._parameter_set = new_parameter_set
-
-  @property
-  def condition(self) -> list:
-    return self._condition
-  
-  @condition.setter
-  def condition(self, new_condition):
-    self._condition = new_condition
-  
-  @property
-  def action(self) -> list:
-    return self._action
-  
-  @action.setter
-  def action(self, new_action):
-    self._action = new_action
-
-  @property
-  def status(self) -> str:
-    return self._status
-  
-  @status.setter
-  def status(self, new_status):
-    self._status = new_status
-  
-  @property
-  def next(self) -> str:
-    return self._next
-  
-  @next.setter
-  def next(self, new_next):
-    self._next = new_next
-  
-  @property
-  def instruction_list(self) -> List:
-    return self._instruction_list
-  
-  @property
-  def start_time(self) -> List:
-    return self._start_time
-  
-  @property
-  def end_time(self) -> List:
-    return self._end_time
-  
-  def new_start_time(self):
-    self._start_time.append(time())
-  
-  def new_end_time(self):
-    self._end_time.append(time())
-    
-  def get_parameter_set_by_device(self, device):
-     return [parameter_set for parameter_set in self.parameter_set.values() if device == parameter_set['target']]
-
-  def get_parameter(self, name_or_value, device):
-    name_list = []
-    value_list = []
-    for parameter in self.get_parameter_set_by_device(device):
-      for key, value in parameter.items():
-        if key != 'target':
-          name_list.append(key)
-          value_list.append(str(value))
-
-    return '|'.join(name_list) if name_or_value == 'name' else '|'.join(value_list)
-  
-  def run(self):
-    print(self._name, 'run at', datetime.now())
-    self._status = 1
-    self._start_time.append(time())
-  
-  def start(self):
-    self.status = 1
-  
-  def stop(self):
-    self.status = 2
-
-  def get_match_action_list(self, match_condition_list):
-    return map(lambda condition: [x for x in self._action_list if condition.id in x.get_condition_list()], match_condition_list)
-  
-  def get_match_action(self, condition_id):
-    return [action for action in self._action_list if condition_id in action.condition]
-
-  def do_action(self, action): 
-    for instruction in action.get_instruction_list():
-      self._instruction_list.append(instruction)
-
-  def check_condition(self, **kwargs):
-    kwargs['task_start_time'] = self._start_time
-    return [condition for condition in self._condition_list if  condition.match_or_not(**kwargs)]
-  
-  def get_task_info(self, action):
-    _type = action.type
-    if _type == 'stop':
-      _type = 'interrupt'
-
-    return {
-      'device': action.target,
-      'parameter': self.get_parameter_set_by_device(action.target),
-      'file_name': self._name + '-' + str(action.target),
-      'parent': self.parent,
-      'instruction': _type
-    }
-  
-  def as_json(self):
-    return {
-      'id': self.id,
-      'name': self.name,
-      'parent': self.parent,
-      'cycle': self.cycle,
-      'device': self.device,
-      'event': self.event,
-      'trigger': self.trigger,
-      'parameter_set': self.parameter_set,
-      'condition': self.condition,
-      'action': self.action,
-      'status': self.status,
-      'next': self.next,
-    }

python/biopro/project/task_manager.py

@@ -1,88 +0,0 @@
-from json import loads as json_parse, dumps as _json_stringify
-from socket import if_nametoindex
-from typing import Dict, List, Optional, Any
-from xml.dom.expatbuilder import parseString
-import paho.mqtt.client as mqtt
-from biopro.text import *
-from .task import Task
-
-_RUNTIME_COMPILE = False
-
-def json_stringify(o: Any) -> str:
-    return _json_stringify(o, separators=(',', ':'))
-
-class TaskManager():
-    def __init__(self, task_list):
-      self._task_list = []
-      self._next_task = []
-      self._prev_task = None
-      self._running_task = None
-      
-      self.load_task_list(task_list)
-
-      # self.set_running_task(self._task_list[0])
-      # self._running_task.run()
-      self._next_task.append(self._task_list[0])
-    
-    @property
-    def task_list(self):
-      return self._task_list
-
-    @property
-    def export_task_list(self):
-      return [d.as_json() for d in self._task_list]
-
-    @property
-    def prev_task(self):
-      return self._prev_task
-    
-    @property
-    def running_task(self):
-      return self._running_task
-    
-    @property
-    def next_task(self):
-      return self._next_task
-
-    @property
-    def check_list(self):
-      return [self._running_task, *self._next_task]
-    
-    @property
-    def check_list(self):
-      return [self._running_task, *self._next_task]
-    
-    def load_task_list(self, task_list):
-      for task in task_list:
-        task = Task(task) 
-        self._task_list.append(task)
-    
-    def set_running_task(self, task):
-      try:
-        # if there is task running & same task active ,then reject
-        if self._running_task != None and self._running_task.uuid == task.uuid:
-          return False
-
-        # save running task
-        self._prev_task = self._running_task
-        # clear next task list
-        self._next_task.clear()
-        self._running_task = task
-        self._running_task.run()
-
-        if self._prev_task != None:
-          # if previous task is still running, then need to close
-          if self._prev_task.status == 1:
-            self._prev_task.stop()
-          print('prev', 'run', self._prev_task.name, self._running_task.name)
-
-        for task_uuid in self._running_task.next:
-          _task = next((task for task in self._task_list if task.uuid == task_uuid), None)
-          if _task != None:
-            self._next_task.append(_task)
-      except RuntimeError as e:
-        print(e)
-
-    def get_task(self, task_id):
-      return self._task_list[task_id]
-  

python/biopro/recording/file.py

@@ -8,7 +8,6 @@ import gc
 
 from biopro.util.json import JSON
 from biopro.util.stack import print_exception
-from biopro.util.logger import calculate_time
 from .data import RecordingData
 from .loader import *
 
@@ -20,8 +19,6 @@ from statistics import mean
 import random
 # from numba import jit
 
-from copy import copy
-
 def json_stringify(o) -> str:
     return _json_stringify(o, separators=(',', ':'))
 
@@ -373,45 +370,6 @@ class RecordingMetaFile(JsonSerialize):
             self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
             # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
         return None
-    
-    def update_subfile_time_size(self, database = None):
-        meta_data = {
-            'channels': str(self._channel_mask.channels()),
-            'size': str(self._size),
-            'time_duration': str(self._last_time),
-            'uuid': str(self._file_uuid),
-        }
-        _path = str(self._filepath).replace('/', '^')
-
-        if database is not None :
-            self._database = database
-            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
-            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
-        return None
-    
-    def update_subfile_raw(self, database = None):
-        meta_data = {
-            'raw_data': self._recording_sub_file,
-        }
-        _path = str(self._filepath).replace('/', '^')
-
-        if database is not None :
-            self._database = database
-            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
-            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
-        return None
-    
-    def update_subfile_mini(self, database = None):
-        meta_data = {
-            'mini_data': self._recording_sub_mini,
-        }
-        _path = str(self._filepath).replace('/', '^')
-
-        if database is not None :
-            self._database = database
-            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
-            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
-        return None
                 
     @property
     def filename(self) -> str:
@@ -559,6 +517,11 @@ class RecordingMetaFile(JsonSerialize):
             'start_time': str(_start_time),
         }
 
+        # if database is not None:
+        #     database.data_raw_create(self, f, raw_data, _channel)
+
+        # self._recording_file_ch[_channel]
+
         return f, raw_data
 
     def new_recording_mini(self, _channel: int, _start_time, scale, database = None) -> 'RecordingMini':
@@ -604,6 +567,9 @@ class RecordingMetaFile(JsonSerialize):
             'start_time': str(_start_time),
         }
 
+        # if database is not None:
+        #     database.data_mini_create(self, f, mini_data, _channel, scale)
+
         return f, mini_data
 
     def clear_recording_file(self):
@@ -662,6 +628,15 @@ class RecordingMetaFile(JsonSerialize):
             'device':        self._device,
         }
 
+        # d = self._device
+
+        # if d is not None:
+        #     ret['device'] = {
+        #         'device_name':    d.device_name,
+        #         'device_address': list(d.mac_address),
+        #         'serial_number':  d.serial_number.as_json(),
+        #     }
+
         return ret
 
 
@@ -817,10 +792,14 @@ class RecordingFile:
                 'end_time': str(_end_time),
                 'size': str(self._size)
             }
-
+            # if self._meta_file._id_db == 0:
+            #     _path = str(self._meta_file.filepath).replace('/', '^')
+            #     self._database.put_queue(['data_meta_id_get_by_path', _path])
+            #     # self._meta_file._id_db = self._database.put_queue(['data_meta_id_get_by_path', _path])
             if self._meta_file._id_db != 0:
                 _data['parent'] = self._meta_file._id_db
             self._database.put_queue(['data_raw_update', self._id_db, self._channel, _data])
+            # self._database.put_queue(['data_raw_update', self._id_db, self._channel, _data])
         self._status = False
         return None
 
@@ -986,7 +965,10 @@ class RecordingMini:
                 'end_time': str(_end_time),
                 'size': str(self._size)
             }
-
+            # if self._meta_file._id_db == 0:
+            #     _path = str(self._meta_file.filepath).replace('/', '^')
+            #     self._database.put_queue(['data_meta_id_get_by_path', _path])
+            #     # self._meta_file._id_db = self._database.put_queue(['data_meta_id_get_by_path', _path])
             if self._meta_file._id_db != 0:
                 _data['parent'] = self._meta_file._id_db
             self._database.put_queue(['data_mini_update', self._id_db, self._channel, _data])
@@ -1014,8 +996,7 @@ class RecordingFileWriter:
                  '_data_value_ch', '_close', '_data_mini_ch',
                  '_mini_scale_list', '_time_real_time', '_data_rl', '_data_db',
                  '_raw_save', '_mini_save', '_data_time_ch', '_data_value_ch_for_rl',
-                 '_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch', '_id_db_save', '_raw_create_not_done',
-                 '_mini_create_not_done')
+                 '_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch')
 
     def __init__(self, meta: RecordingMetaFile, device_id, database = None):
         self._meta = meta
@@ -1036,9 +1017,7 @@ class RecordingFileWriter:
 
         self._raw_save = {
             'id': {},
-            'data': {},
-            'end_time': {},
-            'size': {}
+            'data': {}
         }
         self._mini_save = {
             '10': {
@@ -1073,7 +1052,6 @@ class RecordingFileWriter:
         self._data_value_ch_for_rl = {}
         self._data_time_ch_for_rl = {}
         self._data_time_ch = {}
-        self._id_db_save = {}
 
         # mini data
         self._data_mini_ch = {}
@@ -1090,15 +1068,12 @@ class RecordingFileWriter:
 
         # splitting
         self.splitting_threshold_time = 30 * 60 * 1000  # one minute
-        self.splitting_threshold_size = 16 * 1024  #  16 * 16KB
+        self.splitting_threshold_size = 16 * 16 * 1024  #  16 * 16KB
 
         self._writer_batch_size = 8192 
 
         self._splitting_size = None
 
-        self._raw_create_not_done = True
-        self._mini_create_not_done = True
-
 
     @property
     def meta_file(self) -> RecordingMetaFile:
@@ -1131,17 +1106,14 @@ class RecordingFileWriter:
         self._splitting_size = 0
         return None
 
-    def close(self, mqtt_thread):
+    def close(self):
+        # if self._recording_file is not None:
+        #     self._recording_file.close()
+        #     self._recording_file = None
+        print('close1')
         self._close = True
         if len(self._recording_file_dict) > 0:
             for ch in self._data_db.keys():
-                if len(self._data_rl[ch]) > 0:
-                    self._data_rl[ch].append(str(int(self._time_now)))
-                    mes = ' '.join(self._data_rl[ch])
-                    mqtt_thread[ch].on_message(mes)
-                    self._data_rl[ch].clear()
-                    self._send_data[ch] = False
-
                 if self._recording_file_dict[ch]._status:
                     _data = ' '.join(self._data_db[ch])
                     self._raw_save['data'][ch] = _data
@@ -1151,7 +1123,7 @@ class RecordingFileWriter:
                     self._meta._size += self._recording_file_dict[ch]._size
             # self._data_db.clear()
             if self._database is not None:
-                self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data'], self._id_db_save])
+                self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data']])
                 # self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data']])
             self._recording_file_dict.clear()
         for scale in self._mini_scale_list:
@@ -1317,8 +1289,7 @@ class RecordingFileWriter:
                     self._data_db[c].append(str(v))
                     self._time_now = int(t)
         return
-    
-    # @calculate_time(1)
+
     def write(self, data: Union[bytes, RecordingData, List[bytes], List[RecordingData]], mqtt_thread) -> int:
         # check size
         ths = self.splitting_threshold_size
@@ -1377,54 +1348,42 @@ class RecordingFileWriter:
                 
                 self.get_data_iter(d, mqtt_thread)
 
+            data_save = False
+            mini_save = False
             if len(self._recording_file_dict) > 0:
                 for ch in self._data_db.keys():
                     if self._time_now - self._time_real_time[ch] > 1000000:
                         self._send_data[ch] = True
                         self._time_real_time[ch] = self._time_now
-
-            for ch in self._recording_file_dict:
-                if self._recording_file_dict[ch]._id_db == 0:
-                    return None
-            
-            for ch in self._data_db.keys():
-                for scale in self._mini_scale_list:
-                    if  self._recording_mini_dict[str(scale)][ch]._id_db == 0:
-                        return None
-            
-            if self._raw_create_not_done :
-                self._raw_create_not_done = False
-                self._meta.update_subfile_raw(database = self._database)
-            
-            if self._mini_create_not_done :
-                self._mini_create_not_done = False
-                self._meta.update_subfile_mini(database = self._database)
-
-            data_save = False
-            mini_save = False
-            if len(self._recording_file_dict) > 0:
-                for ch in self._data_db.keys():
+                    # # if self._time_now - self._time_real_time[ch] > 500000:
+                    # self._data_rl[ch].append(str(self._time_now))
+                    # mes = ' '.join(self._data_rl[ch])
+                    # # print(mes)
+                    # # if mqtt_thread is not None:
+                    # #     mqtt_thread.publish('data_server/device_data_stream/' + str(self._device_id) + '/' + str(ch), mes)
+                    # # mqtt_queue.put([self._device_id, ch, mes])
+                    # mqtt_thread[ch].on_message(mes)
+                    # self._data_rl[ch].clear()
+                    # # self._time_real_time[ch] = self._time_now
                     if self._time_now - self._time[ch] > 5000000:
                         if self._recording_file_dict[ch]._status:
                             _data = ' '.join(self._data_db[ch])
                             write_sz = self._recording_file_dict[ch].write(_data, self._channel_list)
+                            sz = sz + write_sz
                             self._raw_save['data'][ch] = _data
                             self._raw_save['id'][ch] = self._recording_file_dict[ch]._id_db
-                            self._raw_save['end_time'][ch] = self._time_now
-                            self._raw_save['size'][ch] = self._recording_file_dict[ch]._size
+                            data_save = True
                             self._data_db[ch].clear()
                             self._time[ch] = self._time_now
+                            self._splitting_size += sz
                             self._meta._last_time = self._time_now
-                            self._splitting_size += write_sz
-                            data_save = True
+                            self._recording_file_dict[ch].update_endtime(self._time_now)
                     if len(self._data_mini_ch[ch]['1000']['mean']) >= 10:
                         mini_save = True
                         for scale in self._mini_scale_list:
-                            str_mean = [str(int) for int in self._data_mini_ch[ch][str(scale)]['mean']]
-                            data_mean = str(self._data_mini_ch[ch][str(scale)]['start_time']) + ' ' + ' '.join(str_mean) + '"***"'
                             self._mini_save[str(scale)]['id'][ch] = self._recording_mini_dict[str(scale)][ch]._id_db
                             self._mini_save[str(scale)]['start_time'][ch] = str(self._data_mini_ch[ch][str(scale)]['start_time'])
-                            self._mini_save[str(scale)]['data_mean'][ch] = data_mean
+                            self._mini_save[str(scale)]['data_mean'][ch] = self._data_mini_ch[ch][str(scale)]['mean'].copy()
                             # self._mini_save[str(scale)]['data_random'][ch] = self._data_mini_ch[ch][str(scale)]['random'].copy()
                             # self._mini_save[str(scale)]['data_bar'][ch] = self._data_mini_ch[ch][str(scale)]['bar'].copy()
                             self._recording_mini_dict[str(scale)][ch].write(self._mini_save[str(scale)]['data_mean'][ch])
@@ -1435,25 +1394,26 @@ class RecordingFileWriter:
 
                 if data_save is True:
                     if self._database is not None:
-                        recording_input = ['data_raw_recording_new', copy(self._raw_save['id']), copy(self._channel_list), copy(self._raw_save['data']), copy(self._raw_save['end_time']), copy(self._raw_save['size'])]
-                        self._database.put_queue(recording_input)
-                        self._meta.update_subfile_time_size(database = self._database)
+                        self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data']])
+                        self._meta.update_subfile(database = self._database)
                 if mini_save is True:
                     if self._database is not None:
                         for scale in self._mini_scale_list:
-                            self._database.put_queue(['data_mini_recording_new', copy(self._mini_save[str(scale)]['id']), self._channel_list, copy(self._mini_save[str(scale)]['data_mean'])])
-                        self._meta.update_subfile_time_size(database = self._database)
+                            self._database.put_queue(['data_mini_recording', self._mini_save[str(scale)]['id'], self._channel_list, self._mini_save[str(scale)]['start_time'], self._mini_save[str(scale)]['data_mean']])
+                        self._meta.update_subfile(database = self._database)
+            
+
         del data
 
         return None
 
 
     def _switch_recording_file(self):
-        self._raw_create_not_done = True
-
+        # if self._recording_file is not None:
+        #     self._recording_file.close()
+        
         if len(self._recording_file_dict) > 0:
             for ch in self._recording_file_dict.keys():
-                self._id_db_save[ch] = self._recording_file_dict[ch]._id_db
                 self._recording_file_dict[ch].close(self._time_now)
                 self._meta._size += self._recording_file_dict[ch]._size
                 
@@ -1469,16 +1429,16 @@ class RecordingFileWriter:
 
         if self._database is not None:
             self._database.put_queue(['data_raw_create', raw_data_dict, self._channel_list, self._device_id])
+            # self._database.put_queue(['data_raw_create', self._meta, self._recording_file_dict, raw_data_dict, self._channel_list])
 
         self._meta._last_time = self._time_now
-        # self._meta.update_subfile(database = self._database)
+        self._meta.update_subfile(database = self._database)
 
         self._splitting_size = 0
 
         return None
 
     def _switch_recording_mini(self, scale):
-        self._mini_create_not_done = True
         
         if len(self._recording_mini_dict[str(scale)]) > 0:
             for ch in self._recording_mini_dict[str(scale)].keys():
@@ -1496,12 +1456,14 @@ class RecordingFileWriter:
 
         if self._database is not None:
             self._database.put_queue(['data_mini_create', mini_data_dict, self._channel_list, scale, self._device_id])
+            # self._database.put_queue(['data_mini_create', self._meta, self._recording_mini_dict[str(scale)], mini_data_dict, self._channel_list, scale])
             
         self._meta._last_time = self._time_now
-        # self._meta.update_subfile(database = self._database)
+        self._meta.update_subfile(database = self._database)
         return None
 
     def update_meta_id(self, _id):
+        # print('update meta')
         self._meta._id_db = _id
         return None
     

python/biopro/server/_identify.py

@@ -9,9 +9,23 @@ _jwt = None
 
 def controller_device_id() -> str:
     ### device ID
-    f = open("/sys/class/net/eth0/address", "r")
-    mac = f.read()[:-1]
-    return mac
+    return 'b8:27:eb:52:ea:97'
+    ret = None
+    try:
+        with open('/etc/BPS/device_id') as f:
+            for line in f:
+                if line.startswith('#'):
+                    continue
+
+                ret = line.strip()
+                break
+    except FileNotFoundError:
+        pass
+
+    if ret is None or len(ret) == 0:
+        return str(uuid.uuid1())
+    else:
+        return ret
 
 def get_api_jwt() -> str:
     global _jwt

python/biopro/server/controller.py

@@ -1335,6 +1335,3 @@ def to_device_info(content: Union[str, ADDRESS, JSON_OBJECT]) -> DeviceResponseI
     return DeviceResponseInfo(None,
                               serial_number=serial,
                               mac_address=address)
-
-def run_project(self, project) -> bool:
-    return False

python/biopro/server/data.py

@@ -104,9 +104,18 @@ class DataServer(SocketServer, DataAPI):
                                       self.log_verbose,
                                       'MQTT-data-server')
         # api socket
+        self._queue_spi = queue.Queue()
+        # self._queue_spi_dict = {}
         self._queue_ds_dict = {}
         self._queue_db = Queue()
-        self._queue_msg = Queue()
+        self._queue_db_error = Queue()
+        # self._queue_ds = Queue()
+
+        # if len(self._queue_spi_dict) == 0:
+        #     self._queue_spi_dict[4] = Queue()
+        #     self._queue_spi_dict[5] = Queue()
+        #     self._queue_spi_dict[6] = Queue()
+        #     self._queue_spi_dict[7] = Queue()
 
         if len(self._queue_ds_dict) == 0:
             self._queue_ds_dict[4] = Queue()
@@ -114,12 +123,9 @@ class DataServer(SocketServer, DataAPI):
             self._queue_ds_dict[6] = Queue()
             self._queue_ds_dict[7] = Queue()
 
-        self.database_process = DataBaseProcess('data_server', self.log_verbose, self._queue_db, self._queue_ds_dict, self._queue_msg)
+        self.database_process = DataBaseProcess('data_server', self.log_verbose, self._queue_db, self._queue_ds_dict, self._queue_db_error)
         self.database_process.start()
 
-        # self._no_data_total_duration = 0
-        # self._recv_memory_cost_time = 0
-
     @logging_info
     def setup(self):
         self._available_channel.clear()
@@ -140,6 +146,7 @@ class DataServer(SocketServer, DataAPI):
         try:
             self._stop_runtime()
             self.stop_sync()
+            self._queue_spi.queue.clear()
         finally:
             self._configurations.clear()
 
@@ -178,6 +185,9 @@ class DataServer(SocketServer, DataAPI):
 
         self._configurations.clear()
 
+        with CacheClient() as client:
+            client.clear()
+
         # reopen spi, which has close at close()
         if spi_mode is None:
             spi_mode = self._spi_mode
@@ -407,7 +417,7 @@ class DataServer(SocketServer, DataAPI):
                 c.join()
                 self._spi.set_wait_flag(c._device, True)
             data_runtime_process = RecordingProcess('data_server', self.log_verbose, device_id, 
-                                                    Queue(), self._queue_ds_dict[int(device_id)], self._queue_msg, meta_file,
+                                                    Queue(), self._queue_ds_dict[int(device_id)], meta_file,
                                                     json_stringify(_device), _parameter, _parent, _recording_file_name,
                                                     data_format, self.socket_mqtt_ip, self.socket_mqtt_port,
                                                     database = self.database_process )
@@ -608,18 +618,8 @@ class DataServer(SocketServer, DataAPI):
         return
 
     def open_cache_client(self):
-        self.log_verbose('open cache client')
-        try:
-            client = CacheClient()
-            client.open_socket()
-
-        except RuntimeError as e:
-            self.log_warn(e)
-
-        else:
-            client.clear()
-
-            self._cache_client = client
+        self._cache_client = None
+        return
 
     def _ensure_cache_client(self) -> Optional[CacheClient]:
         if self._cache_client is None:
@@ -669,39 +669,22 @@ class DataServer(SocketServer, DataAPI):
                 print("q size= ", self._configurations[device]._queue_rec.qsize())
 
             self._configurations[device].put_rec_queue(data)
-            # self._no_data_total_duration = 0
             ret = True
-        # else:
-        #     time_diff = time() - self._recv_memory_cost_time
-        #     self._no_data_total_duration += time_diff
-        #     if self._no_data_total_duration > 1:
-        #         print('data is None', device, datetime.now(), self._no_data_total_duration)
-        #         print("sync.get_pin_mem_req() != sync.get_pin_ram_sel()")
-        #         print("no~", sync.select, sync.get_pin_mem_req(), sync.get_pin_ram_sel(), datetime.now())
-        #         print()
-        # self._recv_memory_cost_time = time()
 
         return ret
 
     def rec_update(self) -> bool:
-        ds_db_msg = self._queue_msg.get()
-        with CacheClient() as client:
-            if isinstance(ds_db_msg, List):
-                if ds_db_msg[0] == 'ds':
-                    client.send_command('device_instruction', ds_db_msg[1], ds_db_msg[2])
-            else:
-                self.mqtt_thread.broadcast_command('runtime error: ' + str(ds_db_msg))
-                content = {
-                    'header': 'device_instruction/0',
-                    'device': ds_db_msg,
-                    'instruction': 'interrupt'
-                }
-                self.mqtt_thread.publish('device_instruction', json_stringify(content), inter = True)
+
+        device_id = self._queue_db_error.get()
+        self.mqtt_thread.broadcast_command('runtime error: ' + str(device_id))
+        content = {
+            'header': 'device_instruction/0',
+            'device': device_id,
+            'instruction': 'interrupt'
+        }
+        self.mqtt_thread.publish('device_instruction', json_stringify(content), inter = True)
 
         return True
-    
-    def show_data(self, device):
-        self._configurations[device].put_rec_queue('show_data')
 
 class DataRuntime(metaclass=abc.ABCMeta):
     __slots__ = ('_server', '_device', '_meta_file', '_data_format',
@@ -1196,20 +1179,20 @@ class SpiRuntimeThread(ServerThread):
 
         run_time = time() - self._timer
 
-        real_run_time = run_time
-
         if run_time > 0.045:
-            # print('time, recv_data_form_spi_routine_time', time(), run_time)
+            print('time, recv_data_form_spi_routine_time', time(), run_time)
             run_time = 0.045
 
-        if run_time >= 0.030:
-            print('time, recv_data_form_spi_routine_time >= 0.030', 'device:', c, datetime.now(), time(), real_run_time)
-
-        event.wait(self._interval - run_time)
-        sync.set_pin_mem_sel(True)
-        sleep(0.005)
-
-        return
+        if server.sync_started:
+            event.wait(self._interval - run_time)
+            sync.set_pin_mem_sel(True)
+            sleep(0.005)
+            return
+        else:
+            event.wait(self._interval - run_time)
+            sync.set_pin_mem_sel(True)
+            self.close()
+            return
 
 class RecRuntimeThread(ServerThread):
     def __init__(self, server: DataServer):

python/biopro/server/database.py

@@ -15,15 +15,13 @@ from biopro.util.json import JSON_OBJECT
 from .socket import ServerThread
 
 import psycopg2
-from psycopg2.extras import execute_batch
+# from psycopg2.pool import ThreadedConnectionPool
 from multiprocessing import Process, Queue
 
 import biopro.server._identify
 
-from time import time
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from biopro.util.logger import calculate_time
 
 _RUNTIME_COMPILE = False
 
@@ -52,7 +50,7 @@ class DataBaseProcess(Process):
         self._api_token = None
         self._api_header = None
         self.log_verbose = log_verbose
-        self._executor = ThreadPoolExecutor(max_workers=8)
+        self._executor = ThreadPoolExecutor(max_workers=4)
 
         self._psql_multi_thread = None
         self._psql_conn_pool = None
@@ -64,15 +62,6 @@ class DataBaseProcess(Process):
 
         self._is_close = False
 
-
-        self._meta_write_sql_str = None
-
-        self._data_raw_create_sql_str = None
-        self._data_raw_update_sql_str = None
-        self._data_raw_recording_sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s) where id = %s'
-        self._new_data_raw_recording_sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s), end_time=%s, size=%s where id = %s'
-        self._data_mini_recording_sql_str = 'UPDATE "public"."%s_recording_data_minis" SET data_mean = concat(data_mean, %s) where id = %s'
-
     @property
     def db_host(self) -> str:
         return self._db_host
@@ -160,8 +149,7 @@ class DataBaseProcess(Process):
         if callable(getattr(self, do)):
             getattr(self, do)(*args)
         return None
-
-    # @calculate_time(1)
+    
     def data_meta_write(self, _data: JSON_OBJECT, device_id, _uuid = None, _id = None):
         if _id > 0:
             sql_str = 'UPDATE "public"."recording_data_metas" SET '
@@ -264,7 +252,6 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
-    # @calculate_time()
     def data_meta_get(self, _path = None, _id = None):
         if _id is not None:
             sql_str = 'SELECT * FROM "public"."recording_data_metas" WHERE id = %s'
@@ -299,7 +286,6 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
-    # @calculate_time()
     def data_meta_id_get_by_path(self, _path = None):
         ret = None
         if _path is not None:
@@ -321,29 +307,39 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
-    # @calculate_time()
     def data_raw_create(self, _data_dict, _channel_list, device_id):
-        if self._data_raw_create_sql_str == None:
-            sql_str_list = []
-            key_list = _data_dict[_channel_list[0]].keys()
-            key_str = ','.join(key_list)
-            values = ','.join(['%s'] * len(key_list))
-            sql_str_list = ['INSERT INTO "public"."{channel}_recording_data_raws" (', key_str, ') VALUES (', values, ') RETURNING id']
-            self._data_raw_create_sql_str = ''.join(sql_str_list)
-        try:
-            with self._psql_conn as conn:
-                    with conn.cursor() as sql_cursor:
-                        for _channel in _channel_list:
-                            sql_set = list(map(lambda x: str(x), _data_dict[_channel].values()))
-                            sql_cursor.execute(self._data_raw_create_sql_str.format(channel = _channel), sql_set)
-                            self._queue_ds[int(device_id)].put(['update_raw_dict_id', _data_dict[_channel]['uuid'], _channel, int(sql_cursor.fetchone()[0])])
-        except (psycopg2.Error, RuntimeError) as e:
-            print('data_raw_create error', e)
-            self._queue_error.put(device_id)
+
+        for _channel in _channel_list:
+            sql_str = 'INSERT INTO "public"."' + str(_channel) + '_recording_data_raws" ('
+            sql_set = []
+            for item in _data_dict[_channel].keys():
+                sql_str = sql_str + str(item) + ', '
+                if isinstance(_data_dict[_channel][item], dict):
+                    sql_set.append(json_stringify(_data_dict[_channel][item]))
+                else:
+                    sql_set.append(str(_data_dict[_channel][item]))
+
+            sql_str = sql_str[0:-2] + ') VALUES ('
+            for item in _data_dict[_channel].keys():
+                sql_str = sql_str + '%s, '
+
+            sql_str = sql_str[0:-2] + ') RETURNING id'
+            sql_cursor = self._psql_conn.cursor()
+
+            try:
+                sql_cursor.execute(sql_str, sql_set)
+            except RuntimeError as e:
+                print('data_raw_create error', e)
+                self._psql_conn.commit()
+                sql_cursor.close()
+                self._queue_error.put(device_id)
+            finally:
+                self._queue_ds[int(device_id)].put(['update_raw_dict_id', _data_dict[_channel]['uuid'], _channel, int(sql_cursor.fetchone()[0])])
+                self._psql_conn.commit()
+                sql_cursor.close()
 
         return True
 
-    # @calculate_time()
     def data_raw_update(self, _id, _channel, _data: JSON_OBJECT):
         sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_raws" SET '
         sql_set = []
@@ -361,36 +357,30 @@ class DataBaseProcess(Process):
         sql_cursor.execute(sql_str, sql_set)
         self._psql_conn.commit()
         sql_cursor.close()
+        
         return None
 
-    # @calculate_time()
-    def data_raw_recording(self, _id_dict, _channel_list, _data_dict, _id_db_save):
-        try:
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    para_list = []
-                    for _channel in _channel_list:
-                        temp_id = _id_dict[_channel] if _id_dict[_channel] != 0 else _id_db_save[_channel]
-                        para_list.append([_channel, _data_dict[_channel] + '"***"', temp_id])
-                    execute_batch(sql_cursor, self._data_raw_recording_sql_str, para_list)
-        except psycopg2.Error as e:
-            print('recording error', e)
+    def data_raw_recording(self, _id_dict, _channel_list, _data_dict):
+        for _channel in _channel_list:
+            compressed_value = _data_dict[_channel] + '"***"'
+            # compressed_value = bytes(_data_dict[_channel],'utf-8')
+            # compressed_value = zlib.compress(compressed_value)
+            # compressed_value = base64.b64encode(compressed_value).decode() + '"***"'
+            # compressed_value = _data + '"***"'
+            sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_raws" SET data = concat(data, %s) where id = %s'
+            sql_set = [compressed_value, _id_dict[_channel]]
+
+            sql_cursor = self._psql_conn.cursor()
+            sql_cursor.execute(sql_str, sql_set)
+            self._psql_conn.commit()
+            sql_cursor.close()
+
+            del _data_dict[_channel]
+            del compressed_value
+            gc.collect()
+            # _conn.close()
         return None
-    
-    # @calculate_time(1)
-    def data_raw_recording_new(self, _id_dict, _channel_list, _data_dict, _end_time_dict, _size_dict):
-        try:
-            para_list = []
-            for _channel in _channel_list:
-                para_list.append([_channel, _data_dict[_channel] + '"***"', _end_time_dict[_channel], _size_dict[_channel], _id_dict[_channel]])
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    execute_batch(sql_cursor, self._new_data_raw_recording_sql_str, para_list)
-        except psycopg2.Error as e:
-            print('recording error', e)
-        return None
-    
-    # @calculate_time()
+
     def data_mini_create(self, _data_dict, _channel_list, _scale, device_id):
         for _channel in _channel_list:
             sql_str = 'INSERT INTO "public"."' + str(_channel) + '_recording_data_minis" ('
@@ -424,43 +414,42 @@ class DataBaseProcess(Process):
         # _conn.close()
         return True
 
-    # @calculate_time()
     def data_mini_recording(self, _id_dict, _channel_list, _start_time_dict, _data_mean_dict):
-        with self._psql_conn as conn:
-            with self._psql_conn.cursor() as sql_cursor:
-                for _channel in _channel_list:
-                    data = _data_mean_dict.get(_channel)
-                    if data is not None:
-                        if len(data) != 0:
-                            str_mean = [str(int) for int in _data_mean_dict[_channel]]
-                            data_mean = _start_time_dict[_channel] + ' ' + ' '.join(str_mean)
-
-                    sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_minis" SET data_mean = concat(data_mean, %s) where id = %s'
-                    sql_set = [data_mean + '"***"', _id_dict[_channel]]
-                    sql_cursor.execute(sql_str, sql_set)
-
-                    del str_mean, data_mean
-        
         for _channel in _channel_list:
-            del _start_time_dict[_channel], _data_mean_dict[_channel]
-        gc.collect()
+            data = _data_mean_dict.get(_channel)
+            if data is not None:
+                if len(data) != 0:
+                    str_mean = [str(int) for int in _data_mean_dict[_channel]]
+                    data_mean = _start_time_dict[_channel] + ' ' + ' '.join(str_mean)
+                    # data_random = _start_time_dict[_channel] + ' ' + ' '.join(_data_random_dict[_channel])
+                    # data_bar = _start_time_dict[_channel] + ' ' + ' '.join(_data_bar_dict[_channel])
 
+                    compressed_mean = data_mean + '"***"'
+
+                    # compressed_mean = bytes(data_mean,'utf-8')
+                    # compressed_mean = zlib.compress(compressed_mean)
+                    # compressed_mean = base64.b64encode(compressed_mean).decode() + '"***"'
+
+                    # compressed_random = bytes(data_bar,'utf-8')
+                    # compressed_random = zlib.compress(compressed_random)
+                    # compressed_random = base64.b64encode(compressed_random).decode() + '"***"'
+
+                    # compressed_random = bytes(data_random,'utf-8')
+                    # compressed_random = zlib.compress(compressed_random)
+                    # compressed_random = base64.b64encode(compressed_random).decode() + '"***"'
+                    sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_minis" SET data_mean = concat(data_mean, %s) where id = %s'
+                    sql_set = [compressed_mean, _id_dict[_channel]]
+
+                    sql_cursor = self._psql_conn.cursor()
+                    sql_cursor.execute(sql_str, sql_set)
+                    self._psql_conn.commit()
+                    sql_cursor.close()
+
+                    del str_mean, _start_time_dict[_channel], _data_mean_dict[_channel], data_mean, compressed_mean
+                    gc.collect()
+        
         return True
     
-    # @calculate_time(1)
-    def data_mini_recording_new(self, _id_dict, _channel_list, _data_mean_dict):
-        try:
-            para_list = []
-            for _channel in _channel_list:
-                para_list.append([_channel, _data_mean_dict[_channel], _id_dict[_channel]])
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    execute_batch(sql_cursor, self._data_mini_recording_sql_str, para_list)
-        except psycopg2.Error as e:
-            print('recording error', e)
-        return None
-
-    # @calculate_time()
     def data_mini_update(self, _id, _channel, _data: JSON_OBJECT):
         sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_minis" SET '
         sql_set = []
@@ -480,74 +469,3 @@ class DataBaseProcess(Process):
         sql_cursor.close()
 
         return True
-
-    def data_meta_update_raw_empty_channel(self, meta_id, channel_list):
-        try:
-            sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_set(raw_data, '{%s}', '[]'), mini_data = jsonb_set(mini_data, '{%s}', '{\"10\": [], \"100\": [], \"1000\": []}') WHERE id = %s;"
-            sql_set = []
-            for channel in channel_list:
-                sql_set.append([channel, channel, meta_id])
-            
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    execute_batch(sql_cursor, sql_str, sql_set)
-        except psycopg2.Error as e:
-            print('e', e)
-
-        return True
-    
-    # @calculate_time()
-    def data_meta_update_channel_raw_id(self, meta_id, channel, raw_id):
-        try:
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_insert(raw_data, '{%s, -1}', '%s', TRUE) WHERE id = %s;"
-                    sql_set = [channel, raw_id, 571]
-                    sql_cursor.execute(sql_str, sql_set)
-        except psycopg2.Error as e:
-            print('e', e)
-
-        return True
-
-    # @calculate_time()
-    def data_meta_update_all_channel_raw_id(self, meta_id:str, raw_id_dict:dict):
-        try:
-            sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_insert(raw_data, '{%s, -1}', '%s', TRUE) WHERE id = %s;"
-            sql_set = []
-            for ch in raw_id_dict.keys():
-                sql_set.append([ch, raw_id_dict[ch], meta_id])
-            with self._psql_conn as conn:
-                    with conn.cursor() as sql_cursor:
-                        execute_batch(sql_cursor, sql_str, sql_set)
-        except psycopg2.Error as e:
-            print('e', e)
-
-        return True
-    
-    def data_meta_update_channel_mini_id(self, meta_id, channel, scale, mini_id):
-        try:
-            with self._psql_conn as conn:
-                    with conn.cursor() as sql_cursor:
-                        sql_str = "UPDATE recording_data_metas SET mini_data = jsonb_insert(mini_data, '{%s, %s, -1}', '%s', TRUE) WHERE id = %s;"
-                        sql_set = [channel, scale, mini_id, meta_id]
-                        sql_cursor.execute(sql_str, sql_set)
-        except psycopg2.Error as e:
-            print('e', e)
-
-        return True
-    
-    # @calculate_time()
-    def data_meta_update_all_channel_mini_id(self, meta_id, mini_id_dict):
-        try:
-            sql_str = "UPDATE recording_data_metas SET mini_data = jsonb_insert(mini_data, '{%s, %s, -1}', '%s', TRUE) WHERE id = %s;"
-            sql_set = []
-            for ch in mini_id_dict.keys():
-                for scale in mini_id_dict[ch].keys():
-                    sql_set.append([ch, scale, mini_id_dict[ch][scale], meta_id])
-            with self._psql_conn as conn:
-                with conn.cursor() as sql_cursor:
-                    execute_batch(sql_cursor, sql_str, sql_set)
-        except psycopg2.Error as e:
-            print('e', e)
-
-        return True

python/biopro/server/main.py

@@ -30,7 +30,6 @@ from .api import ApiRequests
 from biopro.api.auth import AuthAPI
 from biopro.api.controller import ControllerAPI
 from biopro.api.device import DeviceAPI
-from biopro.project.project_manager import ProjectManager
 ### do not import Websocket mode
 ###from .websocket import WebsocketThread
 
@@ -43,7 +42,7 @@ def _fc(c):
     return c % len(FORE_COLOR) + FORE_COLOR[0]
 
 
-class ControlServer(SocketServer, ControlServerAPI):
+class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler):
     """Data Server"""
 
     def __init__(self, *options):
@@ -60,7 +59,7 @@ class ControlServer(SocketServer, ControlServerAPI):
 
         :param options: server options
         """
-        super().__init__((ControlAPI), 'Controller', self.ADDR,
+        super().__init__((ControlAPI, CacheAPI), 'Controller', self.ADDR,
                          socket_listen=10,
                          thread_pool_count=16)
 
@@ -87,6 +86,21 @@ class ControlServer(SocketServer, ControlServerAPI):
         data_options.repository = device_option.repository
         self.data_server = DataServerProcess(data_options)
 
+        # experimental protocol
+        # exp_options = ExpManagerOption.get_options(*options)
+        # self.exp_manager = ExpManager(self, exp_options)
+
+        # cache
+        self.cache_manager = CacheManager(self,
+                                          c.cache_server_cache_size,
+                                          # time unit from sec to ms
+                                          c.cache_server_cache_time * 1000)
+
+        # websocket server ###
+        ### self.websocket_thread = WebsocketThread(self,
+        ###                                                         c.websocket_address,
+        ###                                                         c.websocket_port)
+
         # remote server / MQTT
         self.mqtt_thread = None
         if not c.flag_disable_remote_server:
@@ -97,6 +111,17 @@ class ControlServer(SocketServer, ControlServerAPI):
                                           self.log_verbose,
                                           'MQTT-control-server')
 
+        # routine trash thread
+        self._routine_trash_thread = None
+        # if not c.flag_disable_routine_trash:
+        #     self._routine_trash_thread = RoutineTrashThread(self._file_manager,
+        #                                                     c.trash_routine_time,
+        #                                                     c.trash_expire_time,
+        #                                                     c.trash_remove_expire_time)
+
+        # routine data routine
+        self._data_stream_thread = None
+
         # LED control
         self.led_thread = LEDControlThread(disable=c.flag_disable_led_control,
                                            led_count=c.led_count,
@@ -105,8 +130,6 @@ class ControlServer(SocketServer, ControlServerAPI):
         # device detect
         self._detect_device_thread = RoutineConnectDeviceThread(self._device_manager, self.mqtt_thread, self.led_thread, 3)
 
-        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
-
         if not c.flag_disable_led_control:
             self.led_thread.set_state(LED.COLOR_RED)
 
@@ -120,6 +143,8 @@ class ControlServer(SocketServer, ControlServerAPI):
         self._session = {}
         self._user_session_expire = c.user_session_expire_days * 24 * 60 * 60  # sec
 
+        # temp use variable
+
         # indicate those device together
         self._device_instruction_group = None
 
@@ -129,6 +154,8 @@ class ControlServer(SocketServer, ControlServerAPI):
         # _api request build
         self._api = ApiRequests()
 
+        
+
     # init method
 
     def _init_file_manager(self, option: ControlServerOptions) -> FileManager:
@@ -166,11 +193,6 @@ class ControlServer(SocketServer, ControlServerAPI):
     def device_manager(self) -> DeviceManager:
         return self._device_manager
 
-    @property
-    def project_manager(self) -> ProjectManager:
-        return self._project_manager
-
-
     # server setup
 
     def setup(self) -> None:
@@ -220,16 +242,32 @@ class ControlServer(SocketServer, ControlServerAPI):
         # device manager reset
         self.submit_thread(self._setup_device)
 
+        # self.submit_thread(self._setup_controller)
         self._setup_controller()
 
         # self.run_thread(self._detect_device_thread)
 
+        # experimental protocol manager
+        # if not self._controller_options.flag_disable_exp_manager:
+        #     self.exp_manager.setup()
+        #     self.exp_manager.reload_protocol()
+
+        # websocket server
+        ### self.log_verbose('setup websocket server', pc(self.websocket_thread.websocket_address, YELLOW))
+        # websocket server thread run ###
+        ### self.run_thread(self.websocket_thread)
+
         # broadcast greeting
         self.broadcast_command(DataMessage.greeting())
 
+        # routine trashing
+        if self._routine_trash_thread is not None:
+            self.run_thread(self._routine_trash_thread)
+
         # remote server
         if self.mqtt_thread is not None:
             self.mqtt_thread.start()
+            # self.run_thread(self.mqtt_thread)
 
     def _setup_file_manager(self):
         self.log_verbose('setup file manager')
@@ -404,14 +442,90 @@ class ControlServer(SocketServer, ControlServerAPI):
         self.broadcast_command('shutdown')
         self.data_server.stop_process(external_interrupt)
 
+        self._stop_data_stream_thread()
+
         self.device_manager.shutdown()
 
         self.file_manager.shutdown(umount_external=True)
 
+        self.cache_manager.shutdown()
+
+        ###    self.websocket_thread.close()
+
         self.led_thread.close()
 
         if self.mqtt_thread is not None:
             self.mqtt_thread.shutdown()
+            # self.mqtt_thread.close()
+
+    # user session
+
+    def new_user_session(self) -> str:
+        session = UserSession(None)
+
+        self._session[session.user_session] = session
+
+        self.log_info('new user session', session.user_session)
+
+        return session.user_session
+
+    @logging_info
+    def del_user_session(self, user_session: Optional[str] = None):
+        if user_session is None:
+            self._session.clear()
+
+        else:
+            try:
+                del self._session[user_session]
+            except KeyError:
+                pass
+
+    def get_user_session(self,
+                         user_session: Optional[str],
+                         new_session = False,
+                         allow_empty = False) -> Optional[UserSession]:
+        """
+
+        :param user_session: user session ID
+        :param new_session: new a user session if *user_session* not found.
+        :param allow_empty: consider empty *user_session* None
+        :return: user session
+        """
+
+        if user_session is None:
+            session = None
+
+        elif len(user_session) == 0:
+            if allow_empty:
+                session = None
+            else:
+                raise None
+
+        else:
+            session = self._session.get(user_session, None)
+
+        if session is not None:
+            session.time()
+
+        elif new_session:
+            session = UserSession(user_session)
+
+            self._session[session.user_session] = session
+
+            self.log_info('new user session', session.user_session)
+
+        return session
+
+    def expire_user_session(self):
+        current_time = time()
+
+        for user_session in list(self._session.keys()):
+            session = self._session[user_session]
+
+            if session.time(update=False) - current_time > self._user_session_expire:
+                del self._session[user_session]
+
+    # general post action
 
     def _post_device_list(self) -> List[CompletedDevice]:
         """general post action for getting list of connected devices.
@@ -748,6 +862,12 @@ class ControlServer(SocketServer, ControlServerAPI):
     def get_device_info(self, device: int) -> Optional[CompletedDevice]:
         return super().get_device_info(device)
 
+    # @logging_info
+    # def device_call(self, device: int) -> bool:
+    #     self.device_manager.call_device(device)
+    #
+    #     return True
+
     @logging_info
     def device_instruction_all(self, device: int) -> List[str]:
         return self.device_manager.list_device_instruction(device)
@@ -921,6 +1041,8 @@ class ControlServer(SocketServer, ControlServerAPI):
 
     @logging_info
     def device_parameter(self, device: int, parameter: str, content: Optional[str] = None) -> Any:
+        # if content is not None:
+        #     self.broadcast_command('parameter:' + str(device) + '/' + parameter + '/' + content)
         return self.device_manager.handle_device_parameter_command(device, parameter, content)
 
     @logging_info
@@ -1012,22 +1134,249 @@ class ControlServer(SocketServer, ControlServerAPI):
     def device_history_delete(self, user: str, device: Optional[int]) -> bool:
         raise NotImplementedError()
 
-    @logging_info
-    def run_project(self, project) -> bool:
-        if project is not None:
-            project = self._project_manager.create(project)
-            self._project_manager.run_project(project)
-        return  project.as_json()
-    
-    @logging_info
-    def stop_project(self, project) -> bool:
-        if project is not None:
-            self._project_manager.stop_project(project)
-        return True
+    # server provide method implement : file manager functions
 
     @logging_info
-    def get_running_project(self) -> bool:
-        return   self._project_manager.get()
+    def file_clean_storage(self) -> bool:
+        return super().file_clean_storage()
+
+    @logging_info
+    def file_index(self) -> RootInfo:
+        return super().file_index()
+
+    @logging_info
+    def file_list(self, path: str) -> DirectoryInfo:
+        return super().file_list(path)
+
+    @logging_info
+    def file_list_range(self, path: str, start: int, end: int) -> DirectoryInfo:
+        return super().file_list_range(path, start, end)
+
+    @logging_info
+    def file_rename(self, path: str, content: str) -> FileInfo:
+        return super().file_rename(path, content)
+
+    @logging_info
+    def file_mkdir(self, path: str) -> DirectoryInfo:
+        return super().file_mkdir(path)
+
+    @logging_info
+    def file_delete(self, path: str) -> bool:
+        return super().file_delete(path)
+
+    @logging_info
+    def file_info(self, path: str) -> FileInfo:
+        return super().file_info(path)
+
+    @logging_info
+    def file_meta_info(self, path: str) -> RecordingMetaFile:
+        return super().file_meta_info(path)
+
+    @logging_info
+    def file_export_info(self, path: str) -> Dict[str, Optional[Path]]:
+        return super().file_export_info(path)
+
+    @logging_info
+    def file_export_functions(self) -> Tuple[ExternalExportFunction, ...]:
+        return super().file_export_functions()
+
+    @logging_info
+    def file_export_parameters(self, ftype: str) -> Tuple[ExternalParameter, ...]:
+        return super().file_export_parameters(ftype)
+
+    @logging_info
+    def file_export(self, ftype: str, path: str, **options: str) -> str:
+        return super().file_export(ftype, path, **options)
+
+    @logging_info
+    def file_segment(self, method: str, path: str) -> Union[None, bool, FileSegment]:
+        return super().file_segment(method, path)
+
+    @logging_info
+    def file_segment_get(self, segment: int, path: str):
+        return super().file_segment_get(segment, path)
+
+    @logging_info
+    def file_handle_open(self, content: str) -> Optional[FileHandle]:
+        info = self.file_manager.info(content)
+        meta = info.meta_file
+
+        if meta is None:
+            raise RuntimeError('not a meta file')
+
+        handle = self.cache_manager.file_open(meta)
+
+        return self.file_handle_info(handle)
+
+    @logging_info
+    def file_handle_info(self, handle: int) -> Optional[FileHandle]:
+        info = self.cache_manager.file_info(handle)
+
+        if info is None:
+            return None
+
+        # modify file path
+        info.shadow_path(self.file_manager.shadow_path(Path(info.filepath)))
+
+        return info
+
+    @logging_info
+    def file_handle_close(self, handle: int):
+        self.cache_manager.file_close(handle)
+
+    @logging_info
+    def user_all(self) -> List[str]:
+        raise super().user_all()
+
+    @logging_info
+    def user_info(self, user: str, *, user_session: Optional[str] = None) -> Optional[AbstractUserSetting]:
+        return super().user_info(user, user_session=user_session)
+
+    @logging_info
+    def user_login(self, user: str, content: str, *,
+                   user_session = None) -> ComplexResponse[AbstractUserSetting]:
+        raise super().user_login(user, content, user_session=user_session)
+
+    @logging_info
+    def user_logout(self, user_session: Optional[str] = None) -> None:
+        super().user_logout(user_session)
+
+    @logging_info
+    def user_add(self, user: str, content: str, *,
+                 user_session = None) -> ComplexResponse[AbstractUserSetting]:
+        return super().user_add(user, content, user_session=user_session)
+
+    @logging_info
+    def user_del(self, user: str, content: str) -> bool:
+        return super().user_del(user, content)
+
+    @logging_info
+    def user_sync(self, user_session: Optional[str]) -> bool:
+        return super().user_sync(user_session)
+
+    @logging_info
+    def user_configuration_list(self, user_session: Optional[str], **options: str) -> List[str]:
+        return super().user_configuration_list(user_session, **options)
+
+    @logging_info
+    def user_configuration_get(self, name: str, user_session: Optional[str] = None) -> Optional[RecordingMetaFile]:
+        return super().user_configuration_get(name, user_session)
+
+    @logging_info
+    def user_configuration_add(self, name: str, content: str, user_session: Optional[str] = None) -> bool:
+        return super().user_configuration_add(name, content, user_session)
+
+    @logging_info
+    def user_configuration_del(self, name: str, user_session: Optional[str] = None) -> bool:
+        return super().user_configuration_del(name, user_session)
+
+    @logging_info
+    def user_configuration_clone(self, name: str, content: str, user_session: Optional[str] = None) -> bool:
+        return super().user_configuration_clone(name, content, user_session)
+
+    @logging_info
+    def user_setup_list(self, user_session: Optional[str] = None) -> List[str]:
+        return super().user_setup_list(user_session)
+
+    @logging_info
+    def user_setup_info(self, name: str, user_session: Optional[str] = None) -> Optional[UserSetup]:
+        return super().user_setup_info(name, user_session)
+
+    @logging_info
+    def user_setup_new(self, name: str, user_session: Optional[str] = None) -> Optional[UserSetup]:
+        return super().user_setup_new(name, user_session)
+
+    @logging_info
+    def user_setup_del(self, name: str, user_session: Optional[str] = None) -> bool:
+        return super().user_setup_del(name, user_session)
+
+    @logging_info
+    def user_alias_list(self, user_session: Optional[str] = None) -> List[UserDeviceAlias]:
+        return super().user_alias_list(user_session)
+
+    @logging_info
+    def user_alias_info(self, name: str, user_session: Optional[str] = None) -> Optional[UserDeviceAlias]:
+        return super().user_alias_info(name, user_session)
+
+    @logging_info
+    def user_alias_edit(self, name: str, content: str, user_session: Optional[str] = None) -> Optional[UserDeviceAlias]:
+        return super().user_alias_edit(name, content, user_session)
+
+    # @logging_info
+    # def exp_pro_list(self) -> List[ExpProtocolInfo]:
+    #     return self.exp_manager.list_available_protocol()
+
+    @logging_info
+    def exp_pro_create(self, content: str, *,
+                       user_session = None) -> int:
+        user_name = self._session_user_name(user_session)
+
+        if user_name is None:
+            raise RuntimeError('require user login')
+
+        self.file_manager.user_setting.user_info(user_name)
+
+        # p = self.exp_manager.create_protocol(content, user_name)
+        return
+
+    # @logging_info
+    # def exp_pro_options(self, protocol: int) -> List[ExpOption]:
+    #     return self.exp_manager.protocol_options(protocol)
+
+    # @logging_info
+    # def exp_pro_option(self, protocol: int, option: str, content: Optional[str] = None) -> bool:
+    #     if content == '':
+    #         # option reset
+    #         if option == '':
+    #             # reset all options
+    #             self.exp_manager.protocol_reset(protocol)
+    #         else:
+    #             self.exp_manager.protocol_reset(protocol, *option.split(','))
+    #     else:
+    #         # option get/set
+    #         self.exp_manager.protocol_option(protocol, option, content)
+
+    #     return True
+
+    # @logging_info
+    # def exp_pro_status_all(self) -> List[AbstractExpProtocolState]:
+    #     ret = []
+
+    #     for p in self.exp_manager.list_protocol():
+    #         s = self.exp_manager.protocol_status(p)
+
+    #         if s is not None:
+    #             ret.append(s)
+    #         else:
+    #             ret.append(AbstractExpProtocolState(p))
+
+    #     return ret
+
+    # @logging_info
+    # def exp_pro_status(self, protocol: int) -> Optional[ExpProtocolState]:
+    #     return self.exp_manager.protocol_status(protocol)
+
+    # @logging_info
+    # def exp_pro_command(self, protocol: int, content: str) -> bool:
+    #     if content == 'ensure':
+    #         return self.exp_manager.ensure_protocol(protocol)
+
+    #     elif content == 'start':
+    #         self.exp_manager.submit_protocol(protocol)
+
+    #     elif content == 'interrupt':
+    #         self.exp_manager.interrupt_protocol(protocol)
+
+    #     elif content == 'suspend':
+    #         self.exp_manager.suspend_protocol(protocol)
+
+    #     elif content == 'resume':
+    #         self.exp_manager.resume_protocol(protocol)
+
+    #     else:
+    #         raise RuntimeError('unknown protocol command : ' + content)
+
+    #     return True
 
     @logging_info
     def device_internal_command(self, device: int, oper: str, value: Any) -> bool:
@@ -1044,6 +1393,8 @@ class ControlServer(SocketServer, ControlServerAPI):
             return True
 
         elif oper == InternalInstruction.PREDEFINED_DISABLE_CACHE:
+            if device is not None:
+                self._device_set_disable_cache(device, value)
             return True
 
         else:
@@ -1095,6 +1446,10 @@ class ControlServer(SocketServer, ControlServerAPI):
 
     def _device_set_sync(self, device: CompletedDevice, sync: bool):
         if sync:
+            self.log_verbose('start sync', device.device_id)
+
+            self.cache_manager.drop_data(device)
+
             client = self.data_server.client()
             if client is not None:
                 info = self.file_manager.use(device)
@@ -1105,14 +1460,22 @@ class ControlServer(SocketServer, ControlServerAPI):
                         filename = format_filename(self.TEMP_FILENAME_EXPR, device)
                         info = self.file_manager.save(device, filename)
                         client.update_device_configuration(device, info.meta_file, RawDataDecoder())
+                        print('***456')
 
                     if self._device_instruction_group is None:
                         client.start_sync(device)
-                    
-                    device.status = 1
-        else:
+
             if self._device_instruction_group is None:
+                # broadcast
+                self.broadcast_command(DataMessage.start(device.device_id))
+
+        else:
+            self.log_verbose('stop sync', device.device_id)
+
+            if self._device_instruction_group is None:
+
                 start_sync = False
+
                 client = self.data_server.client()
                 if client is not None:
                     with client:
@@ -1125,10 +1488,12 @@ class ControlServer(SocketServer, ControlServerAPI):
                 if start_sync:
                     # unset file info, but keep file path cache
                     self.file_manager.unset(device.device_id)
-                    device.status = 0
 
+                    # broadcast
+                    self.broadcast_command(DataMessage.stop(device.device_id))
 
     # server provide method implement : websocket broadcast functions
+
     @logging_info
     def broadcast_command(self, command: str, device: Optional[int] = None):
         self.log_verbose(pc('broadcast_command', GREEN),
@@ -1138,6 +1503,96 @@ class ControlServer(SocketServer, ControlServerAPI):
         if self.mqtt_thread is not None:
             self.mqtt_thread.broadcast_command(command, device=device)
 
+    # data stream thread
+
+    def data_request_stream(self, start: bool, handler: DataMessageHandler):
+        if start:
+            t = self._start_data_stream_thread()
+            t.add_handle(handler)
+
+        else:
+            t = self._data_stream_thread
+
+            if t is not None:
+                t.del_handle(handler)
+
+                if not t.has_handle():
+                    self._stop_data_stream_thread()
+
+    def _start_data_stream_thread(self) -> DataStreamThread:
+        t = self._data_stream_thread
+
+        if self._data_stream_thread is None:
+            self._data_stream_thread = t = self.run_thread(DataStreamThread(self))
+
+        return t
+
+    def _stop_data_stream_thread(self):
+        t = self._data_stream_thread
+        self._data_stream_thread = None
+
+        if t is not None:
+            t.close()
+
+    # noinspection PyShadowingNames
+    @logging_info
+    def websocket_command(self, command: str) -> Union[None, str, bytes, List[str]]:
+        if command == DataMessage.GREETING:
+            return DataMessage.greeting()
+
+        elif command == DataMessage.SYNC:
+            return self._websocket_command_sync(map(lambda d: d.device_id, self._post_device_list()))
+
+        elif command.startswith(DataMessage.SYNC):
+            _, device_list = part_suffix(command, ':')
+
+            if ',' in device_list:
+                return self._websocket_command_sync(map(int, device_list.split(',')))
+
+            else:
+                return self._websocket_command_sync([int(device_list)])
+
+        elif command.startswith(DataMessage.BROADCAST):
+            _, message = part_suffix(command, ':')
+
+            if message is not None:
+                self.broadcast_command(DataMessage.broadcast(message))
+
+        return None
+
+    # noinspection PyShadowingNames
+    def _websocket_command_sync(self, device_list: Iterable[int]) -> Union[str, List[str]]:
+        client = self.data_server.client()
+
+        if client is None:
+            return DataMessage.sync(False)
+
+        else:
+            result_start = []
+            result_stop = []
+
+            with client:
+                for device in device_list:
+                    if client.is_sync(device):
+                        result_start.append(device)
+                    else:
+                        result_stop.append(device)
+
+            return [DataMessage.start(result_start), DataMessage.stop(result_stop)]
+
+    # noinspection PyShadowingNames
+    def websocket_data_request(self, handler: DataMessageHandler, command: Optional[str]):
+        try:
+            self._handle_command_response(handler, command)
+
+        except (ValueError, IndexError) as e:
+            self.log_warn(e)
+            handler.on_error(DataMessage.warn(str(e)))
+
+        except BaseException as e:
+            self.log_warn(e)
+            handler.on_error(DataMessage.error(str(e)))
+
     # noinspection PyShadowingNames
     def _handle_command_response(self, handler: DataMessageHandler, command: Optional[str]):
         """
@@ -1159,7 +1614,29 @@ class ControlServer(SocketServer, ControlServerAPI):
         else:
             self.cache_manager.get_data_message(handler, response)
 
+    # server provide method implement : cache API
+
+    @logging_verbose
+    def clear(self):
+        self.cache_manager.clear()
+
+    def push_data(self, data: Union[bytes, List[bytes]]):
+        self.cache_manager.push_data(data)
+
+    @logging_verbose
+    def drop_data(self, *device: int):
+        self.cache_manager.drop_data(*device)
+
+    def stop_data(self, device: int):
+        self.cache_manager.stop_data(device)
+
+    # noinspection PyShadowingNames
+    @logging_verbose
+    def notify_data(self, device: int, message: str):
+        self.broadcast_command(message, device=device)
+
     # led function
+
     def get_led_state(self) -> str:
         return self.led_thread.state
 
@@ -1167,6 +1644,7 @@ class ControlServer(SocketServer, ControlServerAPI):
         self.led_thread.set_state(state)
 
     # hardware send test
+
     if not _RUNTIME_COMPILE:
 
         def _hardware_send_test(self, options: Dict[str, str]):
@@ -1209,9 +1687,30 @@ class ControlServer(SocketServer, ControlServerAPI):
                     'export_root':  str(self.file_manager.export_root)
                 }
 
+            if section is None or 'cache' in section:
+                ret['cache'] = {
+                    'cache_size': self.cache_manager.cache_size,
+                    'cache_time': self.cache_manager.cache_time,
+                }
+
+            # if section is None or 'websocket' in section:
+            #     ret['websocket'] = {
+            #         'address': self.websocket_thread.websocket_address,
+            #         'port':    self.websocket_thread.websocket_port,
+            #     }
+
             if section is None or 'mqtt' in section:
                 ret['mqtt'] = None if self.mqtt_thread is None else self.mqtt_thread.hardware_test()
 
+            if section is None or 'trash' in section:
+                trash_manager = self._routine_trash_thread
+
+                ret['trash'] = None if trash_manager is None else {
+                    'routine_interval': trash_manager.routine_interval,
+                    'trash_expire':     trash_manager.trash_expire,
+                    'remove_expire':    trash_manager.remove_expire,
+                }
+
             if section is None or 'led' in section:
                 ret['led'] = {
                     'state_all': list(LED.COLOR.keys()),
@@ -1339,13 +1838,7 @@ class ControlServer(SocketServer, ControlServerAPI):
         def _hardware_send_test_set(self, options: Dict[str, str]) -> bool:
             # TODO write options files
             return False
-        
-        @logging_info
-        def show_device_data(self, device: int):
-            client = self.data_server.client()
-            if client is not None:
-                with client:
-                    client.show_data(device)
+
 
 class _RandomCrashThread(ServerThread):
     def __init__(self):

python/biopro/server/recording.py

@@ -41,7 +41,7 @@ class RecordingProcess(Process):
         connect to DB and send sql command
     """
 
-    def __init__(self, client_id: str, log_verbose, device_id, queue_rec, queue_ds, queue_msg, meta_path, 
+    def __init__(self, client_id: str, log_verbose, device_id, queue_rec, queue_ds, meta_path, 
                     device_info, parameter, parent, recording_file_name, data_format,
                     mqtt_ip, mqtt_port,
                     name = 'Recording-Process', database = None):
@@ -82,7 +82,6 @@ class RecordingProcess(Process):
 
         self._queue_rec = queue_rec
         self._queue_ds = queue_ds
-        self._queue_msg = queue_msg
         self.queue_flag = True
 
         self._is_close = True
@@ -99,14 +98,6 @@ class RecordingProcess(Process):
         self._last_cnt = [-1, -1, -1, -1, -1, -1, -1, -1]
         self._wrong_cnt = 0
 
-        # elite data length
-        self._elite_data_len = 40
-        self._mem_header_len = 3
-        self._mem_tailer_len = 6
-        self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
-
-        self._decoder = self.data_format()
-        self._start_time = time()
 
     def ensure_data_format(self) -> DataDecodeFormat:
         if isinstance(self._data_format, (str, bytes)):
@@ -136,9 +127,9 @@ class RecordingProcess(Process):
             decoder._prev_data = self._prev_data
             decoder._prev_delta_time = self._prev_delta_time
             decoder._prev_time_stamp = self._prev_time_stamp
-        elif isinstance(decoder, I4V4Z4T4DataDecoder):
+        # elif isinstance(decoder, I4V4Z4T4DataDecoder):
             # get cycle_time from meta file
-            decoder._mode = self._meta_file.configuration.get_parameter('MODE')
+            # decoder._mode = self._meta_file.configuration.MODE
             # decoder._cycle_start_time = self._cycle_start_time
         elif isinstance(decoder, NeuliveThreeOneDataDecoder):
             # get amp_gain from meta file
@@ -154,8 +145,9 @@ class RecordingProcess(Process):
             decoder._prev_time_stamp = self._prev_time_stamp
         elif isinstance(decoder, EISZeroOneDataDecoder):
             # get amp_gain from meta file
-            decoder._mode = self._meta_file.configuration.get_parameter('MODE')
+
             decoder._ac_amp = self._meta_file.configuration.get_parameter('AC_AMP')
+            decoder._mode = self._meta_file.configuration.get_parameter('MODE')
             decoder._freq_start = self._meta_file.configuration.get_parameter('FREQ_START')
             decoder._freq_stop = self._meta_file.configuration.get_parameter('FREQ_STOP')
 
@@ -168,11 +160,7 @@ class RecordingProcess(Process):
         """
         q = None
         try:
-            # now = time()
             q = self._queue_rec.get()
-            # get_queue_time_cost = time() - now
-            # if get_queue_time_cost > 2:
-            #     print('get queue cost time', get_queue_time_cost)
         except:
             return False
         finally:
@@ -185,8 +173,6 @@ class RecordingProcess(Process):
                 self.final_write()
                 self.is_closed = True
                 return False
-            elif q == 'show_data':
-                self._decoder._show_data = not self._decoder._show_data
             else:
                 self.rec_update()
                 self.sync_data(q)
@@ -200,17 +186,18 @@ class RecordingProcess(Process):
         current_time = time()
         if self._timer is not None:
             if current_time - self._timer > 1.5:
-                print('time, sync_data routine_time', 'device:', self._device, datetime.now(), current_time, current_time - self._timer)
+                print('time, sync_data routine_time', current_time, current_time - self._timer)
                 self._isTimeOut = True
         self._timer = current_time
 
+        decoder = self.data_format()
         # print('sync_data')
         # print('data',data)
 
         # print('server/data', self._prev_delta_time,self._prev_time_stamp, self._prev_data)
 
         if data is None or len(data) == 0:
-            result = self._decoder.decode(b'')
+            result = decoder.decode(b'')
             if result is not None:
                 ret = result
 
@@ -224,13 +211,25 @@ class RecordingProcess(Process):
             for offset, section in self._foreach_data_section(data):
             # for section in self._neu_foreach_data_section(data):
 
-                result = self._decoder.decode(section)
+                result = decoder.decode(section)
                 # if self._isTimeOut:
                 #     try:
                 #         print('result: ', result.data_size)
                 #     except:
                 #         pass
 
+                try:
+                    if isinstance(decoder, I4V4Z4T4DataDecoder) or isinstance(decoder, EISZeroOneDataDecoder):
+                        if decoder.isFinishMode is not None and decoder.isFinishMode() == 1:
+                            content = {}
+                            content['header'] = 'device_instruction/0'
+                            content['device'] = result.device
+                            content['instruction'] = 'interrupt'
+                            self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
+                            # self.server.stop_sync(self.device)
+                except RuntimeError as e:
+                    print(e)
+
                 if result is not None:
                     ##
                     if len(self._mqtt_send_data_ch_level) == 0:
@@ -247,27 +246,9 @@ class RecordingProcess(Process):
                 self._writer.channels_update(ret[0].channels())
             self._writer.write(ret, self._mqtt_send_data_ch_level)
         # print('write time: ', time() - ctime1)
+
         # print(ret)
 
-        try:
-            time_duration = self._meta_file.configuration.get_parameter('TIME_DURATION')
-            if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
-                self._queue_msg.put(['ds', self._device, 'interrupt'])
-                return None
-
-            if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
-                if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
-                    self._queue_msg.put(['ds', self._device, 'interrupt'])
-                    return None
-                    # content = {}
-                    # content['header'] = 'device_instruction/0'
-                    # content['device'] = result.device
-                    # content['instruction'] = 'interrupt'
-                    # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
-                    # self.server.stop_sync(self.device)
-        except RuntimeError as e:
-            print(e)
-
         del ret
         del data
         return 
@@ -305,8 +286,7 @@ class RecordingProcess(Process):
                     self._last_cnt[7] = head_counter - 1
                 last_data_cnt = self._last_cnt[7]
 
-           # dont save to section when head or id is wrong
-            if (head != 255 or device_id != device or head_counter > 255 or head_counter < 0):
+            if (head != 255 or device_id != device):
                 save = False
                 last_data_cnt = last_data_cnt + 1
 
@@ -348,58 +328,61 @@ class RecordingProcess(Process):
 
         return save
 
-    def _check_jump_ram(self, raw_data: bytes, colum_now: int, colum_total: int, save: bool, device: int, data_len: int):
-        col = colum_now
-        save = False
+    def _check_jump_ram(self, raw_data: bytes, colum_now: int, colum_total: int, save: bool, device: int):
+        i = colum_now
 
-        if raw_data[col][0] != 255 or raw_data[col][3] != device:
-            return save
+        if (raw_data[i][0] == 255 and raw_data[i][3] == device):
+            if colum_total < 3: 
+                print('this ram data < 3 records, need to fix, colum_total = ', colum_total)
+                if colum_total == 1:
+                    print('raw_data[0]', raw_data[0])
 
-        if colum_total == 1:
-            print('this ram data < 3 records, colum_total = ', colum_total)
-            print('raw_data[0]', list(raw_data[0]))
-            save = True
-            # return save
+                elif colum_total == 2:
+                    print('raw_data[0]', raw_data[0])
+                    print('raw_data[1]', raw_data[1])
 
-        elif colum_total == 2:
-            print('this ram data < 3 records, colum_total = ', colum_total)
-            print('raw_data[0]', list(raw_data[0]))
-            print('raw_data[1]', list(raw_data[1]))
-            if (raw_data[col + 1][1] - raw_data[col][1] == 1) or (raw_data[col][1] == 255 and raw_data[col + 1][1] == 0):
-                save = True
+            else:
 
-        elif colum_total >= 3:
-            if (raw_data[col + 1][1] - raw_data[col][1] == 1 and raw_data[col + 2][1] - raw_data[col + 1][1] == 1) or\
-                (raw_data[col][1] == 255 and raw_data[col + 1][1] == 0 and raw_data[col + 2][1] == 1) or\
-                (raw_data[col][1] == 254 and raw_data[col + 1][1] == 255 and raw_data[col + 2][1] == 0):
-                save = True
+                if((raw_data[i + 1][1] - raw_data[i][1] == 1 and raw_data[i + 2][1] - raw_data[i + 1][1] == 1) or
+                    (raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
+                    (raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
 
-        if save == True:
-            self._skip_ram_cnt += 1
-            last_data_cnt = raw_data[col][1]
-            if (device == 4):
-                print('self._last_cnt[4]:', self._last_cnt[4], ', last_data_cnt:', last_data_cnt)
-            if (device == 5):
-                print('self._last_cnt[5]:', self._last_cnt[5], ', last_data_cnt:', last_data_cnt)
-            if (device == 6):
-                print('self._last_cnt[6]:', self._last_cnt[6], ', last_data_cnt:', last_data_cnt)
-            if (device == 7):
-                print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
-                
-            print('skip RAM, but data is right, solve data', list(raw_data[col][0:3]),'|', list(raw_data[colum_total-1][0:3]), 'skip Ram', self._skip_ram_cnt, 'times \n')
+                    if ((raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
+                        (raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
+                        print('cnt = [254, 255, 0] or [255, 0, 1]')
 
-            if (device == 4):
-                self._last_cnt[4] = last_data_cnt
+                    save = True
+                    self._skip_ram_cnt += 1
+                    last_data_cnt = raw_data[i][1]
+                    if (device == 4):
+                        print('self._last_cnt[4]:', self._last_cnt[4], ', last_data_cnt:', last_data_cnt)
+                    if (device == 5):
+                        print('self._last_cnt[5]:', self._last_cnt[5], ', last_data_cnt:', last_data_cnt)
+                    if (device == 6):
+                        print('self._last_cnt[6]:', self._last_cnt[6], ', last_data_cnt:', last_data_cnt)
+                    if (device == 7):
+                        print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
+                        
+                    print('skip RAM, but data is right, solve data', list(raw_data[i][0:3]), 'skip Ram', self._skip_ram_cnt, 'times')
+                    # print('data:')
+                    # print('|', list(raw_data[0]))
+                    # print('|', list(raw_data[1]))
+                    # print('| ... ... ...')
+                    # print('| ... ... ...')
+                    # print('|', list(raw_data[colum_total-1]))
+                    print()
 
-            elif (device == 5):
-                self._last_cnt[5] = last_data_cnt
+                    if (device == 4):
+                        self._last_cnt[4] = last_data_cnt
 
-            elif (device == 6):
-                self._last_cnt[6] = last_data_cnt
+                    elif (device == 5):
+                        self._last_cnt[5] = last_data_cnt
 
-            elif (device == 7):
-                self._last_cnt[7] = last_data_cnt
+                    elif (device == 6):
+                        self._last_cnt[6] = last_data_cnt
 
+                    elif (device == 7):
+                        self._last_cnt[7] = last_data_cnt
         return save
 
     def _neu_foreach_data_section(self, data: bytes):
@@ -514,59 +497,50 @@ class RecordingProcess(Process):
         :return:
         """
         raw_data = []
-        records = 0
-        print_flag = False
+        index = 0
+        elite_data_len = 40
+        mem_header_len = 3
+        mem_tailer_len = 8
+        single_data_len = elite_data_len + mem_header_len + mem_tailer_len
         device = self._device
-        single_data_len = self._single_data_len
-        mem_header_len = self._mem_header_len
+        print_flag = False
 
         # packet section data use two microarray 
         for i in range(0, len(data), single_data_len):
-            records = records + 1
-            raw_data.append(data[i : i + single_data_len])
-            if len(data[i : i + 10]) < 10:
-                print('data dont be package:', raw_data[records - 1], 'index:', records - 1)
-                del raw_data[records - 1]
-                records = records - 1
-
+            index = index + 1
+            for j in range(index, index + 1):
+                raw_data.append(data[i : i + single_data_len])
+                
         # check cnt
-        for i in range(records):
+        for i in range(index):  
 
             # if jump cnt, don't save data      
             save = self._check_cnt(raw_data[i], device)
 
             # # if jump Ram, also can handle data
             if save == False:
-                save = self._check_jump_ram(raw_data, i, records, save, device, single_data_len)
+                save = self._check_jump_ram(raw_data, i, index, save, device)
                             
             if (save == True):
                 section = raw_data[i]
 
-                check_sum = sum(section[0 : single_data_len - 1]) & 0b11111111
-
-                if (check_sum != section[single_data_len - 1]):
-                    print('check number not match,',
-                        list(section[0 : mem_header_len]), section[-1], '!=', check_sum, 'device:', device, ',', datetime.now())
-                    if (i-1 >= 0):
-                        print('check number not match', list(raw_data[i-1]), 'raw:', i-1)
-
-                    print('check number not match', list(raw_data[i]), 'raw:', i)
-                    
-                    if (i+1 <= records):
-                        print('check number not match', list(raw_data[i+1]), 'raw:', i+1, '\n')
-                    section = section + b'\x01'
-
-                    print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
-                    continue
-                else:
+                if (section[0 : mem_header_len] == section[single_data_len - 3: single_data_len]):
                     section = section + b'\x00'
-
-                # section = section[3:]
+                
+                else:
+                    section = section + b'\x01'
+                    print('header != tailer,', 
+                        list(section[0 : mem_header_len]), 
+                        list(section[single_data_len - 3: single_data_len]),
+                        'device:', device, ',', datetime.now())
+                    print('header != tailer', list(section), '\n')
+                
+                section = section[3:]
                 yield None, section
 
             else:
                 print_flag = True
-                print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
+                print('delete data:', list(raw_data[i]))
 
         # if print_flag:
         #     print('delete data context:')
@@ -608,7 +582,7 @@ class RecordingProcess(Process):
 
     def final_write(self):
         if self._writer is not None:
-            return self._writer.close(self._mqtt_send_data_ch_level)
+            return self._writer.close()
         else:
             return False
     

python/biopro/util/logger.py

@@ -3,7 +3,6 @@ import inspect
 import os
 import sys
 import threading as _threading
-from time import time
 from datetime import datetime
 from functools import wraps
 from typing import Any, Optional, Tuple, Union
@@ -521,17 +520,3 @@ def logging_error(f):
         return f(self, *args, **kwargs)
 
     return _logger
-
-    
-def calculate_time(time_limit=None):
-    def actual_calculate_time(func):
-        def warp(*args, **kwargs):
-            now = time()
-            func(*args, **kwargs)
-            if time_limit == None:
-                print(func.__name__,'cost:', time() - now)
-            else:
-                if time() - now > time_limit:
-                    print(func.__name__,'cost:', time() - now)
-        return warp
-    return actual_calculate_time

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

@@ -1,451 +0,0 @@
-{
-  "name": "Elite_EIS_1.1",
-  "version": "1.2.30",
-  "match_rule": {
-    "local_name_pattern": "Elite.*",
-    "major_product_number": 0,
-    "minor_product_number": 4,
-    "major_version_number": 1,
-    "minor_version_number": 1
-  },
-  "constant": {
-    "FREQ_MAX": 4294967296,
-    "VOLT_MAX": 65536,
-    "BLE_WRITE_MAX": 255,
-    "TIME_MAX": 100000
-  },
-  "parameters": {
-    "TIME_DURATION": {
-      "description": "Run duration",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        "TIME_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
-    },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
-      "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
-    },
-    "SAMPLE_RATE": {
-      "description": "data sampling rate",
-      "record_meta": true,
-      "initial": 1000,
-      "domain": [
-        1001
-      ],
-      "value": {
-        "expression": "VALUE"
-      },
-      "on_change": "set_sample_rate"
-    },
-    "AMP_GAIN": {
-      "description": "amp gain",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "MODE": {
-      "description": "working mode",
-      "record_meta": true,
-      "value": [
-        "EIS CURVE",
-        "Cyclic Voltammetry",
-        "Dev Mode"
-      ]
-    },
-    "FREQ": {
-      "description": "DPV current recording period start",
-      "record_meta": true,
-      "initial": [
-        13422819,
-        7
-      ],
-      "domain": {
-        "list": [
-          "FREQ_MAX"
-        ]
-      },
-      "value": "VALUE"
-    },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
-      "record_meta": true,
-      "initial": 13422819,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
-      "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "DELAY": {
-      "description": "Wait x peroid before start taking measurements",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        101
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AVERAGE_NUM": {
-      "description": "Number of sample used for average funciton",
-      "record_meta": true,
-      "initial": 8,
-      "value": [
-        2,
-        4,
-        8,
-        16
-      ]
-    },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
-      "record_meta": true,
-      "initial": 25,
-      "domain": [
-        2048
-      ]
-    },
-    "SCALE": {
-      "description": "Point spacing pattern",
-      "record_meta": true,
-      "initial": 0,
-      "value": [
-        0,
-        1
-      ]
-    },
-    "PPD": {
-      "description": "Point per decades",
-      "record_meta": true,
-      "initial": 10,
-      "domain": [
-        11
-      ]
-    },
-    "RTIA": {
-      "description": "High speed tia gain",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        0,
-        1,
-        2,
-        3,
-        4
-      ]
-    },
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
-      "record_meta": true,
-      "initial": 10000,
-      "domain": [
-        100001
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
-      "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"
-      ],
-      "on_change": "set_adc_gain_Vin"
-    },
-    "VOLT_INITIAL": {
-      "description": "Initial Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
-      "record_meta": true,
-      "initial": 1,
-      "domain": [
-        65536
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "BLE_WRITE": {
-      "description": "send msg to elite",
-      "domain": {
-        "list": [
-          "BLE_WRITE_MAX"
-        ]
-      },
-      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
-      "value": "VALUE"
-    },
-    "BLE_READ": {
-      "description": "receive msg from elite",
-      "domain": "int"
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "*": "start_data"
-        }
-      }
-    ],
-    "start_data": [
-      "data_format_cali",
-      "_notify(True)",
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis",
-          "1": "curve_cv3"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
-        }
-      },
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "data_format": [
-      "_data_format('EISZeroOne')",
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "_disable_cache(True)",
-          "1": "_disable_cache(True)",
-          "*": "_disable_cache(False)"
-        }
-      }
-    ],
-    "data_format_cali": [
-      "_data_format_cali('EISZeroOne')"
-    ],
-    "set_sample_rate": {
-      "type": "RIS",
-      "parameter": {
-        "va": "SAMPLE_RATE"
-      },
-      "data": [
-        "XE0;2B>va"
-      ]
-    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
-    "set_adc_gain_Vin": {
-      "type": "RIS",
-      "data": [
-        "XE1;X06;B>ADC_LEVEL_V_IN_15"
-      ]
-    },
-    "set_ctrl_highZ": {
-      "type": "RIS",
-      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
-      ]
-    },
-    "curve_eis": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
-      ]
-    },
-    "curve_eis_para2": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
-      ]
-    },
-    "curve_cv3": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
-      ]
-    },
-    "curve_cv3_para2": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
-      ]
-    },
-    "ble_instru_send": [
-      "ble_write",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "ble_write": {
-      "type": "RIS",
-      "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
-      ]
-    },
-    "dev_version": [
-      "CIS_VERSION",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "dev_battery": [
-      "CIS_VOLT",
-      "_cdr('20X>ADC_VALUE_I')"
-    ]
-  }
-}

python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json

@@ -1,451 +0,0 @@
-{
-  "name": "Elite_EIS_MINI_1.0",
-  "version": "1.2.30",
-  "match_rule": {
-    "local_name_pattern": "Elite.*",
-    "major_product_number": 0,
-    "minor_product_number": 4,
-    "major_version_number": 1,
-    "minor_version_number": 2
-  },
-  "constant": {
-    "FREQ_MAX": 4294967296,
-    "VOLT_MAX": 65536,
-    "BLE_WRITE_MAX": 255,
-    "TIME_MAX": 100000
-  },
-  "parameters": {
-    "TIME_DURATION": {
-      "description": "Run duration",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        "TIME_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
-    },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
-      "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
-    },
-    "SAMPLE_RATE": {
-      "description": "data sampling rate",
-      "record_meta": true,
-      "initial": 1000,
-      "domain": [
-        1001
-      ],
-      "value": {
-        "expression": "VALUE"
-      },
-      "on_change": "set_sample_rate"
-    },
-    "AMP_GAIN": {
-      "description": "amp gain",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "MODE": {
-      "description": "working mode",
-      "record_meta": true,
-      "value": [
-        "EIS CURVE",
-        "Cyclic Voltammetry",
-        "Dev Mode"
-      ]
-    },
-    "FREQ": {
-      "description": "DPV current recording period start",
-      "record_meta": true,
-      "initial": [
-        13422819,
-        7
-      ],
-      "domain": {
-        "list": [
-          "FREQ_MAX"
-        ]
-      },
-      "value": "VALUE"
-    },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
-      "record_meta": true,
-      "initial": 13422819,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
-      "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "DELAY": {
-      "description": "Wait x peroid before start taking measurements",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        101
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AVERAGE_NUM": {
-      "description": "Number of sample used for average funciton",
-      "record_meta": true,
-      "initial": 8,
-      "value": [
-        2,
-        4,
-        8,
-        16
-      ]
-    },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
-      "record_meta": true,
-      "initial": 25,
-      "domain": [
-        2048
-      ]
-    },
-    "SCALE": {
-      "description": "Point spacing pattern",
-      "record_meta": true,
-      "initial": 0,
-      "value": [
-        0,
-        1
-      ]
-    },
-    "PPD": {
-      "description": "Point per decades",
-      "record_meta": true,
-      "initial": 10,
-      "domain": [
-        11
-      ]
-    },
-    "RTIA": {
-      "description": "High speed tia gain",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        0,
-        1,
-        2,
-        3,
-        4
-      ]
-    },
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
-      "record_meta": true,
-      "initial": 10000,
-      "domain": [
-        100001
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
-      "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"
-      ],
-      "on_change": "set_adc_gain_Vin"
-    },
-    "VOLT_INITIAL": {
-      "description": "Initial Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
-      "record_meta": true,
-      "initial": 1,
-      "domain": [
-        65536
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "BLE_WRITE": {
-      "description": "send msg to elite",
-      "domain": {
-        "list": [
-          "BLE_WRITE_MAX"
-        ]
-      },
-      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
-      "value": "VALUE"
-    },
-    "BLE_READ": {
-      "description": "receive msg from elite",
-      "domain": "int"
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "*": "start_data"
-        }
-      }
-    ],
-    "start_data": [
-      "data_format_cali",
-      "_notify(True)",
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis",
-          "1": "curve_cv3"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
-        }
-      },
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "data_format": [
-      "_data_format('EISZeroOne')",
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "_disable_cache(True)",
-          "1": "_disable_cache(True)",
-          "*": "_disable_cache(False)"
-        }
-      }
-    ],
-    "data_format_cali": [
-      "_data_format_cali('EISZeroOne')"
-    ],
-    "set_sample_rate": {
-      "type": "RIS",
-      "parameter": {
-        "va": "SAMPLE_RATE"
-      },
-      "data": [
-        "XE0;2B>va"
-      ]
-    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
-    "set_adc_gain_Vin": {
-      "type": "RIS",
-      "data": [
-        "XE1;X06;B>ADC_LEVEL_V_IN_15"
-      ]
-    },
-    "set_ctrl_highZ": {
-      "type": "RIS",
-      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
-      ]
-    },
-    "curve_eis": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
-      ]
-    },
-    "curve_eis_para2": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
-      ]
-    },
-    "curve_cv3": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
-      ]
-    },
-    "curve_cv3_para2": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
-      ]
-    },
-    "ble_instru_send": [
-      "ble_write",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "ble_write": {
-      "type": "RIS",
-      "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
-      ]
-    },
-    "dev_version": [
-      "CIS_VERSION",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "dev_battery": [
-      "CIS_VOLT",
-      "_cdr('20X>ADC_VALUE_I')"
-    ]
-  }
-}

python/res/devlib/json/elite.devlib.json

@@ -0,0 +1,221 @@
+{
+  "name": "Elite",
+  "version": "0.1",
+  "match_rule": {
+    "local_name_pattern": "Elite.*",
+    "major_product_number": 0,
+    "minor_product_number": 1,
+    "major_version_number": 0,
+    "minor_version_number": 1
+  },
+  "constant": {
+    "REC_CHANNEL_COUNT": 16,
+    "STI_CHANNEL_COUNT": 15,
+    "ADC_SAMPLE_RATE_LIST": [
+      15,
+      25,
+      40,
+      50,
+      100,
+      250,
+      500,
+      1000,
+      2500,
+      4000,
+      5000
+    ],
+    "STI_FREQ_LIST": [
+      15,
+      25,
+      40,
+      50,
+      100,
+      250,
+      500,
+      1000,
+      2500,
+      4000,
+      5000
+    ]
+  },
+  "parameters": {
+    "MODE": {
+      "description": "working mode",
+      "value": [
+        "Recording Mode",
+        "Stimulation Mode",
+        "Artifact Mode"
+      ]
+    },
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": {
+        "set": [
+          "REC_CHANNEL_COUNT"
+        ]
+      }
+    },
+    "SAMPLE_RATE": {
+      "alias": "ADC_RATE",
+      "description": "sampling rate",
+      "record_meta": true,
+      "domain": [
+        "len(ADC_SAMPLE_RATE_LIST)"
+      ],
+      "value": "ADC_SAMPLE_RATE_LIST[VALUE]"
+    },
+    "AMP_GAIN": {
+      "description": "",
+      "record_meta": true,
+      "value": [
+        400,
+        1000,
+        2000
+      ]
+    },
+    "LOW_FREQ_BAND": {
+      "description": "",
+      "record_meta": true,
+      "domain": [
+        7
+      ]
+    },
+    "STI_MODE": {
+      "description": "stimulation mode",
+      "value": [
+        "Positive Pulse",
+        "Negative Pulse",
+        "Pos to Neg Pulse",
+        "Neg to Pos Pulse",
+        "Arbitrary Waveform"
+      ]
+    },
+    "STI_VOLT": {
+      "description": "stimulation voltage",
+      "domain": [
+        32
+      ],
+      "value": "2 + 3 * VALUE / 31"
+    },
+    "STI_FREQ": {
+      "description": "stimulation frequency",
+      "domain": [
+        "len(STI_FREQ_LIST)"
+      ],
+      "value": "STI_FREQ_LIST[VALUE]"
+    },
+    "STI_PMOS": {
+      "description": "stimulation PMOS channel",
+      "initial": 0,
+      "domain": [
+        "STI_CHANNEL_COUNT"
+      ],
+      "guard": "STI_PMOS != STI_NMOS"
+    },
+    "STI_NMOS": {
+      "description": "stimulation NMOS channel",
+      "initial": "STI_CHANNEL_COUNT - 1",
+      "domain": [
+        "STI_CHANNEL_COUNT"
+      ],
+      "guard": "STI_PMOS != STI_NMOS"
+    },
+    "CHOPPER": {
+      "description": "",
+      "domain": "bool"
+    },
+    "FAST_SETTLE": {
+      "description": "",
+      "domain": "bool"
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_recording",
+          "1": "start_stimulation",
+          "2": "start_artifact"
+        }
+      },
+      "VIS_STI"
+    ],
+    "start_recording": [
+      {
+        "expression": "len(CHANNEL) > 0",
+        "raise": "no recording channel"
+      },
+      "data_format",
+      "_notify(True)",
+      "start_recording0",
+      "_sync(True)"
+    ],
+    "start_artifact": [
+      {
+        "expression": "len(CHANNEL) > 0",
+        "raise": "no recording channel"
+      },
+      "data_format",
+      "_notify(True)",
+      "start_artifact0",
+      "_sync(True)"
+    ],
+    "data_format": [
+      "_data_format('TDC4VAF2')"
+    ],
+    "start_recording0": {
+      "type": "RIS",
+      "foreach-parameter": {
+        "parameter": "CHANNEL",
+        "variable": [
+          "a",
+          "b",
+          "c",
+          "d"
+        ]
+      },
+      "data": [
+        "3b110#recording header;2b<AMP_GAIN;3b<LOW_FREQ_BAND",
+        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
+        "4b<a?:0;4b<b?:0",
+        "4b<c?:0;4b<d?:0"
+      ]
+    },
+    "start_artifact0": {
+      "type": "RIS",
+      "foreach-parameter": {
+        "parameter": "CHANNEL",
+        "variable": [
+          "a",
+          "b",
+          "c",
+          "d"
+        ]
+      },
+      "data": [
+        "3b100#artifact mode header;2b0;3b001",
+        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
+        "4b<a?:0;4b<b?:0",
+        "4b<c?:0;4b<d?:0"
+      ]
+    },
+    "start_stimulation": [
+      "start_stimulation0"
+    ],
+    "start_stimulation0": {
+      "type": "RIS",
+      "guard": {
+        "expression": "STI_PMOS != STI_NMOS",
+        "raise": "same N/PMos channel"
+      },
+      "data": [
+        "3b111#stimulation header;2b0;3bSTI_MODE",
+        "4b>STI_FREQ;1bCHOPPER;1bFAST_SETTLE;2b0",
+        "4b<STI_PMOS;4b<STI_NMOS",
+        "5b<STI_VOLT;3b0"
+      ]
+    }
+  }
+}

python/res/devlib/json/elite_eis.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EIS_1.0",
+  "name": "EliteEIS",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -11,21 +11,9 @@
   "constant": {
     "FREQ_MAX": 4294967296,
     "VOLT_MAX": 65536,
-    "BLE_WRITE_MAX": 255,
-    "TIME_MAX": 100000
+    "BLE_WRITE_MAX": 255
   },
   "parameters": {
-    "TIME_DURATION": {
-      "description": "Run duration",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        "TIME_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
     "CHANNEL": {
       "derzteription": "record channels",
       "record_meta": true,
@@ -60,34 +48,20 @@
       "description": "working mode",
       "record_meta": true,
       "value": [
-        "EIS CURVE",
-        "Cyclic Voltammetry",
-        "Dev Mode"
+          "EIS CURVE",
+          "Cyclic Voltammetry",
+          "Dev Mode"
       ]
     },
-    "FREQ": {
-      "description": "DPV current recording period start",
-      "record_meta": true,
-      "initial": [
-        13422819,
-        7
-      ],
-      "domain": {
-        "list": [
-          "FREQ_MAX"
-        ]
-      },
-      "value": "VALUE"
-    },
     "FREQ_START": {
       "description": "Start of Freq Scan",
       "record_meta": true,
       "initial": 13422819,
       "domain": [
-        "FREQ_MAX"
+          "FREQ_MAX"
       ],
       "value": {
-        "expression": "VALUE"
+          "expression": "VALUE"
       }
     },
     "FREQ_STOP": {
@@ -95,10 +69,10 @@
       "record_meta": true,
       "initial": 7,
       "domain": [
-        "FREQ_MAX"
+          "FREQ_MAX"
       ],
       "value": {
-        "expression": "VALUE"
+          "expression": "VALUE"
       }
     },
     "DELAY": {
@@ -117,21 +91,21 @@
       "record_meta": true,
       "initial": 8,
       "value": [
-        2,
-        4,
-        8,
-        16
+          2,
+          4,
+          8,
+          16
       ]
     },
     "DC_BIAS": {
       "description": "DC voltage bias in mV",
       "record_meta": true,
-      "initial": 25000,
+      "initial": 15000,
       "domain": [
-        "VOLT_MAX"
+          35001
       ],
       "value": {
-        "expression": "VALUE"
+          "expression": "VALUE"
       }
     },
     "AC_AMP": {
@@ -139,7 +113,7 @@
       "record_meta": true,
       "initial": 25,
       "domain": [
-        2048
+          2048
       ]
     },
     "SCALE": {
@@ -147,8 +121,8 @@
       "record_meta": true,
       "initial": 0,
       "value": [
-        0,
-        1
+          0,
+          1
       ]
     },
     "PPD": {
@@ -156,7 +130,7 @@
       "record_meta": true,
       "initial": 10,
       "domain": [
-        11
+          11
       ]
     },
     "RTIA": {
@@ -164,11 +138,11 @@
       "record_meta": true,
       "initial": 4,
       "value": [
-        0,
-        1,
-        2,
-        3,
-        4
+          0,
+          1,
+          2,
+          3,
+          4
       ]
     },
     "ADC_VALUE_I": {
@@ -180,10 +154,10 @@
       "record_meta": true,
       "initial": 10000,
       "domain": [
-        100001
+          100001
       ],
       "value": {
-        "expression": "VALUE"
+          "expression": "VALUE"
       }
     },
     "CTRL_HIGH_Z_15": {
@@ -268,9 +242,9 @@
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
-        "list": [
+          "list": [
           "BLE_WRITE_MAX"
-        ]
+          ]
       },
       "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
       "value": "VALUE"
@@ -285,7 +259,7 @@
       {
         "expression": "MODE",
         "when": {
-          "*": "start_data"
+        "*": "start_data"
         }
       }
     ],
@@ -365,8 +339,8 @@
     "curve_eis": {
       "type": "RIS",
       "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
+        "fa": "FREQ_START",
+        "fb": "FREQ_STOP",
         "dp": "DELAY",
         "dc": "DC_BIAS",
         "am": "AC_AMP",
@@ -382,8 +356,8 @@
     "curve_eis_para2": {
       "type": "RIS",
       "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
+        "fa": "FREQ_START",
+        "fb": "FREQ_STOP",
         "dp": "DELAY",
         "dc": "DC_BIAS",
         "am": "AC_AMP",
@@ -424,6 +398,14 @@
         "1XD2;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
+    "VIS_CC_ZERO": [
+      "_data_format('EISZeroOne')",
+      "_disable_cache(False)",
+      "_notify(True)",
+      "VIS_CC_ZERO",
+      "_sync(True)",
+      "VIS_STI"
+    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"
@@ -448,4 +430,4 @@
       "_cdr('20X>ADC_VALUE_I')"
     ]
   }
-}
+}

python/res/devlib/json/elite_legacy.devlib.json

@@ -0,0 +1,220 @@
+{
+  "name": "Elite_Legacy",
+  "version": "0.0.0",
+  "match_rule": {
+    "major_product_number": 0,
+    "minor_product_number": 0,
+    "major_version_number": 0,
+    "minor_version_number": 0
+  },
+  "constant": {
+    "REC_CHANNEL_COUNT": 16,
+    "STI_CHANNEL_COUNT": 15,
+    "ADC_SAMPLE_RATE_LIST": [
+      15,
+      25,
+      40,
+      50,
+      100,
+      250,
+      500,
+      1000,
+      2500,
+      4000,
+      5000
+    ],
+    "STI_FREQ_LIST": [
+      15,
+      25,
+      40,
+      50,
+      100,
+      250,
+      500,
+      1000,
+      2500,
+      4000,
+      5000
+    ]
+  },
+  "parameters": {
+    "MODE": {
+      "description": "working mode",
+      "value": [
+        "Recording Mode",
+        "Stimulation Mode",
+        "Artifact Mode"
+      ]
+    },
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": {
+        "set": [
+          "REC_CHANNEL_COUNT"
+        ]
+      }
+    },
+    "SAMPLE_RATE": {
+      "alias": "ADC_RATE",
+      "description": "sampling rate",
+      "record_meta": true,
+      "domain": [
+        "len(ADC_SAMPLE_RATE_LIST)"
+      ],
+      "value": "ADC_SAMPLE_RATE_LIST[VALUE]"
+    },
+    "AMP_GAIN": {
+      "description": "",
+      "record_meta": true,
+      "value": [
+        400,
+        1000,
+        2000
+      ]
+    },
+    "LOW_FREQ_BAND": {
+      "description": "",
+      "record_meta": true,
+      "domain": [
+        7
+      ]
+    },
+    "STI_MODE": {
+      "description": "stimulation mode",
+      "value": [
+        "Positive Pulse",
+        "Negative Pulse",
+        "Pos to Neg Pulse",
+        "Neg to Pos Pulse",
+        "Arbitrary Waveform"
+      ]
+    },
+    "STI_VOLT": {
+      "description": "stimulation voltage",
+      "domain": [
+        32
+      ],
+      "value": "2 + 3 * VALUE / 31"
+    },
+    "STI_FREQ": {
+      "description": "stimulation frequency",
+      "domain": [
+        "len(STI_FREQ_LIST)"
+      ],
+      "value": "STI_FREQ_LIST[VALUE]"
+    },
+    "STI_PMOS": {
+      "description": "stimulation PMOS channel",
+      "initial": 0,
+      "domain": [
+        "STI_CHANNEL_COUNT"
+      ],
+      "guard": "STI_PMOS != STI_NMOS"
+    },
+    "STI_NMOS": {
+      "description": "stimulation NMOS channel",
+      "initial": "STI_CHANNEL_COUNT - 1",
+      "domain": [
+        "STI_CHANNEL_COUNT"
+      ],
+      "guard": "STI_PMOS != STI_NMOS"
+    },
+    "CHOPPER": {
+      "description": "",
+      "domain": "bool"
+    },
+    "FAST_SETTLE": {
+      "description": "",
+      "domain": "bool"
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_recording",
+          "1": "start_stimulation",
+          "2": "start_artifact"
+        }
+      },
+      "VIS_STI"
+    ],
+    "start_recording": [
+      {
+        "expression": "len(CHANNEL) > 0",
+        "raise": "no recording channel"
+      },
+      "data_format",
+      "_notify(True)",
+      "start_recording0",
+      "_sync(True)"
+    ],
+    "start_artifact": [
+      {
+        "expression": "len(CHANNEL) > 0",
+        "raise": "no recording channel"
+      },
+      "data_format",
+      "_notify(True)",
+      "start_artifact0",
+      "_sync(True)"
+    ],
+    "data_format": [
+      "_data_format('TC4VAF2')"
+    ],
+    "start_recording0": {
+      "type": "RIS",
+      "foreach-parameter": {
+        "parameter": "CHANNEL",
+        "variable": [
+          "a",
+          "b",
+          "c",
+          "d"
+        ]
+      },
+      "data": [
+        "3b110#recording header;2b<AMP_GAIN;3b<LOW_FREQ_BAND",
+        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
+        "4b<a?:0;4b<b?:0",
+        "4b<c?:0;4b<d?:0"
+      ]
+    },
+    "start_artifact0": {
+      "type": "RIS",
+      "foreach-parameter": {
+        "parameter": "CHANNEL",
+        "variable": [
+          "a",
+          "b",
+          "c",
+          "d"
+        ]
+      },
+      "data": [
+        "3b100#artifact mode header;2b0;3b001",
+        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
+        "4b<a?:0;4b<b?:0",
+        "4b<c?:0;4b<d?:0"
+      ]
+    },
+    "start_stimulation": [
+      "start_stimulation0"
+    ],
+    "start_stimulation0": {
+      "type": "RIS",
+      "guard": {
+        "expression": "STI_PMOS != STI_NMOS",
+        "raise": "same N/PMos channel"
+      },
+      "data": [
+        "3b111#stimulation header;2b0;3bSTI_MODE",
+        "4b>STI_FREQ;1bCHOPPER;1bFAST_SETTLE;2b0",
+        "4b<STI_PMOS;4b<STI_NMOS",
+        "5b<STI_VOLT;3b0"
+      ]
+    }
+  }
+}

python/res/devlib/json/elite_trigger.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_TRIG_0.1",
+  "name": "Elite_TRI",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Trigger.*",

python/res/devlib/json/elite_zm.devlib.json

@@ -0,0 +1,343 @@
+{
+  "name": "EliteZM",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-ZM.+",
+    "major_product_number": 0,
+    "minor_product_number": 2,
+    "major_version_number": 1,
+    "minor_version_number": 2
+  },
+  "constant": {
+    "ADC_CHANNEL_NUMBER": [
+      12,
+      13,
+      14,
+      15
+    ],
+    "VOLT_MAX": 65536,
+    "STEP_MAX": 100,
+    "Const_Current_Range": 1500001
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "CHANNEL_LABEL": {
+      "description": "channel label",
+      "record_meta": true,
+      "domain": "property",
+      "value": "['current', 'voltage', 'impedance']"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "value": [
+        100,
+        10,
+        5,
+        1,
+        0.1,
+        0.01
+      ],
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "value": [
+        "I-V Curve",
+        "Cyclic Voltammetry",
+        "Function Generator",
+        "R-T Curve",
+        "V-T Curve",
+        "I-T Curve",
+        "ADC test",
+        "Constant Current"
+      ]
+    },
+    "VOLT_ORIGIN": {
+      "description": "Origin Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE) * 0x0001"
+      }
+    },
+    "VOLT_FINAL": {
+      "description": "The last Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": " (VALUE) * 0x0001"
+      }
+    },
+    "VOLT_STEP": {
+      "description": "Voltage Step",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        "STEP_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE + 1) * 0x0001"
+      }
+    },
+    "STEP_TIME": {
+      "description": "How much time between two step",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        0.5,
+        1.0,
+        2.0
+      ]
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        200
+      ],
+      "value": {
+        "expression": "VALUE + 1"
+      }
+    },
+    "DAC_VOLT": {
+      "description": "DAC output Voltage",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        65536
+      ]
+    },
+    "ADC_CHANNEL": {
+      "description": "read ADC data",
+      "record_meta": true,
+      "value": [
+        "ANA0",
+        "ANA1",
+        "ANA2",
+        "ANA3"
+      ]
+    },
+    "ADC_LEVEL": {
+      "description": "ADC level",
+      "record_meta": true,
+      "initial": 3,
+      "value": [
+        "200k",
+        "10k",
+        "200R",
+        "auto"
+      ],
+      "on_change": "set_adc_gain"
+    },
+    "Resister_LEVEL": {
+      "description": "Resister_LEVEL",
+      "record_meta": true,
+      "initial": 3,
+      "value": [
+        "Small",
+        "Middle",
+        "Large",
+        "Auto"
+      ],
+      "on_change": "set_Resister_level"
+    },
+    "ADC_VALUE_V": {
+      "description": "ADC value voltage value",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "Const_Current_unit": {
+      "description": "Constant Current unit Setting",
+      "initial": 1,
+      "value": [
+        "uA",
+        "mA"
+      ]
+    },
+    "Const_Current_value": {
+      "description": "Constant Current value Setting",
+      "initial": 0,
+      "domain": [
+        "Const_Current_Range"
+      ],
+      "value": {
+        "expression": "(VALUE) * 0x00000001"
+      }
+    },
+    "Charge": {
+      "description": "Charge battery or not",
+      "initial": 0,
+      "value": [
+        "Charge",
+        "Discharge"
+      ]
+    },
+    "Const_Current_VStop": {
+      "description": "Constant Current Stopping Voltage",
+      "initial": 0,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE) * 0x0001"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "2": "start_fun_gen",
+          "6": "adc_test",
+          "*": "start_data"
+        }
+      }
+    ],
+    "start_fun_gen": [
+      "data_format",
+      "func_gen",
+      "VIS_STI"
+    ],
+    "adc_test": [
+      "adc_test0",
+      "_cdr('1X;4X>ADC_VALUE_I;4X>ADC_VALUE_V')"
+    ],
+    "start_data": [
+      "data_format",
+      "_notify(True)",
+      "set_sample_rate",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_iv",
+          "1": "curve_cv",
+          "3": "curve_zt",
+          "4": "curve_vt",
+          "5": "curve_it",
+          "7": "const_current"
+        }
+      },
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "data_format": [
+      "_data_format('I4V4Z4T4')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "curve_iv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN) * 0x0001",
+        "vb": "(VOLT_FINAL) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12"
+      },
+      "data": [
+        "1X10;2B>va;2B>vb;2B>dv;B>dt"
+      ]
+    },
+    "curve_cv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN) * 0x0001",
+        "vb": "(VOLT_FINAL) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12",
+        "cn": "CYCLE_NUMBER+1"
+      },
+      "data": [
+        "1X20;2B>va;2B>vb;2B>dv;B>dt;B>cn"
+      ]
+    },
+    "func_gen": {
+      "type": "RIS",
+      "parameter": {
+        "v": "(DAC_VOLT) * 0x0001"
+      },
+      "data": [
+        "X30;2B>v"
+      ]
+    },
+    "curve_zt": {
+      "type": "RIS",
+      "data": [
+        "X40"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "data": [
+        "X50"
+      ]
+    },
+    "curve_it": {
+      "type": "RIS",
+      "data": [
+        "X60"
+      ]
+    },
+    "adc_test0": {
+      "type": "RIS",
+      "data": [
+        "X90;B>ADC_LEVEL;B>ADC_CHANNEL"
+      ]
+    },
+    "set_sample_rate": {
+      "type": "RIS",
+      "data": [
+        "X70;B>SAMPLE_RATE"
+      ]
+    },
+    "set_adc_gain": {
+      "type": "RIS",
+      "data": [
+        "X80;B>ADC_LEVEL"
+      ]
+    },
+    "set_Resister_level": {
+      "type": "RIS",
+      "data": [
+        "XE0;B>Resister_LEVEL"
+      ]
+    },
+    "const_current": {
+      "type": "RIS",
+      "data": [
+        "XD0;B>Charge;2X>Const_Current_VStop;4X>Const_Current_value"
+      ]
+    }
+  }
+}
+
+

python/res/devlib/json/elite_zm_02mv.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EDC_1.4",
+  "name": "EliteZM02",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -492,6 +492,14 @@
         "1XC0;1X02;4B>ve;2B>vf;4B>vg;B>cn"
       ]
     },
+    "VIS_CC_ZERO": [
+      "_data_format('I4V4Z4T4')",
+      "_disable_cache(False)",
+      "_notify(True)",
+      "VIS_CC_ZERO",
+      "_sync(True)",
+      "VIS_STI"
+    ],
     "curve_cv3_high_cycle": {
       "type": "RIS",
       "parameter": {

python/res/devlib/json/elite_zm_15.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EDC_1.5",
+  "name": "EliteZM15",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -9,7 +9,6 @@
     "minor_version_number": 6
   },
   "constant": {
-    "TIME_MAX": 100000,
     "VOLT_MAX": 65536,
     "Const_Current_Range": 1500001,
     "BLE_WRITE_MAX": 255
@@ -18,7 +17,7 @@
     "DPV_e_init": {
       "description": "DPV initial voltage ",
       "record_meta": true,
-      "initial": 20000,
+      "initial":20000,
       "domain": [
         50001
       ],
@@ -29,7 +28,7 @@
     "DPV_e_final": {
       "description": "DPV final voltage",
       "record_meta": true,
-      "initial": 30000,
+      "initial":30000,
       "domain": [
         50001
       ],
@@ -40,7 +39,7 @@
     "DPV_e_1": {
       "description": "DPV voltage return 1",
       "record_meta": true,
-      "initial": 35000,
+      "initial":35000,
       "domain": [
         50001
       ],
@@ -51,7 +50,7 @@
     "DPV_e_2": {
       "description": "DPV voltage return 2",
       "record_meta": true,
-      "initial": 15000,
+      "initial":15000,
       "domain": [
         50001
       ],
@@ -62,7 +61,7 @@
     "DPV_amp": {
       "description": "DPV pulse amplitude",
       "record_meta": true,
-      "initial": 25125,
+      "initial":25125,
       "domain": [
         50001
       ],
@@ -73,7 +72,7 @@
     "DPV_pul_width": {
       "description": "DPV pulse width",
       "record_meta": true,
-      "initial": 50,
+      "initial":50,
       "domain": [
         1000001
       ],
@@ -84,7 +83,7 @@
     "DPV_increment": {
       "description": "DPV increment",
       "record_meta": true,
-      "initial": 25025,
+      "initial":25025,
       "domain": [
         50001
       ],
@@ -95,7 +94,7 @@
     "DPV_step_time": {
       "description": "DPV step time = time of one period",
       "record_meta": true,
-      "initial": 500,
+      "initial":500,
       "domain": [
         1000001
       ],
@@ -106,7 +105,7 @@
     "DPV_notify_rate": {
       "description": "DPV sample rate",
       "record_meta": true,
-      "initial": 1000,
+      "initial":1000,
       "domain": [
         1001
       ],
@@ -114,24 +113,10 @@
         "expression": "VALUE"
       }
     },
-    "DPV_curr_rec": {
-      "description": "DPV current recording period start",
-      "record_meta": true,
-      "initial": [
-        25,
-        100
-      ],
-      "domain": {
-        "list": [
-          101
-        ]
-      },
-      "value": "VALUE"
-    },
     "DPV_curr_rec_min": {
       "description": "DPV current recording period start",
       "record_meta": true,
-      "initial": 25,
+      "initial":25,
       "domain": [
         101
       ],
@@ -142,7 +127,7 @@
     "DPV_curr_rec_max": {
       "description": "DPV current recording period end",
       "record_meta": true,
-      "initial": 100,
+      "initial":100,
       "domain": [
         101
       ],
@@ -153,8 +138,11 @@
     "DPV_pulse_option": {
       "description": "Invert of pulse option",
       "record_meta": true,
-      "domain": "bool",
-      "initial": false
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
     },
     "DPV_mode": {
       "description": "AUTO: 0 / ADVANCED: 1/ ENGINEERING: 2",
@@ -169,29 +157,16 @@
     "DPV_engineering_enable": {
       "description": "Engineering mode switch",
       "record_meta": true,
-      "domain": "bool",
-      "initial": false
-    },
-    "V_initial": {
-      "description": "Pulse Mode Segment Voltage",
-      "record_meta": true,
-      "initial": [
-        50000,
-        25000,
-        25000,
-        25000
-      ],
-      "domain": {
-        "list": [
-          50001
-        ]
-      },
-      "value": "VALUE"
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
     },
     "V_initial_0": {
       "description": "Pulse Mode Segment Voltage 0",
       "record_meta": true,
-      "initial": 50000,
+      "initial":50000,
       "domain": [
         50001
       ],
@@ -202,7 +177,7 @@
     "V_initial_1": {
       "description": "Pulse Mode Segment Voltage 1",
       "record_meta": true,
-      "initial": 25000,
+      "initial":25000,
       "domain": [
         50001
       ],
@@ -213,7 +188,7 @@
     "V_initial_2": {
       "description": "Pulse Mode Segment Voltage 2",
       "record_meta": true,
-      "initial": 25000,
+      "initial":25000,
       "domain": [
         50001
       ],
@@ -224,7 +199,7 @@
     "V_initial_3": {
       "description": "Pulse Mode Segment Voltage 3",
       "record_meta": true,
-      "initial": 25000,
+      "initial":25000,
       "domain": [
         50001
       ],
@@ -232,26 +207,10 @@
         "expression": "VALUE"
       }
     },
-    "t_pulse": {
-      "description": "Pulse Mode Segment Duration",
-      "record_meta": true,
-      "initial": [
-        750,
-        9250,
-        1000,
-        1000
-      ],
-      "domain": {
-        "list": [
-          1000001
-        ]
-      },
-      "value": "VALUE"
-    },
     "t_pulse_0": {
       "description": "Pulse Mode Segment Duration 0",
       "record_meta": true,
-      "initial": 750,
+      "initial":750,
       "domain": [
         1000001
       ],
@@ -262,7 +221,7 @@
     "t_pulse_1": {
       "description": "Pulse Mode Segment Duration 1",
       "record_meta": true,
-      "initial": 9250,
+      "initial":9250,
       "domain": [
         1000001
       ],
@@ -273,7 +232,7 @@
     "t_pulse_2": {
       "description": "Pulse Mode Segment Duration 2",
       "record_meta": true,
-      "initial": 1000,
+      "initial":1000,
       "domain": [
         1000001
       ],
@@ -284,7 +243,7 @@
     "t_pulse_3": {
       "description": "Pulse Mode Segment Duration 3",
       "record_meta": true,
-      "initial": 1000,
+      "initial":1000,
       "domain": [
         1000001
       ],
@@ -292,40 +251,10 @@
         "expression": "VALUE"
       }
     },
-    "CURR_REC": {
-      "description": "Pulse Mode Current Recording Period",
-      "record_meta": true,
-      "initial": [
-        [
-          35,
-          90
-        ],
-        [
-          35,
-          99
-        ],
-        [
-          35,
-          95
-        ],
-        [
-          35,
-          95
-        ]
-      ],
-      "domain": {
-        "list": {
-          "list": [
-            100
-          ]
-        }
-      },
-      "value": "VALUE"
-    },
     "CURR_REC_START_0": {
       "description": "Pulse Mode Current Recording Period Start",
       "record_meta": true,
-      "initial": 35,
+      "initial":35,
       "domain": [
         100
       ],
@@ -336,7 +265,7 @@
     "CURR_REC_START_1": {
       "description": "Pulse Mode Current Recording Period Start",
       "record_meta": true,
-      "initial": 35,
+      "initial":35,
       "domain": [
         100
       ],
@@ -347,7 +276,7 @@
     "CURR_REC_START_2": {
       "description": "Pulse Mode Current Recording Period Start",
       "record_meta": true,
-      "initial": 35,
+      "initial":35,
       "domain": [
         100
       ],
@@ -358,7 +287,7 @@
     "CURR_REC_START_3": {
       "description": "Pulse Mode Current Recording Period Start",
       "record_meta": true,
-      "initial": 35,
+      "initial":35,
       "domain": [
         100
       ],
@@ -369,7 +298,7 @@
     "CURR_REC_END_0": {
       "description": "Pulse Mode Current Recording Period End",
       "record_meta": true,
-      "initial": 90,
+      "initial":90,
       "domain": [
         100
       ],
@@ -380,7 +309,7 @@
     "CURR_REC_END_1": {
       "description": "Pulse Mode Current Recording Period End",
       "record_meta": true,
-      "initial": 99,
+      "initial":99,
       "domain": [
         100
       ],
@@ -391,7 +320,7 @@
     "CURR_REC_END_2": {
       "description": "Pulse Mode Current Recording Period End",
       "record_meta": true,
-      "initial": 95,
+      "initial":95,
       "domain": [
         100
       ],
@@ -402,7 +331,7 @@
     "CURR_REC_END_3": {
       "description": "Pulse Mode Current Recording Period End",
       "record_meta": true,
-      "initial": 95,
+      "initial":95,
       "domain": [
         100
       ],
@@ -410,40 +339,6 @@
         "expression": "VALUE"
       }
     },
-    "segment_ui_order": {
-      "description": "Pulse Mode Segment Order",
-      "record_meta": true,
-      "initial": [
-        0,
-        1,
-        -1,
-        -1
-      ],
-      "domain": {
-        "list": [
-          -1,
-          6
-        ]
-      },
-      "value": "VALUE"
-    },
-    "segment_order": {
-      "description": "Pulse Mode Segment Order",
-      "record_meta": true,
-      "initial": [
-        0,
-        1,
-        -1,
-        -1
-      ],
-      "domain": {
-        "list": [
-          -1,
-          6
-        ]
-      },
-      "value": "VALUE"
-    },
     "segment_ui_order_0": {
       "description": "Pulse Mode Segment UI Order 0, value: segment ID + 1",
       "record_meta": true,
@@ -583,14 +478,13 @@
         "Constant Current",
         "Cyclic Voltammetry",
         "Linear Sweep Voltammetry",
-        "Chronoamperometric",
+        "Chronoamperometric Graph",
         "Cali DAC - test",
         "Cali ADC - test",
         "Dev Mode",
         "Open Circuit Potential",
         "Pulse Sensing",
-        "Differential Pulse Voltammetry (DPV)",
-        "Chronopotentiometry"
+	      "Differential Pulse Voltammetry (DPV)"
       ]
     },
     "VOLT_ORIGIN": {
@@ -750,7 +644,7 @@
     },
     "CURRNET_LIMIT_VALUE": {
       "description": "Current value Setting",
-      "initial": 1500000,
+      "initial":1500000,
       "domain": [
         "Const_Current_Range"
       ],
@@ -791,15 +685,6 @@
         "expression": "VALUE"
       }
     },
-    "CC_CP_SPEED": {
-      "description": "charge speed for CC and CP mode",
-      "initial": 1,
-      "value": [
-        "low",
-        "normal",
-        "high"
-      ]
-    },
     "ADC_LEVEL_I_15": {
       "description": "ADC level",
       "record_meta": true,
@@ -877,17 +762,6 @@
         "s",
         "ms"
       ]
-    },
-    "TIME_DURATION": {
-      "description": "Run duration",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        "TIME_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
     }
   },
   "instruction": {
@@ -938,8 +812,7 @@
           "7": "set_adc_gain_I",
           "8": "set_adc_gain_I",
           "9": "set_adc_gain_I",
-          "13": "set_adc_gain_I",
-          "16": "set_adc_gain_I"
+          "13": "set_adc_gain_I"
         }
       },
       {
@@ -954,8 +827,7 @@
           "7": "set_adc_gain_Vin",
           "8": "set_adc_gain_Vin",
           "9": "set_adc_gain_Vin",
-          "13": "set_adc_gain_Vin",
-          "16": "set_adc_gain_Vin"
+          "13": "set_adc_gain_Vin"
         }
       },
       {
@@ -973,8 +845,7 @@
           "9": "curve_const_vscan",
           "13": "curve_ocp",
           "14": "curve_pulse_sensing",
-          "15": "curve_dpv",
-          "16": "curve_cp"
+          "15": "curve_dpv"
         }
       },
       {
@@ -1058,7 +929,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME",
+        "vd": "STEP_TIME * 0x12",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +950,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME",
+        "vd": "STEP_TIME * 0x12",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1172,7 +1043,6 @@
         "vb": "Const_Current_value",
         "vc": "VOLTSTOP_MAX",
         "vd": "VOLTSTOP_MIN",
-        "ve": "CC_CP_SPEED",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1184,31 +1054,7 @@
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
-        "2B>pe;",
-        "4b>0b0001;4b>ve"
-      ]
-    },
-    "curve_cp": {
-      "type": "RIS",
-      "parameter": {
-        "va": "Charge",
-        "vb": "Const_Current_value",
-        "vc": "VOLTSTOP_MAX",
-        "vd": "VOLTSTOP_MIN",
-        "ve": "CC_CP_SPEED",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
-        "pc": "DAC_LEVEL_V_OUT_15",
-        "pd": "CTRL_HIGH_Z_15",
-        "pe": "SAMPLE_RATE"
-      },
-      "data": [
-        "X07;",
-        "B>va;4B>vb;2B>vc;2B>vd;",
-        "4b>pa;4b>pb;",
-        "4b>pc;4b>pd;",
-        "2B>pe;",
-        "4b>0b0000;4b>ve"
+        "2B>pe"
       ]
     },
     "curve_cv3": {
@@ -1334,67 +1180,58 @@
     },
     "curve_pulse_sensing": [
       {
-        "expression": "segment_ui_order[0]",
+        "expression": "segment_ui_order_0",
         "when": {
-          "0": "pul_sen_segment_0",
-          "1": "pul_sen_segment_1",
-          "2": "pul_sen_segment_2",
-          "3": "pul_sen_segment_3"
+          "1": "pul_sen_segment_0",
+          "2": "pul_sen_segment_1",
+          "3": "pul_sen_segment_2",
+          "4": "pul_sen_segment_3"
         }
       },
       {
-        "expression": "segment_ui_order[1]",
+        "expression": "segment_ui_order_1",
         "when": {
-          "0": "pul_sen_segment_0",
-          "1": "pul_sen_segment_1",
-          "2": "pul_sen_segment_2",
-          "3": "pul_sen_segment_3"
+          "1": "pul_sen_segment_0",
+          "2": "pul_sen_segment_1",
+          "3": "pul_sen_segment_2",
+          "4": "pul_sen_segment_3"
         }
       },
       {
-        "expression": "segment_ui_order[2]",
+        "expression": "segment_ui_order_2",
         "when": {
-          "0": "pul_sen_segment_0",
-          "1": "pul_sen_segment_1",
-          "2": "pul_sen_segment_2",
-          "3": "pul_sen_segment_3"
+          "1": "pul_sen_segment_0",
+          "2": "pul_sen_segment_1",
+          "3": "pul_sen_segment_2",
+          "4": "pul_sen_segment_3"
         }
       },
       {
-        "expression": "segment_ui_order[3]",
+        "expression": "segment_ui_order_3",
         "when": {
-          "0": "pul_sen_segment_0",
-          "1": "pul_sen_segment_1",
-          "2": "pul_sen_segment_2",
-          "3": "pul_sen_segment_3"
+          "1": "pul_sen_segment_0",
+          "2": "pul_sen_segment_1",
+          "3": "pul_sen_segment_2",
+          "4": "pul_sen_segment_3"
         }
       },
       "pul_sen_start"
     ],
     "pul_sen_start": {
       "type": "RIS",
-      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
-        "pc": "DAC_LEVEL_V_OUT_15",
-        "pd": "CTRL_HIGH_Z_15",
-        "pe": "SAMPLE_RATE"
-      },
       "data": [
         "1X0D;",
-        "1XFF",
-        "4b>pa;4b>pb;",
-        "4b>pc;4b>pd"
+        "1XFF"
       ]
     },
     "pul_sen_segment_0": {
       "type": "RIS",
       "parameter": {
-        "va": "V_initial[0]",
-        "vb": "t_pulse[0]",
-        "vc": "CURR_REC[0][0]",
-        "vd": "CURR_REC[0][1]",
-        "ve": "segment_order.index(segment_order[0])",
+        "va": "V_initial_0",
+        "vb": "t_pulse_0",
+        "vc": "CURR_REC_START_0",
+        "vd": "CURR_REC_END_0",
+        "ve": "segment_order_0 - 1",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1410,11 +1247,11 @@
     "pul_sen_segment_1": {
       "type": "RIS",
       "parameter": {
-        "va": "V_initial[1]",
-        "vb": "t_pulse[1]",
-        "vc": "CURR_REC[1][0]",
-        "vd": "CURR_REC[1][1]",
-        "ve": "segment_order.index(segment_order[1])",
+        "va": "V_initial_1",
+        "vb": "t_pulse_1",
+        "vc": "CURR_REC_START_1",
+        "vd": "CURR_REC_END_1",
+        "ve": "segment_order_1 - 1",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1430,11 +1267,11 @@
     "pul_sen_segment_2": {
       "type": "RIS",
       "parameter": {
-        "va": "V_initial[2]",
-        "vb": "t_pulse[2]",
-        "vc": "CURR_REC[2][0]",
-        "vd": "CURR_REC[2][1]",
-        "ve": "segment_order.index(segment_order[2])",
+        "va": "V_initial_2",
+        "vb": "t_pulse_2",
+        "vc": "CURR_REC_START_2",
+        "vd": "CURR_REC_END_2",
+        "ve": "segment_order_2 - 1",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1450,11 +1287,11 @@
     "pul_sen_segment_3": {
       "type": "RIS",
       "parameter": {
-        "va": "V_initial[3]",
-        "vb": "t_pulse[3]",
-        "vc": "CURR_REC[3][0]",
-        "vd": "CURR_REC[3][1]",
-        "ve": "segment_order.index(segment_order[3])",
+        "va": "V_initial_3",
+        "vb": "t_pulse_3",
+        "vc": "CURR_REC_START_3",
+        "vd": "CURR_REC_END_3",
+        "ve": "segment_order_3 - 1",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1467,7 +1304,9 @@
         "2B>va;4B>vb;1B>vc;1B>vd;1B>ve"
       ]
     },
-    "curve_dpv": [
+
+
+    "curve_dpv":[
       {
         "expression": "DPV_mode",
         "when": {
@@ -1515,8 +1354,8 @@
       "parameter": {
         "va": "DPV_step_time",
         "vb": "DPV_notify_rate",
-        "vc": "DPV_curr_rec[0]",
-        "vd": "DPV_curr_rec[1]"
+        "vc": "DPV_curr_rec_min",
+        "vd": "DPV_curr_rec_max"
       },
       "data": [
         "1X0E;",
@@ -1526,20 +1365,14 @@
     },
     "dpv_auto_mode_ins_final": {
       "type": "RIS",
-      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
-        "pc": "DAC_LEVEL_V_OUT_15",
-        "pd": "CTRL_HIGH_Z_15",
-        "pe": "SAMPLE_RATE"
-      },
       "data": [
         "1X0E;",
-        "1XFF;",
-        "4b>pa;4b>pb;",
-        "4b>pc;4b>pd"
+        "1XFF"
       ]
     },
+
+
+
     "dpv_advanced_mode": [
       "dpv_advanced_mode_ins_1",
       "dpv_advanced_mode_ins_2",
@@ -1579,8 +1412,8 @@
       "parameter": {
         "va": "DPV_step_time",
         "vb": "DPV_notify_rate",
-        "vc": "DPV_curr_rec[0]",
-        "vd": "DPV_curr_rec[1]"
+        "vc": "DPV_curr_rec_min",
+        "vd": "DPV_curr_rec_max"
       },
       "data": [
         "1X10;",
@@ -1604,18 +1437,9 @@
     },
     "dpv_advanced_mode_ins_final": {
       "type": "RIS",
-      "parameter": {
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
-        "pc": "DAC_LEVEL_V_OUT_15",
-        "pd": "CTRL_HIGH_Z_15",
-        "pe": "SAMPLE_RATE"
-      },
       "data": [
         "1X10;",
-        "1XFF;",
-        "4b>pa;4b>pb;",
-        "4b>pc;4b>pd"
+        "1XFF"
       ]
     },
     "dpv_engineering_mode": [
@@ -1633,6 +1457,18 @@
     "dpv_engineering_mode_advanced": [
       "dpv_advanced_mode"
     ],
+
+
+    "VIS_CC_ZERO": [
+      "_data_format('I4V4Z4T4')",
+      "_disable_cache(False)",
+      "_notify(True)",
+      "set_adc_gain_I",
+      "set_adc_gain_Vin",
+      "VIS_CC_ZERO",
+      "_sync(True)",
+      "VIS_STI"
+    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"
@@ -1663,4 +1499,6 @@
       ]
     }
   }
-}
+}
+
+

python/res/devlib/json/elite_zm_LargeCurrent.devlib.json

@@ -0,0 +1,320 @@
+{
+  "name": "EliteZML",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-ZM.+",
+    "major_product_number": 0,
+    "minor_product_number": 2,
+    "major_version_number": 1,
+    "minor_version_number": 4
+  },
+  "constant": {
+    "ADC_CHANNEL_NUMBER": [
+      12,
+      13,
+      14,
+      15
+    ],
+    "VOLT_MAX": 65536,
+    "STEP_MAX": 100,
+    "Const_Current_Range": 3000001
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "CHANNEL_LABEL": {
+      "description": "channel label",
+      "record_meta": true,
+      "domain": "property",
+      "value": "['current', 'voltage', 'impedance']"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "value": [
+        100,
+        10,
+        5,
+        1,
+        0.1,
+        0.01
+      ],
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "value": [
+        "I-V Curve",
+        "Cyclic Voltammetry",
+        "Function Generator",
+        "R-T Curve",
+        "V-T Curve",
+        "I-T Curve",
+        "ADC test",
+        "Constant Current"
+      ]
+    },
+    "VOLT_ORIGIN": {
+      "description": "Origin Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE + 1) * 0x0001"
+      }
+    },
+    "VOLT_FINAL": {
+      "description": "The last Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": " (VALUE + 1) * 0x0001"
+      }
+    },
+    "VOLT_STEP": {
+      "description": "Voltage Step",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        "STEP_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE + 1) * 0x0001"
+      }
+    },
+    "STEP_TIME": {
+      "description": "How much time between two step",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        0.5,
+        1.0,
+        2.0
+      ]
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "domain": [
+        200
+      ],
+      "value": {
+        "expression": "VALUE + 1"
+      }
+    },
+    "DAC_VOLT": {
+      "description": "DAC output Voltage",
+      "record_meta": true,
+      "domain": [
+        65536
+      ]
+    },
+    "ADC_CHANNEL": {
+      "description": "read ADC data",
+      "record_meta": true,
+      "value": [
+        "ANA0",
+        "ANA1",
+        "ANA2",
+        "ANA3"
+      ]
+    },
+    "ADC_LEVEL": {
+      "description": "ADC level",
+      "record_meta": true,
+      "value": [
+        "200k",
+        "10k",
+        "200R",
+        "auto"
+      ],
+      "on_change": "set_adc_gain"
+    },
+    "Resister_LEVEL": {
+      "description": "Resister_LEVEL",
+      "record_meta": true,
+      "value": [
+        "Small",
+        "Middle",
+        "Large",
+        "Auto"
+      ],
+      "on_change": "set_Resister_level"
+    },
+    "ADC_VALUE_V": {
+      "description": "ADC value voltage value",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "Const_Current_unit": {
+      "description": "Constant Current unit Setting",
+      "value": [
+        "uA",
+        "mA"
+      ]
+    },
+    "Const_Current_value": {
+      "description": "Constant Current value Setting",
+      "initial": 1500000,
+      "domain": [
+        "Const_Current_Range"
+      ],
+      "value": {
+        "expression": "(VALUE) * 0x00000001"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "2": "start_fun_gen",
+          "6": "adc_test",
+          "*": "start_data"
+        }
+      }
+    ],
+    "start_fun_gen": [
+      "data_format",
+      "func_gen",
+      "VIS_STI"
+    ],
+    "adc_test": [
+      "adc_test0",
+      "_cdr('1X;4X>ADC_VALUE_I;4X>ADC_VALUE_V')"
+    ],
+    "start_data": [
+      "data_format",
+      "_notify(True)",
+      "set_sample_rate",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_iv",
+          "1": "curve_cv",
+          "3": "curve_zt",
+          "4": "curve_vt",
+          "5": "curve_it",
+          "7": "const_current"
+        }
+      },
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "data_format": [
+      "_data_format('I4V4Z4T4')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "curve_iv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0001",
+        "vb": "(VOLT_FINAL + 1) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12"
+      },
+      "data": [
+        "1X10;2B>va;2B>vb;2B>dv;B>dt"
+      ]
+    },
+    "curve_cv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0001",
+        "vb": "(VOLT_FINAL + 1) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12",
+        "cn": "CYCLE_NUMBER+1"
+      },
+      "data": [
+        "1X20;2B>va;2B>vb;2B>dv;B>dt;B>CYCLE_NUMBER"
+      ]
+    },
+    "func_gen": {
+      "type": "RIS",
+      "parameter": {
+        "v": "(DAC_VOLT) * 0x0001"
+      },
+      "data": [
+        "X30;2B>v"
+      ]
+    },
+    "curve_zt": {
+      "type": "RIS",
+      "data": [
+        "X40"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "data": [
+        "X50"
+      ]
+    },
+    "curve_it": {
+      "type": "RIS",
+      "data": [
+        "X60"
+      ]
+    },
+    "adc_test0": {
+      "type": "RIS",
+      "data": [
+        "X90;B>ADC_LEVEL;B>ADC_CHANNEL"
+      ]
+    },
+    "set_sample_rate": {
+      "type": "RIS",
+      "data": [
+        "X70;B>SAMPLE_RATE"
+      ]
+    },
+    "set_adc_gain": {
+      "type": "RIS",
+      "data": [
+        "X80;B>ADC_LEVEL"
+      ]
+    },
+    "set_Resister_level": {
+      "type": "RIS",
+      "data": [
+        "XE0;B>Resister_LEVEL"
+      ]
+    },
+    "const_current": {
+      "type": "RIS",
+      "data": [
+        "XD0;4X>Const_Current_value"
+      ]
+    }
+  }
+}
+
+

python/res/devlib/json/elite_zm_SmallCurrent.devlib.json

@@ -0,0 +1,320 @@
+{
+  "name": "EliteZMS",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-ZM.+",
+    "major_product_number": 0,
+    "minor_product_number": 2,
+    "major_version_number": 1,
+    "minor_version_number": 3
+  },
+  "constant": {
+    "ADC_CHANNEL_NUMBER": [
+      12,
+      13,
+      14,
+      15
+    ],
+    "VOLT_MAX": 65536,
+    "STEP_MAX": 100,
+    "Const_Current_Range": 3000001
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "CHANNEL_LABEL": {
+      "description": "channel label",
+      "record_meta": true,
+      "domain": "property",
+      "value": "['current', 'voltage', 'impedance']"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "value": [
+        100,
+        10,
+        5,
+        1,
+        0.1,
+        0.01
+      ],
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "value": [
+        "I-V Curve",
+        "Cyclic Voltammetry",
+        "Function Generator",
+        "R-T Curve",
+        "V-T Curve",
+        "I-T Curve",
+        "ADC test",
+        "Constant Current"
+      ]
+    },
+    "VOLT_ORIGIN": {
+      "description": "Origin Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE + 1) * 0x0001"
+      }
+    },
+    "VOLT_FINAL": {
+      "description": "The last Voltage of Scan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": " (VALUE + 1) * 0x0001"
+      }
+    },
+    "VOLT_STEP": {
+      "description": "Voltage Step",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        "STEP_MAX"
+      ],
+      "value": {
+        "expression": "(VALUE + 1) * 0x0001"
+      }
+    },
+    "STEP_TIME": {
+      "description": "How much time between two step",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        0.5,
+        1.0,
+        2.0
+      ]
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "domain": [
+        200
+      ],
+      "value": {
+        "expression": "VALUE + 1"
+      }
+    },
+    "DAC_VOLT": {
+      "description": "DAC output Voltage",
+      "record_meta": true,
+      "domain": [
+        65536
+      ]
+    },
+    "ADC_CHANNEL": {
+      "description": "read ADC data",
+      "record_meta": true,
+      "value": [
+        "ANA0",
+        "ANA1",
+        "ANA2",
+        "ANA3"
+      ]
+    },
+    "ADC_LEVEL": {
+      "description": "ADC level",
+      "record_meta": true,
+      "value": [
+        "200k",
+        "10k",
+        "200R",
+        "auto"
+      ],
+      "on_change": "set_adc_gain"
+    },
+    "Resister_LEVEL": {
+      "description": "Resister_LEVEL",
+      "record_meta": true,
+      "value": [
+        "Small",
+        "Middle",
+        "Large",
+        "Auto"
+      ],
+      "on_change": "set_Resister_level"
+    },
+    "ADC_VALUE_V": {
+      "description": "ADC value voltage value",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "Const_Current_unit": {
+      "description": "Constant Current unit Setting",
+      "value": [
+        "uA",
+        "mA"
+      ]
+    },
+    "Const_Current_value": {
+      "description": "Constant Current value Setting",
+      "initial": 1500000,
+      "domain": [
+        "Const_Current_Range"
+      ],
+      "value": {
+        "expression": "(VALUE) * 0x00000001"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      {
+        "expression": "MODE",
+        "when": {
+          "2": "start_fun_gen",
+          "6": "adc_test",
+          "*": "start_data"
+        }
+      }
+    ],
+    "start_fun_gen": [
+      "data_format",
+      "func_gen",
+      "VIS_STI"
+    ],
+    "adc_test": [
+      "adc_test0",
+      "_cdr('1X;4X>ADC_VALUE_I;4X>ADC_VALUE_V')"
+    ],
+    "start_data": [
+      "data_format",
+      "_notify(True)",
+      "set_sample_rate",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_iv",
+          "1": "curve_cv",
+          "3": "curve_zt",
+          "4": "curve_vt",
+          "5": "curve_it",
+          "7": "const_current"
+        }
+      },
+      "_sync(True)",
+      "VIS_STI"
+    ],
+    "data_format": [
+      "_data_format('I4V4Z4T4')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "curve_iv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0001",
+        "vb": "(VOLT_FINAL + 1) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12"
+      },
+      "data": [
+        "1X10;2B>va;2B>vb;2B>dv;B>dt"
+      ]
+    },
+    "curve_cv": {
+      "type": "RIS",
+      "parameter": {
+        "va": "(VOLT_ORIGIN + 1) * 0x0001",
+        "vb": "(VOLT_FINAL + 1) * 0x0001",
+        "dv": "(VOLT_STEP + 1) * 0x0001",
+        "dt": "STEP_TIME * 0x12",
+        "cn": "CYCLE_NUMBER+1"
+      },
+      "data": [
+        "1X20;2B>va;2B>vb;2B>dv;B>dt;B>CYCLE_NUMBER"
+      ]
+    },
+    "func_gen": {
+      "type": "RIS",
+      "parameter": {
+        "v": "(DAC_VOLT) * 0x0001"
+      },
+      "data": [
+        "X30;2B>v"
+      ]
+    },
+    "curve_zt": {
+      "type": "RIS",
+      "data": [
+        "X40"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "data": [
+        "X50"
+      ]
+    },
+    "curve_it": {
+      "type": "RIS",
+      "data": [
+        "X60"
+      ]
+    },
+    "adc_test0": {
+      "type": "RIS",
+      "data": [
+        "X90;B>ADC_LEVEL;B>ADC_CHANNEL"
+      ]
+    },
+    "set_sample_rate": {
+      "type": "RIS",
+      "data": [
+        "X70;B>SAMPLE_RATE"
+      ]
+    },
+    "set_adc_gain": {
+      "type": "RIS",
+      "data": [
+        "X80;B>ADC_LEVEL"
+      ]
+    },
+    "set_Resister_level": {
+      "type": "RIS",
+      "data": [
+        "XE0;B>Resister_LEVEL"
+      ]
+    },
+    "const_current": {
+      "type": "RIS",
+      "data": [
+        "XD0;4X>Const_Current_value"
+      ]
+    }
+  }
+}
+
+

python/res/devlib/json/elite_zm_pulsefly.devlib.json

@@ -1,12 +1,12 @@
 {
-  "name": "Elite_MEGAFLY_0.1",
+  "name": "EliteZM_pulsefly",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
     "major_product_number": 0,
-    "minor_product_number": 6,
+    "minor_product_number": 2,
     "major_version_number": 1,
-    "minor_version_number": 0
+    "minor_version_number": 7
   },
   "constant": {
     "ADC_CHANNEL_NUMBER": [
@@ -1426,6 +1426,14 @@
         "X80;X03;B>CTRL_HIGH_Z_15"
       ]
     },
+    "VIS_CC_ZERO": [
+      "_data_format('I4V4Z4T4')",
+      "_disable_cache(False)",
+      "_notify(True)",
+      "VIS_CC_ZERO",
+      "_sync(True)",
+      "VIS_STI"
+    ],
     "pulse_fly": [
       "sti_mode",
       "gas1_mode",

run-clean-loggers.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
- find /home/pi -maxdepth 1 -type f -iname '*.out' -mtime +30 -delete