[update] check memory board version

.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,24 +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 set_project(self, project, content) -> bool:
-        raise NotImplementedError()
-    
-    def set_project_cycle(self, project, index, content) -> 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
@@ -662,7 +662,7 @@ class CC2650Device(Device):
         elif device_type == 'EISZeroOne':
             i = 0
             request_times = 0
-            while i < 13:
+            while i < 7:
                 try:
                     # send
                     code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
@@ -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

@@ -1,7 +1,6 @@
 import abc
 import struct
 import math
-import numpy
 from typing import Optional, TypeVar, Generic, Tuple, Dict, List, AnyStr
 from datetime import datetime
 
@@ -854,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__()
@@ -869,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
@@ -884,24 +881,20 @@ 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]
-        notify_one = struct.unpack('<i', data[28:32])[0]
-        notify_two = struct.unpack('<i', data[32:36])[0]
-        notify_three = struct.unpack('<i', data[36:40])[0]
-        # self._show_data = True
+        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]
+        # print('decode', list(data[20:]))
+        mem_wrong = data[20]
+        mem_retry_cnt = data[21]
+        mem_green_wrong = data[22]
+        mem_green_retry_cnt = data[23]
+        ram_num = data[24]
         broken_flag = data[-1]
 
         if (finish_mode_falg & 0b11110000 == 0b10100000):
@@ -922,15 +915,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, 
-                        '|', notify_one, '|', notify_two, '|', notify_three, 
-                        '|', 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),
@@ -938,9 +926,12 @@ 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(ram_num),
+                #       '|', '{:5}'.format(broken_flag),
                 #       '@', str(self.device), '|')
                 pass
 
@@ -955,23 +946,15 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         ret.append_data(1, voltage)
         ret.append_data(2, impedance)
         ret.append_data(3, cycle_number)
-        ret.append_data(4, notify_one)
-        ret.append_data(5, notify_two)
-        ret.append_data(6, notify_three)
-        # 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(8, ram_num)
+        # ret.append_data(9, broken_flag)
+        # ret.append_data(4, ram_num)
     
         if cycle_number != self._cycle_number:
             # notify cycle_number change
@@ -1346,8 +1329,8 @@ class EISZeroOneDataDecoder(RecDataDecoder):
     __slots__ = ('_message', '_cycle_number', '_start_return_data', '_time_stamp',
                  '_total_time_stamp', '_mode', '_cycle_start_time',
                  '_mode_stop', '_last_time_stamp', '_last_delta', '_cali_coeff',
-                 'cali_coeff', '_ac_amp', '_mode',
-                 '_last_phase', '_first_phase_flag', '_show_data')
+                 'cali_coeff', '_ac_amp', '_mode', '_freq_start', '_freq_stop',
+                 '_freq_direction', '_last_phase', '_first_phase_flag')
 
     def __init__(self, cali_coeff: bytes = None):
         super().__init__()
@@ -1362,14 +1345,15 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         self._cycle_start_time = []
         self._ac_amp: int = 0
         self._mode: int = 0
+        self._freq_start: int = 0
+        self._freq_stop: int = 0
+        self._freq_direction = 0
         self._last_phase = 0
         self._first_phase_flag = 1
 
         self._cali_coeff: Optional[bytes] = None
         self.cali_coeff: Optional[List[Tuple[int, int]]] = None
 
-        self._show_data = False
-
         if cali_coeff is not None:
             self._cali_coeff = cali_coeff
             self.cali_coeff = self._decode_cali_coeff(cali_coeff)
@@ -1378,27 +1362,12 @@ class EISZeroOneDataDecoder(RecDataDecoder):
     def _decode_cali_coeff(cali_coeff: bytes) -> Optional[List[Tuple[int, int]]]:
         if cali_coeff != b'':
             cali_table = []
+            phase_para_a = []
+            phase_para_b = []
             hsrtia_a = []
             hsrtia_b = []
             hsrtia_c = []
             hsrtia_d = []
-            phase_coeff = []
-            phase_offset = []
-            
-            # phase_coeff = [[0]*4 for i in range(4)]
-            # phase_offset = [[0]*4 for i in range(4)]
-
-            phase_coeff = numpy.zeros([4, 4], dtype = int)
-            phase_offset = numpy.zeros([4, 4], dtype = int)  
-
-            ########################################
-            # phase_coeff
-            # [[gain0, g1, g2, g3] ----->最高頻
-            #  [gain0, g1, g2, g3] ----->中頻
-            #  [gain0, g1, g2, g3] ----->低頻
-            #  [gain0, g1, g2, g3] ----->最低頻
-            # ]
-            #######################################
 
             # print('cali_coeff', cali_coeff)
             cutoff_freq = struct.unpack('>I', cali_coeff[1:5])[0] * 100     #4
@@ -1409,95 +1378,57 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             # hsrtia_160k = struct.unpack('>I', cali_coeff[8:12])[0]         #4
 
             index = 20
-            g = 0
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
+            for i in range(index, index+16, 8):
+                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
+                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0])
+
             index = 40
-            g = 0
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
+            for i in range(index, index+16, 8):
+                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
+                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0]) 
+
             #Lv[0] 160k
             index = 60
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             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])
+            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])
+            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])
+            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])
+            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])
 
-            index = 140
-            g = 1
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 160
-            g = 1
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 180
-            g = 2
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 200
-            g = 2
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 220
-            g = 3
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
-            
-            index = 240
-            g = 3
-            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            # hsrtia_a.append(struct.unpack('>I', cali_coeff[index+1:index+5])[0])
+            # hsrtia_b.append(struct.unpack('>I', cali_coeff[index+5:index+9])[0]/1e6)
+            # hsrtia_c.append(struct.unpack('>I', cali_coeff[index+9:index+13])[0]/1e5)
+            # 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('phase_coeff')
-            # print(phase_coeff)
-            # print('phase_offset')
-            # print(phase_offset)
+            # print('hsrtia_d', hsrtia_d)
+            # print('phase_para_a', phase_para_a)
+            # print('phase_para_b', phase_para_b)
 
-            cali_table.append((cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
+            cali_table.append((cutoff_freq, phase_para_a, phase_para_b, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
 
             return cali_table
         else:
@@ -1521,13 +1452,13 @@ 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]
-        gain = data[20+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        
         
         if time_stamp == 0:
@@ -1537,7 +1468,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             return None
 
         if time_stamp != 0 and self._start_return_data == True:
-            if (self._mode == 0 or self._mode == 5):
+            if (self._mode == 0):
                 time_stamp, delta, ret_get_time_stamp = self.eis_get_time_stamp(time_stamp)
             else:
                 time_stamp, delta, ret_get_time_stamp = self.get_time_stamp(time_stamp)
@@ -1546,32 +1477,31 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                 print("error timeStamp full data:", list(data), datetime.now(), '\n')
                 return None
             else:
-                if self.cali_coeff is not None and (self._mode == 0 or self._mode == 5):
+                if self.cali_coeff is not None and self._mode == 0:
+                    phase_para_a = []
+                    phase_para_b = []
                     hsrtia_a = []
                     hsrtia_b = []
                     hsrtia_c = []
                     hsrtia_d = []
-                    cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
-
+                    cutoff_freq, phase_para_a, phase_para_b, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
                     voltage_amp = round(self._ac_amp * 800 / 2047) # use UI value
+                    if (self._freq_start > self._freq_stop):
+                        self._freq_direction = 0
+                    else:
+                        self._freq_direction = 1
 
-                if (self._mode == 0 or self._mode == 5):
+                if (self._mode == 0):
                     img = ch1
                     real = ch2
                     freq = ch3
-                    fre_idx = 0
 
-                    rolloff_cali = cutoff_freq/1e5
-                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 /  rolloff_cali ** 2 / 1e4)
+                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
 
                     # if (gain == 3):
                     #     current = hsrtia_a[gain] * math.exp(hsrtia_b[gain] * voltage_mag) + hsrtia_c[gain] * math.exp(hsrtia_d[gain] * voltage_mag)
                     # else:
-                    
-                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain]
-                    # current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
-                    
-
+                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
                     # print(current)
                     # print(voltage_mag)
                     # print(hsrtia_a[gain])
@@ -1584,64 +1514,64 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     else:
                         impedance = 0
 
-                    raw_phase = math.atan2(img , real) * 180 / math.pi
+                    if (real > 0):
+                        raw_phase = math.atan(img / real) * 180 / math.pi
+                    elif (real == 0):
+                        raw_phase = 90
+                    else:
+                        raw_phase = math.atan(img / real) * 180 / math.pi + 180
 
                     if (freq >= 1000000): # 10000 Hz
-                        fre_idx = 0
+                        i = 0
                     elif (freq >= 10000): # 100 Hz
-                        fre_idx = 1
+                        i = 1
                     elif (freq >= 1000): # 10 Hz
-                        fre_idx = 2
+                        i = 2
                     elif (freq >= 1): # 0.01 Hz
-                        fre_idx = 3
+                        i = 3
                     
-                    ideal_raw_phase = phase_coeff[gain][fre_idx] /1e10 * freq + phase_offset[gain][fre_idx] / 1e6
+                    ideal_raw_phase = phase_para_a[i] /1e10 * freq + phase_para_b[i] / 1e6
+
                     phase = raw_phase - ideal_raw_phase
-                    phase = phase % 180 if phase % 180<=90 else phase % 180-180
 
-                    # last_phase_to90 = self._last_phase % 180 if self._last_phase % 180<=90 else self._last_phase % 180-180
-                    # diff = phase - last_phase_to90
-
-                    # if (self._first_phase_flag):
-                    #     # self._last_phase = phase
-                    #     self._first_phase_flag = 0
-                    # elif (abs(diff) >= 90):
-                    #     phase = self._last_phase + diff + (180 if diff<0 else-180)
-                    # else:
-                    #     phase = self._last_phase + diff
-                    # self._last_phase = phase
+                    if (self._first_phase_flag):
+                        self._last_phase = phase
+                        self._first_phase_flag = 0
+                    elif (abs(phase - self._last_phase) >= 200):
+                        phase -= 360
+                        self._last_phase = phase
 
                     imag_after_cal = impedance * math.sin(round(phase) * math.pi / 180)
                     real_after_cal = impedance * math.cos(round(phase) * math.pi / 180)
 
-                if self._show_data:
-                    if (self._mode == 0 or self._mode == 5):
-                        print('|', '{:10}'.format(time_stamp),
-                            '|', '{:5}'.format(delta),
-                            '|', '{:6}'.format(ch1),
-                            '|', '{:6}'.format(ch2),
-                            '|', '{:8}'.format(ch3 / 100),
-                            '|', '{:6}'.format(round(voltage_mag)),
-                            '|', '{:5}'.format(int(imag_after_cal)),
-                            '|', '{:5}'.format(int(real_after_cal)),
-                            '|', '{:5}'.format(round(impedance)),
-                            '|', '{:5}'.format(round(phase, 1)),
-                            '|', '{:5}'.format(round(current, 3)),
-                            '|', '{:1}'.format(gain),
-                            '|', '{:1}'.format(finishMode),
-                            '@', str(self.device), '|', flush = True)
-                        pass
-                    else:
-                        print('|', '{:10}'.format(time_stamp),
-                            '|', '{:5}'.format(delta),
-                            '|', '{:5}'.format(ch1),
-                            '|', '{:5}'.format(ch2),
-                            '|', '{:5}'.format(ch3),
-                            '|', '{:5}'.format(cycle_number),
-                            '|', '{:1}'.format(gain),
-                            '|', '{:1}'.format(finishMode),
-                            '@', str(self.device), '|', flush = True)
-                        pass
+
+                if (self._mode == 0):
+                    # print('|', '{:10}'.format(time_stamp),
+                    #     '|', '{:5}'.format(delta),
+                    #     '|', '{:6}'.format(ch1),
+                    #     '|', '{:6}'.format(ch2),
+                    #     '|', '{:8}'.format(ch3 / 100),
+                    #     '|', '{:6}'.format(round(voltage_mag)),
+                    #     '|', '{:5}'.format(int(imag_after_cal)),
+                    #     '|', '{:5}'.format(int(real_after_cal)),
+                    #     '|', '{:5}'.format(round(impedance)),
+                    #     '|', '{:5}'.format(round(phase, 1)),
+                    #     '|', '{:5}'.format(round(current, 3)),
+                    #     '|', '{:1}'.format(gain),
+                    #     '|', '{:1}'.format(finishMode),
+                    #     '@', str(self.device), '|')
+                    pass
+                else:
+                    # print('|', '{:10}'.format(time_stamp),
+                    #     '|', '{:5}'.format(delta),
+                    #     '|', '{:5}'.format(ch1),
+                    #     '|', '{:5}'.format(ch2),
+                    #     '|', '{:5}'.format(ch3),
+                    #     '|', '{:5}'.format(cycle_number),
+                    #     '|', '{:1}'.format(gain),
+                    #     '|', '{:1}'.format(finishMode),
+                    #     '@', str(self.device), '|')
+                    pass
 
         if finishMode == True:
             print("finishMode full data:", list(data), datetime.now())
@@ -1650,11 +1580,11 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             self._mode_stop = 0
 
         ret = RecordingData(self.device, int(time_stamp * 1000 / 2), 0)
-        if self._mode == 0 or self._mode == 5:                           #EIS Mode
+        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]
@@ -1663,10 +1593,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).upper()
-
     @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,13 +1082,6 @@ class CompletedDevice(Device):
         :return: parameter V value
         """
         return self._configuration.get_parameter(name, False)
-    
-    def set_multi_parameters(self, parameter):
-        if len(parameter) == 0:
-            return
-        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*
@@ -1130,11 +1102,6 @@ class CompletedDevice(Device):
                 self._parameter.set_parameter(name, value)
                 # raise RuntimeError('illegal parameter value : ' + value) from e
             else:
-                if name == 'MODE':
-                    if self.library_name.startswith('Elite_EDC') or 'EIS' in self.library_name:
-                        self.set_parameter('CTRL_HIGH_Z_15', self.get_parameter('HIGHZ_TABLE')[value])
-                        self.set_parameter('TIME_DURATION', 0)
-
                 self._parameter.set_parameter(name, value)
 
         on_change = info.on_change
@@ -1143,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
 
@@ -1287,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',
@@ -35,7 +33,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                  '_pin_ram_sel_value', '_pin_mem_sel_value', '_pin_mem_req_value',
                  '_read_green_times','_read_red_times',
                  '_elite_data_len', '_mem_header_len', '_mem_tailer_len', '_single_data_len',
-                 '_head_wrong_cnt', '_pin_busy_value')
+                 '_head_wrong_cnt')
 
     def __init__(self,
                  select: Selector,
@@ -44,17 +42,17 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._spi = HardwareImplSpiInterface(device,
                                              spi_speed=12_000_000)
 
-        self._elite_data_len = 40
+        self._elite_data_len = 120
         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] * 64
+        self._tx_buffer_header = [0] * 11
         self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
 
         # memory control pin
-        self.pin_busy: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_BZY)
+        self.pin_busy = OutputPin.get_used(P3Pin.MEM_BZY, True)
         self.pin_mem_req = OutputPin.get_used(P3Pin.MEM_REQ, False)
         self.pin_mem_sel = OutputPin.get_used(P3Pin.MEM_RST, True) # MEM_RST -> actually which memory board is assign
         self.pin_ram_sel: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_SEL) # MEM_SEL -> actually is RAM_SEL, which RAM is assign
@@ -62,7 +60,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._pin_ram_sel_value = [bool(self.pin_ram_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_sel_value = [bool(self.pin_mem_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_req_value = [bool(self.pin_mem_req) for _ in range(Selector.SIZE)]
-        self._pin_busy_value = [bool(self.pin_busy) for _ in range(Selector.SIZE)]
 
         self._read_green_times = 0
         self._read_red_times = 0
@@ -77,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
 
@@ -99,14 +94,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             self._pin_ram_sel_value[channel] = True
         return self._pin_ram_sel_value[channel]
 
-    def get_pin_busy(self):
-        channel = self.select
-        if self.pin_busy.input() == 0:
-            self._pin_busy_value[channel] = False
-        else:
-            self._pin_busy_value[channel] = True
-        return self._pin_busy_value[channel]
-
     @property
     def select(self) -> int:
         return self._selector.channel
@@ -178,56 +165,8 @@ 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)
-
-        # print('mem_req==ram_sel,[', self._pin_mem_req_value[device], ',', self._pin_ram_sel_value[device], ']')
+        self.pin_busy.output(False)
 
         rx = []
 
@@ -243,96 +182,105 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
 
             # -------------------------------------read one times-------------------------------------------
-            data = []
-            flag_print = False
-
-            data = self._spi.send_byte(tx_h)
-
-            if (data[0] != 255 or data[1] != 255 or data[2] != 255):
-                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))
-
-            data[0:3] = [255, 255, 255]
-            # ----------------------------------------------------------------------------------------------
-
-
-            # -------------------------------------read two times-------------------------------------------
             # data = []
-            # data_first = []
-            # data_second = []
             # flag_print = False
 
-            # data_first = self._spi.send_byte(tx_h)
-            # data_second = self._spi.send_byte(tx_h)
+            # data = self._spi.send_byte(tx_h)
 
-            # if (data_first[0] != 255 or data_first[1] != 255 or data_first[2] != 255):
+            # if (data[0] != 255 or data[1] != 255 or data[2] != 255):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
-            #     if (self._head_wrong_cnt[device] < 10):
+            #     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_first))
+            #         print(list(data[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))
-
-            # if (data_first[3:] == data_second[3:]):
-            #     data = data_first
-            #     data[0:3] = [255, 255, 255]
-
-            # else:
-            #     data_third = self._spi.send_byte(tx_h)
-            #     print("read data_third", data_third)
-            #     data = self.compare_green_data(data_first, data_second, data_third, len(tx_h))
+            # data[0:3] = [255, 255, 255]
             # ----------------------------------------------------------------------------------------------
 
-            green_data_section = self._compare_green_data_addr_and_flag(data, device)
+            # check comment: tail -f ~/xxx.out | grep -e "data_first" -e "data_second" -e "\[0, 0, 0, 0, 0, 0, 0\]"
+            # -------------------------------------read two times-------------------------------------------
+            data = []
+            data_first = []
+            data_second = []
+            flag_print = False
 
-            length = (green_data_section[0] << 8) | green_data_section[1]
-            header = data[15]
-            elite_data_len = data[17]
+            data_first = self._spi.send_byte(tx_h)
+            data_second = self._spi.send_byte(tx_h)
 
-            if length <= 12:
-                if length < 12:
-                    print("length < 12")
-                    print("green data print:", data, device, datetime.now())
+            if (data_first[0] != 255 or data_first[1] != 255 or data_first[2] != 255):
+                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[0:7]))
 
-                # if length == 0:
-                #     self._print_ram_all_data()
+            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[0:7]))
 
+            if (data_first[3:] == data_second[3:]):
+                data = data_first
+                data[0:3] = [255, 255, 255]
+
+            else:
+                data_third = self._spi.send_byte(tx_h)
+                print("read data_third", data_third)
+                data = self.compare_green_data(data_first, data_second, data_third, len(tx_h))
+            # ----------------------------------------------------------------------------------------------
+
+            # debug use
+            # green_data = []
+            # green_data = data
+            # print("_[Debug] @ spi green data = ", green_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
 
-            # print('data=', list(data))
-            # print('Ram:', data[62])
-
-            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
@@ -371,67 +319,29 @@ 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)
 
-        # finally:
-        #     # print("\n")
-        #     self.pin_busy.output(True)
+        finally:
+            # print("\n")
+            self.pin_busy.output(True)
 
         return bytes(rx)
 

python/biopro/impl/interface_uart.py

@@ -28,7 +28,7 @@ class UARTInterface(LowLevelHardwareInterface):
         self._serial = serial.Serial(self._port,
                                      baudrate=self._baudrate,
                                      timeout=0,
-                                     writeTimeout=1)
+                                     writeTimeout=0.01)
         # deprecate function name which change at version 3.0
         self._serial.flushInput()
         self._serial.flushOutput()

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,34 +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
-    
-    def as_json(self):
-        return {
-            'id': self._id,
-            'type': self._type,
-            'target': self._target,
-            'condition': self._condition
-        }

python/biopro/project/condition.py

@@ -1,145 +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())
-        now = round(time(), 1)
-        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)
-        time_diff = round(time() - project_start_time - delay_time, 1)
-        return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
-    
-    def after_task_run(self, **kwargs):
-        # print('relative_time_from_task', kwargs['task_start_time'],kwargs['delay_time'])
-        if len(kwargs['task_start_time']) == 0:
-            return False
-        task = kwargs['self_task']
-        running_task = kwargs['running_task']
-        task_start_time = kwargs['task_start_time'][-1]
-        delay_time = kwargs['delay_time']
-        
-        time_diff = round(time() - task_start_time - delay_time, 1)
-        # print('real_diff', time() - task_start_time - delay_time)
-        # print(task.name, task.uuid, time_diff, round(int(self._value), 1), running_task.name, running_task.uuid)
-        # if round(int(self._value), 1) == 0 and time_diff == 0.1:
-        #     return True
-        if task.uuid != running_task.uuid:
-            return False
-        return self.compareWith('bigger', time_diff, round(int(self._value), 1))
-        # return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
-    
-    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 previous_task_done(self, **kwargs):
-        running_task = kwargs['running_task']
-        self_task = kwargs['self_task']
-        # if running_task != None and self_task != None:
-        # print('\nprevious_task_done: ', running_task.status, ' ', self._active)
-        if running_task != self_task:
-            if running_task == None:
-                return True
-            if running_task.status == 2 and self._active == False:
-                # self._active = True
-                return True
-        return False
-
-    def until_button_trigger(self, **kwargs):
-        running_task = kwargs['running_task']
-        if running_task != None:
-            if running_task.button_trigger == True:
-                running_task.button_trigger = False
-                return True
-        return False 
-    
-    """ def cycle(self, **kwargs):
-        running_task = kwargs['running_task']
-        self_task = kwargs['self_task']
-        if running_task != self_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)
-
-    def as_json(self):
-        return {
-            'id': self._id,
-            'type': self._type,
-            'comparsion': self._comparsion,
-            'value': self._value,
-            'active': self._active
-        }

python/biopro/project/instruction.py

@@ -1,37 +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']))
-        self._idle_instruction = []
-    
-    @property
-    def start(self) -> list:
-        return self._start_instruction
-    
-    @property
-    def stop(self) -> list:
-        return self._stop_instruction
-
-    @property
-    def idle(self) -> list:
-        return self.idle_instruction

python/biopro/project/project.py

@@ -1,324 +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, log_verbose = None, name="project"):
-    super(Project, self).__init__(name = name)
-    self._project = project
-    self._device_manager = device_manager
-    self._mqtt_thread = mqttThread
-    self._time_interval = 0.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._cycle = []
-
-    self._count = 1 #流水號
-
-    self.log_verbose = log_verbose
-
-    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'], project['cycle'])
-      elif key == 'uuid':
-        pass
-      else:
-        setattr(self, key, value)
-      
-  def setup_device(self, device_list):
-    for device in device_list:
-      mac_address = device_list[device]['pair']
-      complete_device = self._device_manager.get_device(mac_address)
-      self._complete_device[device] = 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 cycle(self) -> list:
-    return self._cycle
-  
-  @cycle.setter
-  def cycle(self, new_cycle):
-    self._cycle = new_cycle
-
-  @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
-
-  @property
-  def running_task(self):
-    return self._task_manager.running_task
-
-  def run(self):
-      self._status = 1
-      self._start_time = time()
-      self.log_verbose('Project ' + self.name + ' start')
-      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()
-
-            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,
-              self_task = task
-            )
-
-            for condition in match_condition_list:
-              match_action_list = task.get_match_action(condition.id)
-              for action in match_action_list:
-                if action.type == 'cycle' and condition.type == 'previous_task_done':
-                  self.mqtt_thread.broadcast_command('project:task ' + task.name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-                  self._task_manager.set_running_task(task)
-                if action.type == 'cycle' and condition.type == 'until_button_trigger':
-                  self._task_manager.running_task.stop()
-
-                if self._task_manager.running_task != None:
-                  if self._task_manager.running_task.uuid == task.uuid and action.type == 'cycle' and condition.type == 'after_task_run':
-                    self._task_manager.running_task.stop()
-
-                if action.type == 'start':
-                  if 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])
-                # elif action.type == '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._count += 1
-                  # if self.check_running_task_not_run() == True:
-                  #   self._task_manager.running_task.stop()
-
-                elif action.type == 'idle':
-                  self._task_manager.running_task.stop()
-
-                instruction_set = None
-
-                if action.target is not None:
-                  device = self._complete_device[action.target]
-                  if ((action.type == 'start' and device.status == 0) or (action.type == 'stop' and device.status == 1)):
-                    self.log_verbose('Project' + self.name + 'Task ' + task.name + ' match_condition ' + condition.type + ' trigger_action ' + action.type + ' ' + str(action.target))
-                    task_info = task.get_task_info(action)
-                    instruction_set = getattr(self._instruction_set, action.type, None)
-                    
-                    # 檔名修正
-                    # device
-                    task_info['file_name'] += '#' + device.mac_address_in_str[12:].upper()
-                    # 流水號
-                    task_info['file_name'] += '#' + str(self._count)
-
-                    # 添加cycle資訊
-                    if len(self.cycle) > 0:
-                      index = self._task_manager.get_index_by_task(task)
-                      # get list of cycle determine by index of task
-                      filtered = list(filter(lambda info: self._task_manager.get_index_by_uuid(info['range'][0]) < index and self._task_manager.get_index_by_uuid(info['range'][1]) > index, self.cycle))
-                      
-                      if len(filtered) == 0:
-                        pass
-                      elif len(filtered) == 1:
-                        if filtered[0]['useID'] == True:
-                          task_info['file_name'] += '#' + str(filtered[0]['id'])
-                        else:
-                          task_info['file_name'] += '#' + str(filtered[0]['name']) + '-' + str(filtered[0]['count'])
-                      else:
-                        # if multi cycle, then sort by range from task index to cycle start index, then loop concat filename
-                        filtered.sort(key=lambda info: abs(self._task_manager.get_index_by_uuid(info['range'][0]) - index))
-                        for cycle_info in filtered:
-                          if cycle_info['useID'] == True:
-                            task_info['file_name'] += '#' + str(cycle_info['id'])
-                          else:
-                            task_info['file_name'] += '#' + str(cycle_info['name']) + '-' + str(cycle_info['count'])
-                    self.log_verbose('file name ' + task_info['file_name'])
-                    
-                  if instruction_set != None and len(task.parameter_set) > 0:
-                    if action.type == 'start':
-                      self._count += 1
-                    for instruction in instruction_set:
-                      print('instruction 1', device, instruction, datetime.now())
-                      args = list(map(lambda arg: task_info[arg], instruction['arguments']))
-                      target=getattr(device, instruction['method'])(*args)
-                      print('instruction 2', device, instruction, datetime.now())
-            
-            delay_time += (time() - now)
-
-        # check task not running then stop
-        if self.check_running_task_not_run() == True:
-          if self._task_manager.running_task.type == '':
-            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 set_content(self, content):
-    self.running_task.button_trigger = True
-  
-  def set_cycle(self, index, content):
-    # change cycle name
-    for key in content:
-      self.cycle[index][key] = content[key]
-
-    # change task name
-    # self._task_manager.get_task_by_uuid(self.cycle[index]['range'][0]).name = content['name']
-    # self._task_manager.get_task_by_uuid(self.cycle[index]['range'][1]).name = content['name']
-  
-  def check_running_task_not_run(self):
-    # if no running task
-    if self._task_manager.running_task == None:
-      return False
-    
-    # if running is cycle then no need to stop by device
-    if self._task_manager.running_task.type == 'cycle':
-      return False
-    
-    for key in self._task_manager.running_task.action:
-      # print('action key', key, self._task_manager.running_task, self._task_manager.running_task.action[key])
-      if len(self._task_manager.running_task.parameter_set) == 0 and self._task_manager.running_task.action[key]['type'] == 'stop':
-        return False
-      if len(self._task_manager.running_task.parameter_set) == 0 and self._task_manager.running_task.action[key]['type'] == 'idle':
-        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,
-      'cycle': self._cycle
-    }
-    return data

python/biopro/project/project_manager.py

@@ -1,48 +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, log_verbose = None) :
-        self._project_list = []
-        self._mqtt_thread =  mqtt_thread
-        self._device_manager = device_manager
-        self.log_verbose = log_verbose
-    
-    def create(self, project):
-      new_project = Project(project, self._device_manager, self._mqtt_thread, self.log_verbose)
-      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()
-    
-    def set_project(self, project_uuid, content):
-      _project = self.get(project_uuid)
-      _project.set_content(content)
-    
-    def set_project_cycle(self, project_uuid, index, content):
-      _project = self.get(project_uuid)
-      _project.set_cycle(index, content)

python/biopro/project/task.py

@@ -1,312 +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._uuid = None
-    self._type = None
-    self._name = None
-    self._parent = None
-    self._cycle = None
-    self._cycle_count = 0
-    self._cycle_next = None
-    self._cycle_next_uuid = None
-    self._device = None
-    self._event = None
-    self._trigger = None
-    self._parameter_set = None
-    self._condition = None
-    self._action = None
-    # -1: init 0: start(idle), 1: run, 2: close(idle)
-    self._status = 0
-    self._next = None
-
-    # action & condition info
-    self._condition_list: List[Condition] = []
-    self._action_list: List[Action] = []
-    self._instruction_list = []
-    self._record_list = []
-
-    # time info
-    self._start_time = []
-    self._idle_time = []
-    self._end_time = []
-    self._period = None
-
-    # trigger info
-    self._button_trigger = False
-
-    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 type(self):
-    return self._type
-  
-  @type.setter
-  def type(self, new_type):
-    self._type = new_type
-  
-  @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
-
-  # TODO: not sure needed?
-  @property
-  def cycle_count(self) -> int:
-    return self._cycle_count
-  
-  @cycle_count.setter
-  def cycle_count(self, new_cycle_count):
-    self._cycle_count = new_cycle_count
-    
-  @property
-  def cycle_next(self) -> str:
-    return self._cycle_next
-  
-  @cycle_next.setter
-  def cycle_next(self, new_cycle_next):
-    self._cycle_next = new_cycle_next
-
-  @property
-  def cycle_next_uuid(self) -> str:
-    return self._cycle_next_uuid
-  
-  @cycle_next_uuid.setter
-  def cycle_next_uuid(self, new_cycle_next_uuid):
-    self._cycle_next_uuid = new_cycle_next_uuid
-  
-  @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
-  
-  @property
-  def button_trigger(self) -> List:
-    return self._button_trigger
-  
-  @button_trigger.setter
-  def button_trigger(self, button_trigger):
-    self._button_trigger = button_trigger
-  
-  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 reset(self):
-    self.status = -1
-    # self.status = 0
-
-  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,
-      'parent': self.parent,
-      'instruction': _type
-    }
-  
-  def as_json(self):
-    return {
-      'id': self.id,
-      'name': self.name,
-      'parent': self.parent,
-      'type': self.type,
-      'uuid': self.uuid,  
-      'cycle': self.cycle,
-      'cycle_count': self.cycle_count,
-      'cycle_next': self.cycle_next,
-      'cycle_next_uuid': self.cycle_next_uuid,
-      '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,152 +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, cycle_list):
-      self._task_list = []
-      self._next_task = []
-      self._prev_task = None
-      self._running_task = None
-      self._cycle_list = cycle_list
-      
-      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
-
-    def get_task_by_index(self, index):
-      return self._task_list[index]
-
-    def get_task_by_uuid(self, uuid):
-      return next((x for x in self.task_list if x.uuid == uuid), None)
-    
-    def get_index_by_task(self, task):
-      return next((i for i, x in enumerate(self.task_list) if x.uuid == task.uuid), None)
-    
-    def get_index_by_uuid(self, uuid):
-      return next((i for i, x in enumerate(self.task_list) if x.uuid == uuid), None)
-
-    def check_task_is_cycle_end(self, task):
-      for index, cycle in enumerate(self._cycle_list):
-        if cycle['range'][1] == task.uuid:
-          return index
-
-    @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)
-    
-    # original version
-    """ 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 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 task
-        self._prev_task = self._running_task
-        # clear next task list
-        self._next_task.clear()
-        # set task to running_task
-        self._running_task = task
-        self._running_task.run()
-
-        # if previous task is still running, then need to close
-        if self._prev_task != None:
-          if self._prev_task.status == 1:
-            self._prev_task.stop()
-        # if reach cycle end, count < max, then go to cycle start
-        cycle_index = self.check_task_is_cycle_end(task)
-        if cycle_index is None:
-          # print('next', self._running_task.name, self._running_task.next)
-          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:
-              _task.reset()
-              self._next_task.append(_task)
-          # print('self._next_task', self._next_task)
-        else:
-          # print('cycle', self._cycle_list[cycle_index])
-          cycle = self._cycle_list[cycle_index]
-          if int(cycle['count']) < int(cycle['max']):
-            self._next_task.append(self.get_task_by_uuid(cycle['range'][0]))
-            cycle['count'] += 1
-          else:
-            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:
-                _task.reset()
-                self._next_task.append(_task)
-            cycle['count'] = 1
-
-      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