Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e4bef30be2 | |||
| 96ec0a983f | |||
| 2dd19a575f | |||
| affacfddeb | |||
| de8a6e58e4 | |||
| 390da7b004 | |||
| f8e41e9247 | |||
| 81ef9740c5 | |||
| 1d96f49f63 | |||
| 23a04d06c9 | |||
| 7c3bc2d20b | |||
| 01d1bd989c | |||
| 1dffa29658 | |||
| a0e8f9c6c4 | |||
| 9ad1f394be | |||
| 416503f7fb | |||
| d3af9e79bc | |||
| 4aa6634f1e | |||
| be36bb785c | |||
| 31b6a60046 | |||
| 12e0ec7c69 | |||
| 7087ded6d4 | |||
| cdb4ddfe04 | |||
| 9560b9e0ef | |||
| 8d68d15023 | |||
| 3ebf283c89 | |||
| a70d20c4b8 | |||
| 8be3e1fa0e | |||
| e33b4d9a21 | |||
| a38fe5066f | |||
| b6abf0885a | |||
| a3c0f1e4a3 | |||
| 6446204013 | |||
| 3b60d74c47 | |||
| d1c4b0a29f | |||
| 0034681e55 | |||
| 07a1e0f5bc | |||
| a96837a462 | |||
| 6b29f1f08e | |||
| 3f1ba0971c | |||
| 651e34d6e0 | |||
| d3621e0c9c | |||
| 0d1b1f4825 | |||
| ec0fe2ec9f | |||
| 67b645dac6 | |||
| b9dc607ac0 |
@@ -18,9 +18,10 @@ class ControllerAPI():
|
||||
@staticmethod
|
||||
def getByMac(mac_address):
|
||||
try:
|
||||
ret = requests.get(API_URL + 'api/controller/get_by_mac/' + mac_address, headers= AuthAPI.get_key())
|
||||
if ret.status_code == 200:
|
||||
return ret.json()
|
||||
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()
|
||||
except (requests.exceptions.ConnectionError, json.decoder.JSONDecodeError) as e:
|
||||
print('get controller fail', e)
|
||||
return []
|
||||
|
||||
@@ -1576,6 +1576,11 @@ class ControlAPI(metaclass=Router):
|
||||
should handle this exit code and re-run server process.
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
def run_project(self, project) -> bool:
|
||||
print('create_project', project)
|
||||
self._project_manager.create(project)
|
||||
return False
|
||||
|
||||
|
||||
# noinspection PyAbstractClass
|
||||
|
||||
@@ -315,14 +315,6 @@ class CC2650MasterDevice(MasterDevice, metaclass=abc.ABCMeta):
|
||||
|
||||
return cls.CC2650_RESET_PIN
|
||||
|
||||
@classmethod
|
||||
def get_uart_irq_pin(cls) -> OutputPin:
|
||||
if cls.CC2650_UART_IRQ is None:
|
||||
cls.CC2650_UART_IRQ = OutputPin.get_used(P3Pin.MEM_RST, initial=True)
|
||||
|
||||
return cls.CC2650_UART_IRQ
|
||||
|
||||
|
||||
class CC2650Device(Device):
|
||||
|
||||
def __init__(self,
|
||||
@@ -955,9 +947,6 @@ class CC2650SingleMasterDevice(CC2650MasterDevice, Synchronized):
|
||||
|
||||
self._cc2650.recv_util(..., when=self._cond, timeout=timeout)
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return [0]
|
||||
|
||||
@synchronized
|
||||
def scan_callback(self, callback: Callable[[DeviceResponseInfo], None], timeout=5, all_device=False) -> bool:
|
||||
if self._scan_max_time != timeout:
|
||||
@@ -1442,11 +1431,6 @@ class CC2650MultiMasterDevice(CC2650MasterDevice, Synchronized):
|
||||
super().shutdown()
|
||||
self._selector.close()
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return list(map(lambda it: it[0],
|
||||
filter(lambda it: it[1] is not None,
|
||||
enumerate(self._cc2650))))
|
||||
|
||||
def get_device(self, device: int) -> Optional[Device]:
|
||||
return self._device[device]
|
||||
|
||||
@@ -1942,10 +1926,8 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
self.log_verbose('reset (hardware)')
|
||||
|
||||
pin.output(False)
|
||||
sleep(0.1)
|
||||
|
||||
# sleep(0.001)
|
||||
pin.output(True)
|
||||
sleep(0.1)
|
||||
|
||||
@synchronized
|
||||
def reset_software(self):
|
||||
@@ -1968,9 +1950,6 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
"""initialize cc2650 (master)"""
|
||||
pass
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return [0]
|
||||
|
||||
def scan_send_ins(self):
|
||||
# send scan command
|
||||
try:
|
||||
@@ -1986,21 +1965,16 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
clean_buf = self._cc2650.receive_timeout("20B", timeout=3)
|
||||
print("clean_buf = ", clean_buf)
|
||||
|
||||
def cc2650_uart_irq(self):
|
||||
uart_irq = self.get_uart_irq_pin()
|
||||
uart_irq.output(False)
|
||||
sleep(0.001)
|
||||
uart_irq.output(True)
|
||||
# def cc2650_uart_irq(self):
|
||||
# uart_irq = self.get_uart_irq_pin()
|
||||
# uart_irq.output(False)
|
||||
# sleep(0.001)
|
||||
# uart_irq.output(True)
|
||||
|
||||
@synchronized
|
||||
def scan_callback(self, callback: Callable[[DeviceResponseInfo], None], timeout=5, all_device=False) -> bool:
|
||||
# if self._scan_max_time != timeout:
|
||||
# self.log_info('set max scan limit time', timeout)
|
||||
# self._scan_max_time = timeout
|
||||
|
||||
self._found = found = []
|
||||
self._found_with_id = []
|
||||
number_of_device = 0
|
||||
hdr_BPHS = [66, 80, 72, 83]
|
||||
scan_response: Union[Optional[tuple], Any] = None
|
||||
|
||||
@@ -2013,39 +1987,13 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
# print('send_scan', bytes(scan_ins))
|
||||
self._cc2650.send("bytes", bytes(scan_ins))
|
||||
|
||||
# for wait_scan_response in range(5):
|
||||
# try:
|
||||
# scan_response = self._cc2650.recv_uart(0.2)
|
||||
# except RecvTimeout:
|
||||
# if wait_scan_response == 4:
|
||||
# self.reset_internal()
|
||||
# self.reset_hardware()
|
||||
# self._interface.flush()
|
||||
# return True
|
||||
# else:
|
||||
# self.log_info("wait for scan response")
|
||||
# continue
|
||||
|
||||
# # check if response is valid
|
||||
# if scan_response is None:
|
||||
# if wait_scan_response == 4:
|
||||
# self.reset_internal()
|
||||
# self.reset_hardware()
|
||||
# self._interface.flush()
|
||||
# else:
|
||||
# self.log_info("wait for scan response")
|
||||
# continue
|
||||
# else:
|
||||
# break
|
||||
|
||||
try:
|
||||
scan_response = self._cc2650.recv_uart(0.2)
|
||||
scan_response = self._cc2650.recv_uart(timeout)
|
||||
except RecvTimeout:
|
||||
self.reset_internal()
|
||||
self.reset_hardware()
|
||||
self._interface.flush()
|
||||
return True
|
||||
|
||||
# self.reset_internal()
|
||||
# self.reset_hardware()
|
||||
# self._interface.flush()
|
||||
return False
|
||||
|
||||
# instruction format:
|
||||
# ins[0]: get_scan_response = 0x04
|
||||
@@ -2140,6 +2088,35 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
def found(self) -> List[DeviceResponseInfo]:
|
||||
return self._found
|
||||
|
||||
def check_mem_survive(self) -> Optional[CC2650Device]:
|
||||
ack = []
|
||||
ins = bytearray()
|
||||
ins.append(10)
|
||||
ins.append(1) #length
|
||||
ins.append(0xF1)
|
||||
# print('ins', list(ins))
|
||||
|
||||
try:
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException as e:
|
||||
raise RecvTimeout('device CC2650 check_mem_survive timeout') from e
|
||||
|
||||
else:
|
||||
try:
|
||||
ack = self._cc2650.recv_uart(0.001)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_info("no memory board")
|
||||
|
||||
# else:
|
||||
# print('ack=', ack)
|
||||
|
||||
if ack == [3]:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
@synchronized
|
||||
def connect(self, response: DeviceResponseInfo, direct_connect: bool = False) -> Optional[CC2650Device]:
|
||||
if self._handle is not None:
|
||||
@@ -2555,11 +2532,10 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
|
||||
if m is None:
|
||||
m = CC2650SingleMasterCentralDevice(self._master, self._interface, self._options)
|
||||
# m.set_log_level(self._cc2650_log_level)
|
||||
self._cc2650[i] = m
|
||||
|
||||
self._interface.flush()
|
||||
self._selector.select(i)
|
||||
# self._mem_selector.select(i)
|
||||
|
||||
try:
|
||||
self.log_info('reset device', i)
|
||||
@@ -2567,10 +2543,7 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
with m:
|
||||
m.reset_internal()
|
||||
m.reset_hardware()
|
||||
|
||||
if software_reset:
|
||||
m.reset_software()
|
||||
self._cc2650[i] = m
|
||||
m.reset_software()
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_warn('reset device', i, 'fail')
|
||||
@@ -2579,83 +2552,11 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
if not software_reset:
|
||||
return
|
||||
|
||||
# check reset result
|
||||
available_device_id = list(map(lambda it: it[0],
|
||||
filter(lambda it: it[1] is not None,
|
||||
enumerate(self._cc2650))))
|
||||
|
||||
if len(available_device_id) == 0:
|
||||
raise RuntimeError("reset fail, no device found")
|
||||
|
||||
self.log_verbose('available device', ' '.join(map(str, available_device_id)))
|
||||
|
||||
# initial hardware
|
||||
for i in range(len(self._cc2650)):
|
||||
m = self._cc2650[i]
|
||||
|
||||
if m is not None:
|
||||
self._interface.flush()
|
||||
self._selector.select(i)
|
||||
# self._mem_selector.select(i)
|
||||
|
||||
try:
|
||||
self.log_info('init device', i)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_warn('init device', i, 'fail')
|
||||
self._cc2650[i] = None
|
||||
|
||||
# check init result, again
|
||||
available_device_id = list(map(lambda it: it[0],
|
||||
filter(lambda it: it[1] is not None,
|
||||
enumerate(self._cc2650))))
|
||||
|
||||
if len(available_device_id) == 0:
|
||||
raise RuntimeError("init fail, no device success")
|
||||
|
||||
def reset_empty_master(self, device: Optional[List[int]] = None, software_reset=True):
|
||||
self.log_verbose('reset')
|
||||
|
||||
# reset hardware
|
||||
# print("reset device = ", device)
|
||||
for i in range(len(self._cc2650)):
|
||||
# print(i)
|
||||
|
||||
m = self._cc2650[i]
|
||||
d = self._device[i]
|
||||
|
||||
# print(m, d)
|
||||
|
||||
if m is not None and d is None:
|
||||
m = CC2650SingleMasterCentralDevice(self._master, self._interface, self._options)
|
||||
# m.set_log_level(self._cc2650_log_level)
|
||||
|
||||
self._interface.flush()
|
||||
self._selector.select(i)
|
||||
self._mem_selector.select(i)
|
||||
|
||||
try:
|
||||
self.log_info('reset device', i)
|
||||
|
||||
with m:
|
||||
m.reset_internal()
|
||||
m.reset_hardware()
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_warn('reset device', i, 'fail')
|
||||
self._cc2650[i] = None
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return list(map(lambda it: it[0],
|
||||
filter(lambda it: it[1] is not None,
|
||||
enumerate(self._cc2650))))
|
||||
|
||||
def _foreach_empty_master(self) -> Iterable[int]:
|
||||
for i in range(len(self._cc2650)):
|
||||
m = self._cc2650[i]
|
||||
for i in range(len(self._device)):
|
||||
d = self._device[i]
|
||||
|
||||
if m is not None and d is None:
|
||||
if d is None:
|
||||
yield i
|
||||
|
||||
def scan_callback(self, callback: Callable[[DeviceResponseInfo], None], timeout=5, all_device=False) -> bool:
|
||||
@@ -2663,28 +2564,35 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
|
||||
all_result = False
|
||||
|
||||
for device in self._foreach_empty_master():
|
||||
for device in range(len(self._cc2650)):
|
||||
self.log_verbose('use', device)
|
||||
|
||||
m = self._cc2650[device]
|
||||
d = self._device[device]
|
||||
|
||||
if m is not None and d is None:
|
||||
if d is None:
|
||||
error = None
|
||||
|
||||
with self:
|
||||
self._interface.flush()
|
||||
self._selector.select(device)
|
||||
# self._mem_selector.select(device)
|
||||
|
||||
try:
|
||||
sleep(0.0001)
|
||||
result = m.scan_callback(callback, timeout=timeout)
|
||||
if m.check_mem_survive() == False:
|
||||
continue
|
||||
|
||||
result = m.scan_callback(callback, timeout=0.001)
|
||||
|
||||
except RuntimeError as e:
|
||||
error = e
|
||||
|
||||
else:
|
||||
|
||||
if result == False:
|
||||
result = True
|
||||
all_result = all_result or result
|
||||
continue
|
||||
|
||||
all_result = all_result or result
|
||||
|
||||
if result and not all_device:
|
||||
@@ -2692,8 +2600,7 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
|
||||
if error is not None:
|
||||
self.log_warn('suppressed error : ' + str(error))
|
||||
# self.reset(device)
|
||||
sleep(1)
|
||||
|
||||
return all_result
|
||||
|
||||
def found(self) -> List[DeviceResponseInfo]:
|
||||
@@ -2746,7 +2653,6 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
with self:
|
||||
self._interface.flush()
|
||||
self._selector.select(master)
|
||||
# self._mem_selector.select(device)
|
||||
|
||||
sleep(0.0001)
|
||||
d = m.connect(response, direct_connect)
|
||||
|
||||
@@ -383,9 +383,6 @@ class DeviceManager(MasterDevice, Synchronized):
|
||||
self._demo.clear()
|
||||
self._centralMaster.reset(device, software_reset)
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return self._centralMaster.available_device()
|
||||
|
||||
@logging_info
|
||||
def shutdown(self, release_resource=True):
|
||||
# shutdown reset memeryboard
|
||||
@@ -565,6 +562,7 @@ class DeviceManager(MasterDevice, Synchronized):
|
||||
|
||||
@logging_verbose
|
||||
def get_device(self, device: Union[int, DeviceInfo]) -> Optional[CompletedDevice]:
|
||||
print('get_device', device)
|
||||
"""get connected device
|
||||
|
||||
:param device: device ID or response info
|
||||
@@ -577,7 +575,7 @@ class DeviceManager(MasterDevice, Synchronized):
|
||||
|
||||
elif isinstance(device, str):
|
||||
for slave in self._device:
|
||||
if ':'.join(format(b, 'x') for b in slave.mac_address) == device:
|
||||
if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device.lower():
|
||||
return slave
|
||||
|
||||
elif isinstance(device, DeviceInfo):
|
||||
|
||||
@@ -889,12 +889,14 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
|
||||
cycle_number = struct.unpack('>H', data[17:19])[0]
|
||||
finish_mode_falg = data[19]
|
||||
|
||||
mem_wrong_information = struct.unpack('>i', data[40:40+4])[0]
|
||||
|
||||
# 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]
|
||||
mem_wrong = data[40]
|
||||
mem_retry_cnt = data[41]
|
||||
mem_green_wrong = data[42]
|
||||
mem_green_retry_cnt = data[43]
|
||||
ram_num = data[44]
|
||||
broken_flag = data[-1]
|
||||
|
||||
if (finish_mode_falg & 0b11110000 == 0b10100000):
|
||||
@@ -930,6 +932,7 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
|
||||
# '|', '{:5}'.format(mem_retry_cnt),
|
||||
# '|', '{:5}'.format(mem_green_wrong),
|
||||
# '|', '{:5}'.format(mem_green_retry_cnt),
|
||||
# '|', '{:5}'.format(mem_wrong_information),
|
||||
# '|', '{:5}'.format(ram_num),
|
||||
# '|', '{:5}'.format(broken_flag),
|
||||
# '@', str(self.device), '|')
|
||||
@@ -952,8 +955,9 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
|
||||
# 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)
|
||||
ret.append_data(5, broken_flag)
|
||||
ret.append_data(6, mem_wrong_information)
|
||||
# ret.append_data(4, ram_num)
|
||||
|
||||
if cycle_number != self._cycle_number:
|
||||
|
||||
@@ -963,10 +963,6 @@ class MasterDevice(LoggerFlag, metaclass=abc.ABCMeta):
|
||||
"""
|
||||
pass
|
||||
|
||||
@abc.abstractmethod
|
||||
def available_device(self) -> List[int]:
|
||||
pass
|
||||
|
||||
def scan(self, timeout=5, all_device=False) -> List[DeviceResponseInfo]:
|
||||
"""scan the nearby device.
|
||||
|
||||
@@ -1101,9 +1097,6 @@ class NullMasterDevice(MasterDevice):
|
||||
def shutdown(self, release_resource=True):
|
||||
pass
|
||||
|
||||
def available_device(self) -> List[int]:
|
||||
return []
|
||||
|
||||
def scan(self, timeout=5, all_device=False) -> List[DeviceResponseInfo]:
|
||||
return []
|
||||
|
||||
|
||||
@@ -1082,6 +1082,11 @@ class CompletedDevice(Device):
|
||||
:return: parameter V value
|
||||
"""
|
||||
return self._configuration.get_parameter(name, False)
|
||||
|
||||
def set_multi_parameters(self, parameter):
|
||||
for (name, value) in parameter[0].items():
|
||||
if name != 'target':
|
||||
self.set_parameter(name, value)
|
||||
|
||||
def set_parameter(self, name: str, value: Union[int, str]):
|
||||
"""replace parameter value with *value*
|
||||
|
||||
@@ -3720,12 +3720,9 @@ class CC2650Central(LoggerFlag):
|
||||
if ret is not None and len(ret) > 0:
|
||||
return ret
|
||||
|
||||
elif _time() - start > 1:
|
||||
elif _time() - start > 0.01: # read timeout
|
||||
return None
|
||||
|
||||
else:
|
||||
sleep(0.01)
|
||||
|
||||
def _recv_event(self, timeout: Optional[float] = 1) -> Optional[list]:
|
||||
code = self._recv_byte()
|
||||
# print("code = ", code)
|
||||
|
||||
+83
-338
@@ -16,8 +16,6 @@ MEM_REG_READ = 0x05
|
||||
DEFAULT_REGISTER_VALUE = 0b0100_0011 # 67
|
||||
MEM_SIZE = 0x1000
|
||||
|
||||
_RUNTIME_COMPILE = False
|
||||
|
||||
_SLEEP_TIME_ = 0.001
|
||||
|
||||
|
||||
@@ -25,73 +23,94 @@ _SLEEP_TIME_ = 0.001
|
||||
def zero_buffer(size: int) -> List[int]:
|
||||
return [0] * size
|
||||
|
||||
|
||||
class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
class MultiExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
MEM_INS_MARKED = [MEM_INS_WRITE, 0, 2, 1, 1]
|
||||
MEM_INS_RESET = [MEM_INS_WRITE, 0, 2, 1, 1, 0, 0xFF]
|
||||
|
||||
__slots__ = ('_spi', '_tx_buffer', '_tx_buffer_header', '_tx_buffer_data',
|
||||
'pin_busy', 'pin_request', 'pin_reset', 'pin_sel',
|
||||
__slots__ = ('_selector', '_wait_for_first_data', '_spi', '_tx_buffer_header', '_tx_buffer_data',
|
||||
'pin_busy', 'pin_mem_req', 'pin_mem_sel', 'pin_ram_sel',
|
||||
'_pin_sel_val',
|
||||
'_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')
|
||||
|
||||
def __init__(self, device: Tuple[int, int] = None):
|
||||
super().__init__()
|
||||
self._spi = HardwareImplSpiInterface(device,
|
||||
spi_speed=12_000_000 # XXX temp parameter
|
||||
)
|
||||
def __init__(self,
|
||||
select: Selector,
|
||||
device: Tuple[int, int] = None):
|
||||
|
||||
self._elite_data_len = 20
|
||||
self._spi = HardwareImplSpiInterface(device,
|
||||
spi_speed=12_000_000)
|
||||
|
||||
self._elite_data_len = 40
|
||||
self._mem_header_len = 3
|
||||
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 = [0] * 512
|
||||
self._tx_buffer_header = [0] * 11
|
||||
self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
|
||||
|
||||
# memory control pin
|
||||
self.pin_busy = OutputPin.get_used(P3Pin.MEM_BZY, True)
|
||||
self.pin_request = OutputPin.get_used(P3Pin.MEM_REQ, True)
|
||||
self.pin_reset = OutputPin.get_used(P3Pin.MEM_RST, True)
|
||||
self.pin_sel: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_SEL)
|
||||
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
|
||||
|
||||
self._pin_sel_val = False
|
||||
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._read_green_times = 0
|
||||
self._read_red_times = 0
|
||||
|
||||
self._head_wrong_cnt = [0, 0, 0, 0, 0, 0, 0, 0]
|
||||
|
||||
def reset(self):
|
||||
self._spi.reset()
|
||||
|
||||
def close(self):
|
||||
self._spi.close()
|
||||
self._selector = select
|
||||
|
||||
def flush(self):
|
||||
self.pin_reset.output(False)
|
||||
self.pin_reset.output(True)
|
||||
self._pin_sel_val = [False for _ in range(Selector.SIZE)]
|
||||
self._wait_for_first_data = [True for _ in range(Selector.SIZE)]
|
||||
|
||||
def set_pin_mem_req(self, value: bool):
|
||||
channel = self.select
|
||||
self.pin_mem_req.output(value)
|
||||
self._pin_mem_req_value[channel] = value
|
||||
|
||||
def set_pin_mem_sel(self, value: bool):
|
||||
channel = self.select
|
||||
self.pin_mem_sel.output(value)
|
||||
self._pin_mem_sel_value[channel] = value
|
||||
|
||||
def get_pin_mem_req(self):
|
||||
channel = self.select
|
||||
return self._pin_mem_req_value[channel]
|
||||
|
||||
def get_pin_ram_sel(self):
|
||||
channel = self.select
|
||||
if self.pin_ram_sel.input() == 0:
|
||||
self._pin_ram_sel_value[channel] = False
|
||||
else:
|
||||
self._pin_ram_sel_value[channel] = True
|
||||
return self._pin_ram_sel_value[channel]
|
||||
|
||||
@property
|
||||
def select(self) -> int:
|
||||
return 0
|
||||
return self._selector.channel
|
||||
|
||||
@select.setter
|
||||
def select(self, value: int):
|
||||
self._selector.select(value)
|
||||
|
||||
def reset(self):
|
||||
self._spi.reset()
|
||||
|
||||
def flush(self):
|
||||
pass
|
||||
|
||||
def changed(self, flip=False) -> bool:
|
||||
old = self._pin_sel_val
|
||||
value = self.pin_sel.input()
|
||||
|
||||
if flip:
|
||||
self._pin_sel_val = value
|
||||
|
||||
return value != old
|
||||
def close(self):
|
||||
self._selector.close()
|
||||
self._spi.close()
|
||||
|
||||
def send_byte(self, data: bytes):
|
||||
raise RuntimeError()
|
||||
@@ -99,25 +118,18 @@ class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
def recv_byte(self, size: int) -> Optional[bytes]:
|
||||
raise RuntimeError()
|
||||
|
||||
def request_data(self):
|
||||
self.pin_request.output(False)
|
||||
sleep(0.001)
|
||||
def foreach(self) -> Iterable[int]:
|
||||
for channel in self._selector.foreach():
|
||||
yield channel
|
||||
|
||||
# count = 0
|
||||
# for i in range(300):
|
||||
# count = count + 1
|
||||
def set_wait_flag(self, spi_idx:int = None, value:bool = None):
|
||||
self._wait_for_first_data[spi_idx] = value
|
||||
|
||||
self.pin_request.output(True)
|
||||
|
||||
# sleep(0.001) -> 1.2ms
|
||||
# no sleep -> 5us ~ 12us (central can't receive)
|
||||
|
||||
# for i in range
|
||||
# (1000) -> 500us ~ 1ms
|
||||
# (500) -> 200us ~ 500us
|
||||
# (300) -> 120us ~ 270us (seldom)
|
||||
# (200) -> 70us ~ 160us (skip req about every 64 time) x
|
||||
# (100) -> 40us ~ 100us (skip req sometimes) x
|
||||
def get_wait_flag(self, spi_idx:int = None) -> Optional[bool]:
|
||||
if spi_idx < Selector.SIZE:
|
||||
return self._wait_for_first_data[spi_idx]
|
||||
else:
|
||||
return None
|
||||
|
||||
def compare_green_data(self, data_first: Union[bytes, List[int]], data_second: Union[bytes, List[int]], data_third: Union[bytes, List[int]], length: int):
|
||||
data = []
|
||||
@@ -162,7 +174,6 @@ class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
address = 0
|
||||
|
||||
# first read to get data length
|
||||
tx = self._tx_buffer
|
||||
tx_h = self._tx_buffer_header
|
||||
|
||||
tx_h[0] = MEM_INS_READ
|
||||
@@ -178,8 +189,8 @@ class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
|
||||
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] < 6):
|
||||
print('data_first[0:3] != [255, 255, 255]', device)
|
||||
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[0:7]))
|
||||
|
||||
data[0:3] = [255, 255, 255]
|
||||
@@ -198,13 +209,13 @@ class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
# 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)
|
||||
# print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
|
||||
# print(list(data_first[0:7]))
|
||||
|
||||
# if (data_second[0] != 255 or data_second[1] != 255 or data_second[2] != 255):
|
||||
# self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
|
||||
# if (self._head_wrong_cnt[device] < 10):
|
||||
# print('data_second[0:3] != [255, 255, 255]', device)
|
||||
# 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:]):
|
||||
@@ -356,108 +367,39 @@ class ExtMemSpiInterface(LowLevelHardwareInterface):
|
||||
|
||||
self._spi.send_byte(tx)
|
||||
|
||||
def flush_all(self):
|
||||
self.flush()
|
||||
|
||||
def foreach(self) -> Iterable[int]:
|
||||
yield 0
|
||||
|
||||
|
||||
class MultiExtMemSpiInterface(ExtMemSpiInterface):
|
||||
__slots__ = ('_selector', '_wait_for_first_data')
|
||||
|
||||
def __init__(self,
|
||||
select: Selector,
|
||||
device: Tuple[int, int] = None):
|
||||
super().__init__(device)
|
||||
|
||||
self._selector = select
|
||||
|
||||
self._pin_sel_val = [False for _ in range(Selector.SIZE)]
|
||||
self._wait_for_first_data = [True for _ in range(Selector.SIZE)]
|
||||
|
||||
@property
|
||||
def select(self) -> int:
|
||||
return self._selector.channel
|
||||
|
||||
@select.setter
|
||||
def select(self, value: int):
|
||||
self._selector.select(value)
|
||||
|
||||
def changed(self, flip=False) -> bool:
|
||||
channel = self._selector.channel
|
||||
old = self._pin_sel_val[channel]
|
||||
value = bool(self.pin_sel)
|
||||
|
||||
if flip:
|
||||
self._pin_sel_val[channel] = value
|
||||
|
||||
return value != old
|
||||
|
||||
def reset(self):
|
||||
self._spi.reset()
|
||||
|
||||
def close(self):
|
||||
self._selector.close()
|
||||
super().close()
|
||||
|
||||
def flush_all(self):
|
||||
for _ in self._selector.foreach():
|
||||
self.pin_reset.output(False)
|
||||
self.pin_reset.output(True)
|
||||
|
||||
def foreach(self) -> Iterable[int]:
|
||||
for channel in self._selector.foreach():
|
||||
yield channel
|
||||
|
||||
def set_wait_flag(self, spi_idx:int = None, value:bool = None):
|
||||
self._wait_for_first_data[spi_idx] = value
|
||||
|
||||
def get_wait_flag(self, spi_idx:int = None) -> Optional[bool]:
|
||||
if spi_idx < Selector.SIZE:
|
||||
return self._wait_for_first_data[spi_idx]
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
class ExtMemManager:
|
||||
def __init__(self, ext_mem: ExtMemSpiInterface):
|
||||
self._mem_sel = InputPin.get_used(P3Pin.MEM_SEL, pull_up_down=True)
|
||||
self._mem_req = OutputPin.get_used(P3Pin.MEM_REQ, initial=True)
|
||||
|
||||
def __init__(self, ext_mem: MultiExtMemSpiInterface):
|
||||
self._ext_mem = ext_mem
|
||||
|
||||
@property
|
||||
def mem_sel(self) -> int:
|
||||
return int(self._mem_sel)
|
||||
|
||||
@property
|
||||
def mem_req(self) -> int:
|
||||
return int(self._mem_req)
|
||||
|
||||
def mem_request(self):
|
||||
self._mem_req.pulse()
|
||||
sleep(_SLEEP_TIME_)
|
||||
|
||||
def get_ext_mem_register(self) -> List[Tuple[Optional[int], Optional[int]]]:
|
||||
ret = [(None, None) for _ in range(Selector.SIZE)]
|
||||
|
||||
for channel in self._ext_mem.foreach():
|
||||
r = [None, None]
|
||||
|
||||
self.mem_request()
|
||||
sleep(0.01)
|
||||
m1 = int(self._mem_sel)
|
||||
self._ext_mem.set_pin_mem_sel(False)
|
||||
pin_value = self._ext_mem.get_pin_mem_req()
|
||||
self._ext_mem.set_pin_mem_req(not pin_value)
|
||||
|
||||
m1 = int(self._ext_mem.get_pin_ram_sel())
|
||||
# print("m1 = ", m1)
|
||||
self._ext_mem.write_register(DEFAULT_REGISTER_VALUE)
|
||||
r[m1] = self._ext_mem.read_register()
|
||||
sleep(0.040)
|
||||
self._ext_mem.set_pin_mem_sel(True)
|
||||
sleep(0.200)
|
||||
|
||||
self.mem_request()
|
||||
sleep(0.01)
|
||||
m2 = int(self._mem_sel)
|
||||
self._ext_mem.set_pin_mem_sel(False)
|
||||
pin_value = self._ext_mem.get_pin_mem_req()
|
||||
self._ext_mem.set_pin_mem_req(not pin_value)
|
||||
|
||||
m2 = int(self._ext_mem.get_pin_ram_sel())
|
||||
# print("m2 = ", m2)
|
||||
self._ext_mem.write_register(DEFAULT_REGISTER_VALUE)
|
||||
r[m2] = self._ext_mem.read_register()
|
||||
sleep(0.040)
|
||||
self._ext_mem.set_pin_mem_sel(True)
|
||||
sleep(0.200)
|
||||
|
||||
ret[channel] = tuple(r)
|
||||
|
||||
@@ -483,33 +425,6 @@ class ExtMemManager:
|
||||
|
||||
return 0
|
||||
|
||||
def get_no_device_channel(self, result: List[Tuple[Optional[int], Optional[int]]] = None) -> List[int]:
|
||||
if result is None:
|
||||
result = self.get_ext_mem_register()
|
||||
|
||||
ret = []
|
||||
|
||||
for channel, result in enumerate(result):
|
||||
if self.is_no_device(result):
|
||||
ret.append(channel)
|
||||
|
||||
return ret
|
||||
|
||||
def get_memory_test_fail(self, result: List[Tuple[Optional[int], Optional[int]]] = None) -> List[int]:
|
||||
if result is None:
|
||||
result = self.get_ext_mem_register()
|
||||
|
||||
ret = []
|
||||
|
||||
for channel, result in enumerate(result):
|
||||
if self.is_no_device(result):
|
||||
continue
|
||||
|
||||
if self.is_memory_test_fail(result) != 0:
|
||||
ret.append(channel)
|
||||
|
||||
return ret
|
||||
|
||||
def get_available_channel(self, result: List[Tuple[Optional[int], Optional[int]]] = None) -> List[int]:
|
||||
if result is None:
|
||||
result = self.get_ext_mem_register()
|
||||
@@ -526,173 +441,3 @@ class ExtMemManager:
|
||||
ret.append(channel)
|
||||
|
||||
return ret
|
||||
|
||||
def test_available_channel(self, result: List[Tuple[Optional[int], Optional[int]]] = None) -> List[int]:
|
||||
if result is None:
|
||||
result = self.get_ext_mem_register()
|
||||
|
||||
available_channel = []
|
||||
|
||||
for channel, result in enumerate(result):
|
||||
r1, r2 = result
|
||||
|
||||
if self.is_no_device(result):
|
||||
print('channel', channel, 'no device')
|
||||
continue
|
||||
|
||||
test_pass = True
|
||||
|
||||
if r1 is None or r2 is None:
|
||||
test_pass = False
|
||||
print('channel', channel, 'mem_sel', 'x', 'not change')
|
||||
|
||||
if r1 is not None and r1 > 0 and r1 != DEFAULT_REGISTER_VALUE:
|
||||
test_pass = False
|
||||
print('channel', channel, 'mem_sel', 0, 'register', r1)
|
||||
|
||||
if r2 is not None and r2 > 0 and r2 != DEFAULT_REGISTER_VALUE:
|
||||
test_pass = False
|
||||
print('channel', channel, 'mem_sel', 1, 'register', r2)
|
||||
|
||||
if test_pass:
|
||||
print('channel', channel, 'mem_sel', 0, 'register', r1)
|
||||
print('channel', channel, 'mem_sel', 1, 'register', r2)
|
||||
available_channel.append(channel)
|
||||
|
||||
return available_channel
|
||||
|
||||
def test_memory_read_write(self, channel: int, print_result=False) -> bool:
|
||||
self._ext_mem.select = channel
|
||||
|
||||
addr = 4
|
||||
size = 100
|
||||
test_pass = True
|
||||
|
||||
while addr < MEM_SIZE:
|
||||
d1 = [randint(10, 99) for _ in range(size)]
|
||||
d2 = [randint(10, 99) for _ in range(size)]
|
||||
|
||||
self.mem_request()
|
||||
m1 = int(self._mem_sel)
|
||||
self._ext_mem.write_memory(addr, d1)
|
||||
|
||||
self.mem_request()
|
||||
m2 = int(self._mem_sel)
|
||||
self._ext_mem.write_memory(addr, d2)
|
||||
|
||||
self.mem_request()
|
||||
m11 = int(self._mem_sel)
|
||||
r1 = self._ext_mem.read_memory(addr, size)
|
||||
|
||||
if m1 != m11:
|
||||
test_pass = False
|
||||
if print_result:
|
||||
print('channel', channel, 'mem_sel not change')
|
||||
|
||||
if d1 != r1:
|
||||
test_pass = False
|
||||
if print_result:
|
||||
self.print_bytes_diff(d1, r1)
|
||||
|
||||
self.mem_request()
|
||||
m22 = int(self._mem_sel)
|
||||
r2 = self._ext_mem.read_memory(addr, size)
|
||||
|
||||
if m2 != m22:
|
||||
test_pass = False
|
||||
if print_result:
|
||||
print('channel', channel, 'mem_sel not change')
|
||||
|
||||
if d2 != r2:
|
||||
test_pass = False
|
||||
if print_result:
|
||||
self.print_bytes_diff(d2, r2)
|
||||
|
||||
addr += size
|
||||
|
||||
return test_pass
|
||||
|
||||
@staticmethod
|
||||
def print_bytes_diff(_1: List[int], _2: List[int]):
|
||||
s1 = ''
|
||||
s2 = ''
|
||||
|
||||
l1 = len(_1)
|
||||
l2 = len(_2)
|
||||
|
||||
for i in range(min(l1, l2)):
|
||||
v1 = _1[i]
|
||||
v2 = _2[i]
|
||||
|
||||
if v1 == v2:
|
||||
s1 += '%02X ' % v1
|
||||
s2 += '%02X ' % v2
|
||||
else:
|
||||
s1 += '%02X ' % v1
|
||||
s2 += pc('%02X' % v2, RED) + ' '
|
||||
|
||||
if l1 == l2:
|
||||
pass
|
||||
|
||||
elif l1 < l2:
|
||||
for i in range(l1, l2):
|
||||
s2 += pc('%02X' % _2[i], GREEN) + ' '
|
||||
else:
|
||||
for i in range(l2, l1):
|
||||
s1 += pc('%02X' % _1[i], RED) + ' '
|
||||
|
||||
print(s1)
|
||||
print(s2)
|
||||
|
||||
|
||||
def hardware_test():
|
||||
ext_mem = MultiExtMemSpiInterface(Selector.get(Selector.MEM_SELECTOR))
|
||||
|
||||
fake_mode = False
|
||||
|
||||
try:
|
||||
ext_mem.reset()
|
||||
except FileNotFoundError:
|
||||
fake_mode = True
|
||||
|
||||
ret = {
|
||||
'channel_count': Selector.SIZE,
|
||||
'memory_size': MEM_SIZE,
|
||||
'pin_mem_req': P3Pin.MEM_REQ,
|
||||
'pin_mem_sel': P3Pin.MEM_SEL,
|
||||
}
|
||||
|
||||
if not fake_mode:
|
||||
tester = ExtMemManager(ext_mem)
|
||||
|
||||
result = tester.get_ext_mem_register()
|
||||
no_device = tester.get_no_device_channel(result)
|
||||
reg_fail = tester.get_memory_test_fail(result)
|
||||
available = tester.get_available_channel(result)
|
||||
|
||||
channel = ['unknown' for _ in range(Selector.SIZE)]
|
||||
|
||||
for ch in range(len(channel)):
|
||||
if ch in no_device:
|
||||
channel[ch] = 'no_device'
|
||||
|
||||
elif ch in reg_fail:
|
||||
channel[ch] = 'reg_fail'
|
||||
|
||||
elif not tester.test_memory_read_write(ch):
|
||||
channel[ch] = 'mem_fail'
|
||||
|
||||
else:
|
||||
channel[ch] = 'available'
|
||||
|
||||
ret['register'] = result
|
||||
ret['available'] = available
|
||||
ret['channel'] = channel
|
||||
|
||||
return ret
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
from pprint import pprint
|
||||
|
||||
pprint(hardware_test())
|
||||
|
||||
@@ -53,7 +53,7 @@ class HardwareImplSpiInterface(LowLevelHardwareInterface):
|
||||
*MISO*, *SCLK*, *GE0_N*
|
||||
"""
|
||||
|
||||
__slots__ = ('_device', '_spi', '_spi_mode', 'pin_request', '_spi_speed')
|
||||
__slots__ = ('_device', '_spi', '_spi_mode', '_spi_speed')
|
||||
|
||||
def __init__(self,
|
||||
device: Tuple[int, int] = None,
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -117,14 +117,14 @@ class Selector:
|
||||
self._p1.output(p[1])
|
||||
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)
|
||||
elif (value == 5 and self._last_sel != 4):
|
||||
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)
|
||||
elif (value == 6 and self._last_sel != 7):
|
||||
print('mem_sel is not use gray code, value:', value, ', last value:', self._last_sel)
|
||||
# if (value == 4 and self._last_sel != 6):
|
||||
# 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)
|
||||
# elif (value == 7 and self._last_sel != 5):
|
||||
# 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)
|
||||
|
||||
self._last_sel = value
|
||||
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
|
||||
class Action():
|
||||
def __init__(self, task, action_id, action):
|
||||
self._task = task
|
||||
self._id:str = action_id
|
||||
self._type:str = action['type']
|
||||
self._target:str = action['target']
|
||||
self._condition_list:list[str] = action['condition']
|
||||
self._duration = action.get('duration', None)
|
||||
self._goto = action.get('goto', None)
|
||||
self._cycle = action.get('cycle', None)
|
||||
|
||||
self._instruction = None
|
||||
|
||||
self.update_instruction()
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
return self._type
|
||||
|
||||
def update_instruction(self):
|
||||
self._instruction = {
|
||||
"device_instruction": {
|
||||
"header": "call_instruction",
|
||||
"device": self._target,
|
||||
"arguments": {
|
||||
"instruction": self._type,
|
||||
}
|
||||
},
|
||||
"device_parameter": {
|
||||
"header": "set_multi_parameters",
|
||||
"device": self._target,
|
||||
"arguments": {
|
||||
"parameter": self._task.get_parameter_set_by_device(self._target),
|
||||
}
|
||||
},
|
||||
"device_recording_file_name": {
|
||||
"header": "update_recording_file_name_info",
|
||||
"device": self._target,
|
||||
"arguments": {
|
||||
"content": self._task.file_name,
|
||||
}
|
||||
},
|
||||
"device_parent": {
|
||||
"header": "update_parent_info",
|
||||
"device": self._target,
|
||||
"arguments": {
|
||||
"content": self._task.parent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def get_condition_list(self):
|
||||
return self._condition_list
|
||||
|
||||
def get_instruction(self, value):
|
||||
return self._instruction[value]
|
||||
|
||||
def get_instruction_list(self):
|
||||
instruction_set = {
|
||||
'start': ['device_parent', 'device_recording_file_name', 'device_parameter', 'device_instruction'],
|
||||
'stop': ['device_instruction'],
|
||||
}
|
||||
|
||||
return map(self.get_instruction, instruction_set[self._type])
|
||||
@@ -0,0 +1,75 @@
|
||||
from datetime import datetime
|
||||
from time import time
|
||||
|
||||
class Condition():
|
||||
def __init__(self, id, condition):
|
||||
print('condition', id, condition)
|
||||
self._id = id
|
||||
self._type = condition['type']
|
||||
self._comparsion = condition['comparsion']
|
||||
self._value = condition['value']
|
||||
|
||||
@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
|
||||
|
||||
def set_comparsion(self, comparsion):
|
||||
self._comparsion = comparsion
|
||||
|
||||
def set_type(self, type):
|
||||
self._type = type
|
||||
|
||||
def set_value(self, value):
|
||||
self._value = value
|
||||
|
||||
def compareWith(self, operator:str, x, y) -> bool:
|
||||
cases = {
|
||||
"equal": lambda a, b: a == b,
|
||||
"bigger": lambda a, b: a > b,
|
||||
"smaller": lambda a, b: a < b,
|
||||
}
|
||||
|
||||
# print('x','y',x, y,type(x),type(y))
|
||||
return cases[operator](x, y)
|
||||
|
||||
def match_or_not(self, **kwargs):
|
||||
return self.method_mapping(self.type)()
|
||||
|
||||
def absolute_time(self, **kwargs):
|
||||
now = time()
|
||||
time_condition = self.datetime_to_timestamp(self.str_to_datetime(self._value))
|
||||
|
||||
return self.compareWith(self.comparsion, int(now), int(time_condition))
|
||||
|
||||
def relative_time(self, **kwargs):
|
||||
now = time()
|
||||
|
||||
def device(self, **kwargs):
|
||||
print('device')
|
||||
|
||||
def task_status(self, **kwargs):
|
||||
print('task_status')
|
||||
|
||||
def method_mapping(self, method_name):
|
||||
methods = {
|
||||
"relative_time": self.relative_time,
|
||||
"absolute_time": self.absolute_time,
|
||||
"device": self.device,
|
||||
"task_status": self.task_status,
|
||||
}
|
||||
return methods[method_name]
|
||||
|
||||
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)
|
||||
@@ -0,0 +1,78 @@
|
||||
from .task import Task
|
||||
from .task_manager import TaskManager
|
||||
import sys
|
||||
import json
|
||||
import threading
|
||||
import time
|
||||
from datetime import datetime
|
||||
from collections import deque
|
||||
from biopro.device.manager import DeviceManager
|
||||
from biopro.text import *
|
||||
|
||||
class Project(threading.Thread):
|
||||
def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
|
||||
super(Project, self).__init__(name = name)
|
||||
self._project = project
|
||||
self._device_manager = device_manager
|
||||
self._mqtt_thread = mqttThread
|
||||
self._time_interval = 1
|
||||
self._start_time = None
|
||||
|
||||
self._task_manager = TaskManager(self._project['taskList'])
|
||||
|
||||
self._start_time = None
|
||||
|
||||
@property
|
||||
def desc(self) -> str:
|
||||
return self._project['desc']
|
||||
|
||||
@property
|
||||
def status(self) -> str:
|
||||
return self._project['status']
|
||||
|
||||
@property
|
||||
def device(self) -> list:
|
||||
return self._project['deviceList']
|
||||
|
||||
@property
|
||||
def task(self) -> list:
|
||||
return self._task_manager.get()
|
||||
|
||||
@property
|
||||
def get_current_task(self) -> str:
|
||||
return self._task_manager.get_current_task()
|
||||
|
||||
def run(self):
|
||||
self._start_time = time.time()
|
||||
|
||||
while True:
|
||||
# current task
|
||||
for task in self._task_manager.get_check_task_list():
|
||||
# [<match_condition>, ...]
|
||||
match_condition_list = task.check_condition('time')
|
||||
# [[<match_action>, ...], ...]
|
||||
match_action_list = task.get_match_action_list(match_condition_list)
|
||||
|
||||
for action_list in match_action_list:
|
||||
for action in action_list:
|
||||
if action.type == 'start':
|
||||
self._task_manager.set_current_task(task)
|
||||
task.do_action(action)
|
||||
|
||||
while len(task.instruction_list) > 0:
|
||||
instruction = task.instruction_list.pop(0)
|
||||
if instruction.get('device', None) != None:
|
||||
device = self._device_manager.get_device(self.device[instruction['device']]['connectDevice']['device_address'])
|
||||
|
||||
if device is None:
|
||||
raise RuntimeError(DEVICE_NOT_FOUND, device)
|
||||
|
||||
# print(instruction['header'], *instruction['arguments'].values())
|
||||
getattr(device, instruction['header'])(*instruction['arguments'].values())
|
||||
|
||||
time.sleep(self._time_interval)
|
||||
def stop(self):
|
||||
return
|
||||
|
||||
def close(self):
|
||||
return
|
||||
@@ -0,0 +1,33 @@
|
||||
from io import StringIO
|
||||
from json import loads as json_parse, dumps as _json_stringify
|
||||
from typing import Dict, Optional, Any
|
||||
import paho.mqtt.client as mqtt
|
||||
from .project import Project
|
||||
from biopro.device.manager import DeviceManager
|
||||
|
||||
def json_stringify(o: Any) -> str:
|
||||
return _json_stringify(o, separators=(',', ':'))
|
||||
|
||||
class ProjectManager():
|
||||
def __init__(self, device_manager: DeviceManager, mqtt_thread=None) :
|
||||
self._project_list = []
|
||||
self._mqtt_thread = mqtt_thread
|
||||
self._device_manager = device_manager
|
||||
|
||||
def create(self, project):
|
||||
new_project = Project(project, self._device_manager, self._mqtt_thread)
|
||||
self._project_list.append(new_project)
|
||||
return new_project
|
||||
|
||||
def remove(self, index):
|
||||
self._project_list[index].stop()
|
||||
del self._project_list[index]
|
||||
|
||||
def get(self):
|
||||
return self._project_list
|
||||
|
||||
def run(self, project):
|
||||
project.start()
|
||||
|
||||
def stop(self, project):
|
||||
project.stop()
|
||||
@@ -0,0 +1,168 @@
|
||||
from .condition import Condition
|
||||
from .action import Action
|
||||
from time import time
|
||||
|
||||
class Task:
|
||||
def __init__(self, task):
|
||||
self._task = task
|
||||
|
||||
self._condition_list = []
|
||||
self._action_list = []
|
||||
|
||||
self._start_time = time()
|
||||
self._idle_time = []
|
||||
self._period = None
|
||||
self._next_time = None
|
||||
self._last_time = None
|
||||
|
||||
self._instruction_list = []
|
||||
|
||||
self.setup()
|
||||
|
||||
def setup(self) -> None:
|
||||
# add condition
|
||||
for key, condition in self._task['condition'].items():
|
||||
new_condition = Condition(key, condition)
|
||||
self._condition_list.append(new_condition)
|
||||
|
||||
# add action
|
||||
for key, action in self._task['action'].items():
|
||||
new_action = Action(self, key, action)
|
||||
self._action_list.append(new_action)
|
||||
|
||||
@property
|
||||
def id(self) -> str:
|
||||
return self._task['id']
|
||||
|
||||
@property
|
||||
def file_name(self):
|
||||
return self._task['name']
|
||||
|
||||
@property
|
||||
def parent(self):
|
||||
return self._task.get('parent', {"folder": [2]})
|
||||
|
||||
@property
|
||||
def instruction_list(self):
|
||||
return self._instruction_list
|
||||
|
||||
@property
|
||||
def cycle(self) -> int:
|
||||
return self._task['cycle']
|
||||
|
||||
@property
|
||||
def order(self) -> int:
|
||||
return self._task['order']
|
||||
|
||||
@property
|
||||
def max_cycle(self) -> int:
|
||||
return self._task['max_cycle']
|
||||
|
||||
@property
|
||||
def devices(self) -> dict:
|
||||
return self._task['devices']
|
||||
|
||||
@property
|
||||
def devices_id(self) -> list:
|
||||
return [device_id for device_id in self.devices]
|
||||
|
||||
@property
|
||||
def events(self) -> list:
|
||||
return self._task['events']
|
||||
|
||||
@property
|
||||
def triggers(self) -> list:
|
||||
return self._task['triggers']
|
||||
|
||||
@property
|
||||
def parameter_set(self) -> list:
|
||||
return self._task['parameterSet']
|
||||
|
||||
@property
|
||||
def instructions(self) -> list:
|
||||
return self._task['instructions']
|
||||
|
||||
@property
|
||||
def conditions(self) -> list:
|
||||
return self._task['conditions']
|
||||
|
||||
@property
|
||||
def actions(self) -> list:
|
||||
return self._task['actions']
|
||||
|
||||
@property
|
||||
def condition_list(self) -> list:
|
||||
return self._condition_list
|
||||
|
||||
@property
|
||||
def status(self) -> str:
|
||||
return self._task['status']
|
||||
|
||||
@property
|
||||
def uuid(self) -> str:
|
||||
return self._task['uuid']
|
||||
|
||||
@property
|
||||
def next(self) -> str:
|
||||
return self._task['next']
|
||||
|
||||
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):
|
||||
self._status = 'running'
|
||||
self._start_time = time()
|
||||
|
||||
def pause(self):
|
||||
self._status = 'pause'
|
||||
|
||||
def set_cycle(self, cycle):
|
||||
self._cycle = cycle
|
||||
|
||||
def set_status(self, status):
|
||||
self._status = status
|
||||
|
||||
def start(self):
|
||||
self.set_status('running')
|
||||
|
||||
def stop(self):
|
||||
if self.status == 'running':
|
||||
self.do_action('stop')
|
||||
self.set_status('idle')
|
||||
|
||||
def done(self):
|
||||
self.set_status('done')
|
||||
|
||||
def end(self):
|
||||
self.set_status('end')
|
||||
|
||||
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 do_action(self, action):
|
||||
# # match_action = [x for x in self._action_list if condition_id in x.get_condition_list()]
|
||||
|
||||
# for action in match_action:
|
||||
for instruction in action.get_instruction_list():
|
||||
self._instruction_list.append(instruction)
|
||||
|
||||
def status_mapping(self, status):
|
||||
statuses = {
|
||||
"start": self.task_start,
|
||||
"done": self.task_done,
|
||||
}
|
||||
return statuses[status]
|
||||
|
||||
def check_condition(self, type):
|
||||
return [condition for condition in self._condition_list if condition.match_or_not()]
|
||||
@@ -0,0 +1,56 @@
|
||||
from json import loads as json_parse, dumps as _json_stringify
|
||||
from typing import Dict, Optional, Any
|
||||
from xml.dom.expatbuilder import parseString
|
||||
import paho.mqtt.client as mqtt
|
||||
from biopro.text import *
|
||||
from .task import Task
|
||||
|
||||
_RUNTIME_COMPILE = False
|
||||
|
||||
def json_stringify(o: Any) -> str:
|
||||
return _json_stringify(o, separators=(',', ':'))
|
||||
|
||||
class TaskManager():
|
||||
def __init__(self, task_list):
|
||||
self._current_task = None
|
||||
self._task_list = []
|
||||
self._need_to_check_task_list = []
|
||||
|
||||
for task in task_list:
|
||||
task = Task(task)
|
||||
self._task_list.append(task)
|
||||
|
||||
self.set_current_task(self._task_list[0])
|
||||
self._current_task.run()
|
||||
|
||||
def remove(self, index):
|
||||
pass
|
||||
|
||||
def get_task(self, task_id):
|
||||
return self._task_list[task_id]
|
||||
|
||||
def get_check_task_list(self):
|
||||
return self._need_to_check_task_list
|
||||
|
||||
def get_current_task(self) -> Task:
|
||||
return self._current_task
|
||||
|
||||
def get_next_task(self):
|
||||
return self._current_task.next
|
||||
|
||||
def set_current_task(self, task):
|
||||
try:
|
||||
if self._current_task != None and self._current_task.id != task.id:
|
||||
self._current_task.stop()
|
||||
|
||||
self._current_task = task
|
||||
self._need_to_check_task_list = []
|
||||
# append current task
|
||||
self._need_to_check_task_list.append(self._current_task)
|
||||
|
||||
# append next task
|
||||
for task_uuid in self._current_task.next:
|
||||
task = next((task for task in self._task_list if task.uuid == task_uuid), None)
|
||||
self._need_to_check_task_list.append(task)
|
||||
except Exception as e:
|
||||
print(e)
|
||||
@@ -996,7 +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')
|
||||
'_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch', '_id_db_save')
|
||||
|
||||
def __init__(self, meta: RecordingMetaFile, device_id, database = None):
|
||||
self._meta = meta
|
||||
@@ -1052,6 +1052,7 @@ 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 = {}
|
||||
@@ -1068,7 +1069,7 @@ class RecordingFileWriter:
|
||||
|
||||
# splitting
|
||||
self.splitting_threshold_time = 30 * 60 * 1000 # one minute
|
||||
self.splitting_threshold_size = 16 * 16 * 1024 # 16 * 16KB
|
||||
self.splitting_threshold_size = 4 * 16 * 1024 # 16 * 16KB
|
||||
|
||||
self._writer_batch_size = 8192
|
||||
|
||||
@@ -1123,7 +1124,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._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._recording_file_dict.clear()
|
||||
for scale in self._mini_scale_list:
|
||||
@@ -1365,7 +1366,7 @@ class RecordingFileWriter:
|
||||
# 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._time_now - self._time[ch] > 2000000:
|
||||
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)
|
||||
@@ -1394,7 +1395,9 @@ class RecordingFileWriter:
|
||||
|
||||
if data_save is True:
|
||||
if self._database is not None:
|
||||
self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data']])
|
||||
# print('raw_save', self._raw_save['id'])
|
||||
# print('id_save', self._id_db_save)
|
||||
self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data'], self._id_db_save])
|
||||
self._meta.update_subfile(database = self._database)
|
||||
if mini_save is True:
|
||||
if self._database is not None:
|
||||
@@ -1414,6 +1417,7 @@ class RecordingFileWriter:
|
||||
|
||||
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
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ class RoutineConnectDeviceThread(ServerThread):
|
||||
self._current_times = 0
|
||||
self._time = time()
|
||||
|
||||
if len(self._manager._device) < len(self._manager.available_device()) and not self.check_device_status('update') and not self.check_device_status('running') and self._current_times < 3:
|
||||
if not self.check_device_status('update') and not self.check_device_status('running') and self._current_times < 3:
|
||||
self._current_times += 1
|
||||
register_device = DeviceAPI.getAll()
|
||||
if register_device is not None:
|
||||
|
||||
@@ -1335,3 +1335,6 @@ def to_device_info(content: Union[str, ADDRESS, JSON_OBJECT]) -> DeviceResponseI
|
||||
return DeviceResponseInfo(None,
|
||||
serial_number=serial,
|
||||
mac_address=address)
|
||||
|
||||
def run_project(self, project) -> bool:
|
||||
return False
|
||||
|
||||
+54
-241
@@ -10,7 +10,7 @@ import base64
|
||||
from biopro.data import *
|
||||
from biopro.devlib.data import *
|
||||
from biopro.generator import GeneratorOptions
|
||||
from biopro.impl.ext_mem import ExtMemSpiInterface, MultiExtMemSpiInterface, ExtMemManager
|
||||
from biopro.impl.ext_mem import MultiExtMemSpiInterface, ExtMemManager
|
||||
from biopro.impl.selector import Selector
|
||||
from biopro.recording import RecordingMetaFile, RecordingFileWriter
|
||||
from biopro.util.address import EMPTY_ADDRESS, address_str
|
||||
@@ -131,9 +131,6 @@ class DataServer(SocketServer, DataAPI):
|
||||
self._available_channel.clear()
|
||||
|
||||
if self._spi is not None:
|
||||
self.log_verbose('spi flush')
|
||||
self._spi.flush_all()
|
||||
|
||||
self.reset_available_channel()
|
||||
|
||||
LEAK.reset()
|
||||
@@ -200,7 +197,7 @@ class DataServer(SocketServer, DataAPI):
|
||||
self.setup_spi(spi_mode)
|
||||
|
||||
# restart
|
||||
self.setup()
|
||||
# self.setup()
|
||||
|
||||
# data_server setup mqtt start
|
||||
if self.mqtt_thread is not None:
|
||||
@@ -224,8 +221,6 @@ class DataServer(SocketServer, DataAPI):
|
||||
return
|
||||
elif spi_mode == self.MODE_DISABLE:
|
||||
spi = None
|
||||
elif spi_mode == self.MODE_SINGLE:
|
||||
spi = ExtMemSpiInterface()
|
||||
elif spi_mode == self.MODE_SELECTOR:
|
||||
spi = MultiExtMemSpiInterface(Selector.get(Selector.MEM_SELECTOR))
|
||||
else:
|
||||
@@ -511,8 +506,6 @@ class DataServer(SocketServer, DataAPI):
|
||||
# start sync
|
||||
for runtime in r:
|
||||
if runtime is not None and not runtime.sync_started:
|
||||
# if isinstance(runtime, DeviceDataRuntime):
|
||||
# self.spi_flush(runtime.device)
|
||||
|
||||
# if client is not None:
|
||||
# client.drop_data(runtime.device)
|
||||
@@ -562,28 +555,11 @@ class DataServer(SocketServer, DataAPI):
|
||||
# self.spi_reset_ram_header(c._device)
|
||||
self._spi.set_wait_flag(c._device, True)
|
||||
|
||||
self._configurations[d] = None
|
||||
del self._configurations[d]
|
||||
self.log_info('stop_sync', c._device)
|
||||
self.mqtt_thread.broadcast_command('stop:' + str(c._device))
|
||||
# r.append(c)
|
||||
|
||||
# stop sync
|
||||
# for runtime in r:
|
||||
# if runtime is not None and runtime.sync_started:
|
||||
# self.log_info('stop_sync', runtime.device)
|
||||
# self.mqtt_thread.broadcast_command('stop:' + str(runtime.device))
|
||||
|
||||
# try:
|
||||
# runtime.shutdown()
|
||||
# except:
|
||||
# print_exception(self)
|
||||
|
||||
# # finally:
|
||||
# # # self.spi_flush(runtime.device)
|
||||
# # if _FLAG_DATA_LOST_STATS_:
|
||||
# # if isinstance(runtime, DeviceDataRuntime):
|
||||
# # runtime.log_data_receive_statistics(self)
|
||||
# # runtime.shutdown()
|
||||
|
||||
# stop runtime, none device working
|
||||
if not self.sync_started:
|
||||
@@ -663,52 +639,40 @@ class DataServer(SocketServer, DataAPI):
|
||||
client.clear()
|
||||
client.close_socket()
|
||||
|
||||
def recv_data_form_spi(self) -> bool:
|
||||
"""
|
||||
"""
|
||||
current_time = time()
|
||||
|
||||
def get_spi_obj(self):
|
||||
return self._spi
|
||||
|
||||
def whether_to_record(self, device):
|
||||
# if user click "start", return True; if user click "stop", return False;
|
||||
if device in self._configurations.keys() and self._configurations[device] is not None:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def recv_data_form_spi_new(self, device) -> bool:
|
||||
ret = False
|
||||
sync = self.get_spi_obj()
|
||||
|
||||
devicelist = self._configurations.keys()
|
||||
if sync.get_pin_mem_req() == sync.get_pin_ram_sel():
|
||||
spi_data = sync.recv_memory(device)
|
||||
signal = sync.get_pin_mem_req()
|
||||
sync.set_pin_mem_req(not signal)
|
||||
data = spi_data
|
||||
|
||||
devicelist = [4, 5, 7, 6]
|
||||
else:
|
||||
data = None
|
||||
|
||||
for c in devicelist:
|
||||
sync = self._spi
|
||||
sync.select = c
|
||||
if data is not None:
|
||||
if self._configurations[device].queue_flag:
|
||||
self._configurations[device].queue_flag = False
|
||||
print("q size= ", self._configurations[device]._queue_rec.qsize())
|
||||
|
||||
# delay 120us ~ 270us
|
||||
count = 0
|
||||
for i in range(300):
|
||||
count = count + 1
|
||||
|
||||
if c in self._configurations.keys() and self._configurations[c] is not None:
|
||||
data = self.spi_recv(c)
|
||||
if time() - current_time > 0.1:
|
||||
print('time, spi_recv', current_time, time() - current_time)
|
||||
current_time = time()
|
||||
if data is not None:
|
||||
try:
|
||||
|
||||
if self._configurations[c].queue_flag:
|
||||
self._configurations[c].queue_flag = False
|
||||
print("q size= ", self._configurations[c]._queue_rec.qsize())
|
||||
|
||||
self._configurations[c].put_rec_queue(data)
|
||||
if time() - current_time > 0.05:
|
||||
print('time, queue', current_time, time() - current_time)
|
||||
current_time = time()
|
||||
# print('done put queue')
|
||||
except:
|
||||
return
|
||||
else:
|
||||
ret = True
|
||||
# else:
|
||||
# print('****1')
|
||||
self._configurations[device].put_rec_queue(data)
|
||||
ret = True
|
||||
|
||||
return ret
|
||||
|
||||
|
||||
def rec_update(self) -> bool:
|
||||
|
||||
device_id = self._queue_db_error.get()
|
||||
@@ -722,165 +686,6 @@ class DataServer(SocketServer, DataAPI):
|
||||
|
||||
return True
|
||||
|
||||
def recv_data_foreach_runtime(self, device_id: int) -> bool:
|
||||
# """foreach data runtime to receive data. called by :class:`DataRuntimeThread`.
|
||||
|
||||
# :return: has runtime received data
|
||||
# """
|
||||
# q = None
|
||||
# data = None
|
||||
# try:
|
||||
# q = self._queue_spi_dict[device_id].get()
|
||||
# except:
|
||||
# return False
|
||||
|
||||
# ret = False
|
||||
|
||||
|
||||
# if self._queue_spi_dict[device_id].qsize() > 10:
|
||||
# print('qsize: ', device_id, self._queue_spi_dict[device_id].qsize())
|
||||
|
||||
# for c in self._configurations:
|
||||
# if self._configurations[c] is not None and self._configurations[c].sync_started:
|
||||
# if self._configurations[c]._device == device_id:
|
||||
# try:
|
||||
# data = self._configurations[c].sync_data(q)
|
||||
# except EODInterrupt:
|
||||
# self._configurations[c].sync_started = False
|
||||
# except:
|
||||
# # catch any error and ignore it
|
||||
# print_exception(self)
|
||||
# self._configurations[c].sync_started = False
|
||||
|
||||
# else:
|
||||
# if data is not None and len(data) > 0:
|
||||
# ret = True
|
||||
# # if self._configurations[c].sync_file_request:
|
||||
# # self._configurations[c].sync_file()
|
||||
# # for c in self._configurations:
|
||||
# # # print('_configurations', c)
|
||||
# # if c is not None and c.sync_started:
|
||||
# # if q[0] == c._device:
|
||||
# # try:
|
||||
# # # print('c.time', c._prev_data, c._prev_time_stamp, c._prev_delta_time)
|
||||
# # # c._timer_of_not_send = int(time())
|
||||
# # data = c.sync_data(q[1])
|
||||
|
||||
# # except EODInterrupt:
|
||||
# # c.sync_started = False
|
||||
|
||||
# # except:
|
||||
# # # catch any error and ignore it
|
||||
# # print_exception(self)
|
||||
# # c.sync_started = False
|
||||
|
||||
# # else:
|
||||
# # if data is not None and len(data) > 0:
|
||||
# # ret = True
|
||||
|
||||
# # if c.sync_file_request:
|
||||
# # c.sync_file()
|
||||
# del q
|
||||
# del data
|
||||
|
||||
return
|
||||
|
||||
def spi_flush(self, device: int):
|
||||
"""clean spi buffer"""
|
||||
|
||||
if self._spi is not None:
|
||||
self._spi.select = device
|
||||
self._spi.flush()
|
||||
return
|
||||
|
||||
def spi_reset_ram_header(self, device: int):
|
||||
if self._spi is not None:
|
||||
self._spi.select = device
|
||||
self._spi.request_data()
|
||||
sleep(0.01)
|
||||
self._spi.reset()
|
||||
self._spi.flush()
|
||||
return
|
||||
|
||||
def spi_send(self, device: int, address: int, data: bytes):
|
||||
sync = self._spi
|
||||
|
||||
if sync is None:
|
||||
return
|
||||
|
||||
sync.select = device
|
||||
sync.write_memory(address, data)
|
||||
return
|
||||
|
||||
def spi_recv(self, device: int) -> Optional[bytes]:
|
||||
sync = self._spi
|
||||
|
||||
if sync is None:
|
||||
return None
|
||||
if self._is_usb_port(device):
|
||||
# if self._is_demo_usb_port(device):
|
||||
# self._usb will be a list when suporting multi usb device
|
||||
sync = self._usb
|
||||
|
||||
if sync is None:
|
||||
return None
|
||||
|
||||
data = sync.recv_memory()
|
||||
if data is None:
|
||||
return None
|
||||
|
||||
data_length = len(data) + 1
|
||||
header = 0xFF
|
||||
data_counter = 0x00
|
||||
data_header = [header, data_counter, data_length, device]
|
||||
data_header.extend(data)
|
||||
|
||||
return bytes(data_header)
|
||||
|
||||
else:
|
||||
sync = self._spi
|
||||
|
||||
if sync is None:
|
||||
return None
|
||||
|
||||
# sync.select = device
|
||||
|
||||
# sleep(0.003)
|
||||
|
||||
if sync.changed(flip=True):
|
||||
spi_data = sync.recv_memory(device)
|
||||
|
||||
return spi_data
|
||||
# if sync.get_wait_flag(device) is False:
|
||||
# return spi_data
|
||||
# else:
|
||||
# sync.set_wait_flag(device, False)
|
||||
# print("discard first data")
|
||||
# return None
|
||||
# return sync.recv_memory()
|
||||
else:
|
||||
sync.request_data()
|
||||
|
||||
return None
|
||||
|
||||
def _is_usb_port(self, device: int) -> bool:
|
||||
max_spi_port_number = 8
|
||||
|
||||
if device >= max_spi_port_number:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
sync.select = device
|
||||
|
||||
if sync.changed(flip=True):
|
||||
# print('recv_memory~~~')
|
||||
return sync.recv_memory()
|
||||
else:
|
||||
# print('request_data___')
|
||||
return sync.request_data()
|
||||
|
||||
|
||||
class DataRuntime(metaclass=abc.ABCMeta):
|
||||
__slots__ = ('_server', '_device', '_meta_file', '_data_format',
|
||||
'_sync_started', 'sync_file_request', '_writer')
|
||||
@@ -1328,12 +1133,6 @@ class DataRuntimeThread(ServerThread):
|
||||
return True
|
||||
|
||||
def routine(self, event = None) -> None:
|
||||
# start = time()
|
||||
# ret = self._server.recv_data_foreach_runtime(self._device_id)
|
||||
# self._counter += 1
|
||||
# if self._counter > 10000:
|
||||
# gc.collect()
|
||||
# self._counter = 0
|
||||
del ret
|
||||
return
|
||||
|
||||
@@ -1346,8 +1145,9 @@ class SpiRuntimeThread(ServerThread):
|
||||
# routine period control
|
||||
self._start_time = 0.0
|
||||
self._time_stamp = 0.0
|
||||
self._interval = 0.15
|
||||
self._interval = 0.045
|
||||
self._timer = time()
|
||||
self._read_memory_board_idx = 0
|
||||
|
||||
def setup(self) -> None:
|
||||
super().setup()
|
||||
@@ -1360,27 +1160,40 @@ class SpiRuntimeThread(ServerThread):
|
||||
# self._server.close_cache_client()
|
||||
return True
|
||||
|
||||
def routine(self, event = None) -> None:
|
||||
def routine(self, event = None) -> None: # routine 50 ms
|
||||
server = self._server
|
||||
self._timer = time()
|
||||
ret = server.recv_data_form_spi()
|
||||
|
||||
sync = server.get_spi_obj()
|
||||
|
||||
# select channel
|
||||
devicelist = [4, 5, 7, 6]
|
||||
c = devicelist[self._read_memory_board_idx]
|
||||
sync.select = c
|
||||
|
||||
if server.whether_to_record(c):
|
||||
sync.set_pin_mem_sel(False)
|
||||
ret = server.recv_data_form_spi_new(c) # read ram & put data into queue, if has data, ret = true
|
||||
|
||||
self._read_memory_board_idx = 0 if self._read_memory_board_idx == 3 else self._read_memory_board_idx + 1
|
||||
|
||||
run_time = time() - self._timer
|
||||
if run_time > self._interval:
|
||||
print('time, recv_data_form_spi_routine_time', time(), run_time)
|
||||
|
||||
if run_time > 0.15:
|
||||
run_time = 0.15
|
||||
if run_time > 0.045:
|
||||
print('time, recv_data_form_spi_routine_time', time(), run_time)
|
||||
run_time = 0.045
|
||||
|
||||
if server.sync_started:
|
||||
event.wait((self._interval - run_time))
|
||||
event.wait(self._interval - run_time)
|
||||
sync.set_pin_mem_sel(True)
|
||||
sleep(0.005)
|
||||
return
|
||||
else:
|
||||
event.wait(self._interval - run_time)
|
||||
sync.set_pin_mem_sel(True)
|
||||
self.close()
|
||||
return
|
||||
|
||||
self._start_time = time()
|
||||
return
|
||||
|
||||
class RecRuntimeThread(ServerThread):
|
||||
def __init__(self, server: DataServer):
|
||||
super().__init__('RecRunTime', MAGENTA)
|
||||
|
||||
@@ -15,11 +15,12 @@ from biopro.util.json import JSON_OBJECT
|
||||
from .socket import ServerThread
|
||||
|
||||
import psycopg2
|
||||
# from psycopg2.pool import ThreadedConnectionPool
|
||||
from psycopg2.extras import execute_batch
|
||||
from multiprocessing import Process, Queue
|
||||
|
||||
import biopro.server._identify
|
||||
|
||||
from time import time
|
||||
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
@@ -308,22 +309,16 @@ class DataBaseProcess(Process):
|
||||
return None
|
||||
|
||||
def data_raw_create(self, _data_dict, _channel_list, device_id):
|
||||
|
||||
for _channel in _channel_list:
|
||||
sql_str = 'INSERT INTO "public"."' + str(_channel) + '_recording_data_raws" ('
|
||||
sql_set = []
|
||||
for item in _data_dict[_channel].keys():
|
||||
sql_str = sql_str + str(item) + ', '
|
||||
if isinstance(_data_dict[_channel][item], dict):
|
||||
sql_set.append(json_stringify(_data_dict[_channel][item]))
|
||||
else:
|
||||
sql_set.append(str(_data_dict[_channel][item]))
|
||||
|
||||
sql_str = sql_str[0:-2] + ') VALUES ('
|
||||
for item in _data_dict[_channel].keys():
|
||||
sql_str = sql_str + '%s, '
|
||||
key_list = _data_dict[_channel].keys()
|
||||
key_str = ','.join(key_list)
|
||||
sql_set = list(map(lambda x: str(x), _data_dict[_channel].values()))
|
||||
values = ','.join(['%s'] * len(key_list))
|
||||
|
||||
sql_str = sql_str[0:-2] + ') RETURNING id'
|
||||
sql_str = sql_str + key_str + ') VALUES (' + values + ') RETURNING id'
|
||||
sql_cursor = self._psql_conn.cursor()
|
||||
|
||||
try:
|
||||
@@ -360,25 +355,32 @@ class DataBaseProcess(Process):
|
||||
|
||||
return None
|
||||
|
||||
def data_raw_recording(self, _id_dict, _channel_list, _data_dict):
|
||||
for _channel in _channel_list:
|
||||
compressed_value = _data_dict[_channel] + '"***"'
|
||||
# compressed_value = bytes(_data_dict[_channel],'utf-8')
|
||||
# compressed_value = zlib.compress(compressed_value)
|
||||
# compressed_value = base64.b64encode(compressed_value).decode() + '"***"'
|
||||
# compressed_value = _data + '"***"'
|
||||
sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_raws" SET data = concat(data, %s) where id = %s'
|
||||
sql_set = [compressed_value, _id_dict[_channel]]
|
||||
|
||||
sql_cursor = self._psql_conn.cursor()
|
||||
sql_cursor.execute(sql_str, sql_set)
|
||||
self._psql_conn.commit()
|
||||
sql_cursor.close()
|
||||
|
||||
del _data_dict[_channel]
|
||||
del compressed_value
|
||||
gc.collect()
|
||||
# _conn.close()
|
||||
def data_raw_recording(self, _id_dict, _channel_list, _data_dict, _id_db_save):
|
||||
para_list = []
|
||||
try:
|
||||
### execute way
|
||||
# with self._psql_conn as conn:
|
||||
# with conn.cursor() as sql_cursor:
|
||||
# for _channel in _channel_list:
|
||||
# temp_id = _id_dict[_channel]
|
||||
# if temp_id == 0:
|
||||
# temp_id = _id_db_save[_channel]
|
||||
# # print(_channel, temp_id)
|
||||
# sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s) where id = %s'
|
||||
# sql_set = [_channel, _data_dict[_channel] + '"***"', temp_id]
|
||||
# sql_cursor.execute(sql_str, sql_set)
|
||||
### execute_batch
|
||||
with self._psql_conn as conn:
|
||||
with conn.cursor() as sql_cursor:
|
||||
sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s) where id = %s'
|
||||
for _channel in _channel_list:
|
||||
temp_id = _id_dict[_channel]
|
||||
if temp_id == 0:
|
||||
temp_id = _id_db_save[_channel]
|
||||
para_list.append((_channel, _data_dict[_channel] + '"***"', temp_id))
|
||||
execute_batch(sql_cursor,sql_str, para_list)
|
||||
except psycopg2.Error as e:
|
||||
print('recording error', e)
|
||||
return None
|
||||
|
||||
def data_mini_create(self, _data_dict, _channel_list, _scale, device_id):
|
||||
@@ -415,38 +417,24 @@ class DataBaseProcess(Process):
|
||||
return True
|
||||
|
||||
def data_mini_recording(self, _id_dict, _channel_list, _start_time_dict, _data_mean_dict):
|
||||
for _channel in _channel_list:
|
||||
data = _data_mean_dict.get(_channel)
|
||||
if data is not None:
|
||||
if len(data) != 0:
|
||||
str_mean = [str(int) for int in _data_mean_dict[_channel]]
|
||||
data_mean = _start_time_dict[_channel] + ' ' + ' '.join(str_mean)
|
||||
# data_random = _start_time_dict[_channel] + ' ' + ' '.join(_data_random_dict[_channel])
|
||||
# data_bar = _start_time_dict[_channel] + ' ' + ' '.join(_data_bar_dict[_channel])
|
||||
with self._psql_conn as conn:
|
||||
with self._psql_conn.cursor() as sql_cursor:
|
||||
for _channel in _channel_list:
|
||||
data = _data_mean_dict.get(_channel)
|
||||
if data is not None:
|
||||
if len(data) != 0:
|
||||
str_mean = [str(int) for int in _data_mean_dict[_channel]]
|
||||
data_mean = _start_time_dict[_channel] + ' ' + ' '.join(str_mean)
|
||||
|
||||
compressed_mean = data_mean + '"***"'
|
||||
|
||||
# compressed_mean = bytes(data_mean,'utf-8')
|
||||
# compressed_mean = zlib.compress(compressed_mean)
|
||||
# compressed_mean = base64.b64encode(compressed_mean).decode() + '"***"'
|
||||
|
||||
# compressed_random = bytes(data_bar,'utf-8')
|
||||
# compressed_random = zlib.compress(compressed_random)
|
||||
# compressed_random = base64.b64encode(compressed_random).decode() + '"***"'
|
||||
|
||||
# compressed_random = bytes(data_random,'utf-8')
|
||||
# compressed_random = zlib.compress(compressed_random)
|
||||
# compressed_random = base64.b64encode(compressed_random).decode() + '"***"'
|
||||
sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_minis" SET data_mean = concat(data_mean, %s) where id = %s'
|
||||
sql_set = [compressed_mean, _id_dict[_channel]]
|
||||
|
||||
sql_cursor = self._psql_conn.cursor()
|
||||
sql_set = [data_mean + '"***"', _id_dict[_channel]]
|
||||
sql_cursor.execute(sql_str, sql_set)
|
||||
self._psql_conn.commit()
|
||||
sql_cursor.close()
|
||||
|
||||
del str_mean, _start_time_dict[_channel], _data_mean_dict[_channel], data_mean, compressed_mean
|
||||
gc.collect()
|
||||
del str_mean, data_mean
|
||||
|
||||
for _channel in _channel_list:
|
||||
del _start_time_dict[_channel], _data_mean_dict[_channel]
|
||||
gc.collect()
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ from .api import ApiRequests
|
||||
from biopro.api.auth import AuthAPI
|
||||
from biopro.api.controller import ControllerAPI
|
||||
from biopro.api.device import DeviceAPI
|
||||
from biopro.project.project_manager import ProjectManager
|
||||
### do not import Websocket mode
|
||||
###from .websocket import WebsocketThread
|
||||
|
||||
@@ -154,7 +155,8 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
# _api request build
|
||||
self._api = ApiRequests()
|
||||
|
||||
|
||||
self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
|
||||
|
||||
|
||||
# init method
|
||||
|
||||
@@ -193,6 +195,11 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
def device_manager(self) -> DeviceManager:
|
||||
return self._device_manager
|
||||
|
||||
@property
|
||||
def project_manager(self) -> ProjectManager:
|
||||
return self._project_manager
|
||||
|
||||
|
||||
# server setup
|
||||
|
||||
def setup(self) -> None:
|
||||
@@ -213,8 +220,8 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
self.led_thread.set_state(LED.POWER_ON)
|
||||
|
||||
# sha checking
|
||||
if _RUNTIME_COMPILE or not self._controller_options.flag_disable_sha_check:
|
||||
self.run_thread(_RandomCrashThread())
|
||||
# if _RUNTIME_COMPILE or not self._controller_options.flag_disable_sha_check:
|
||||
# self.run_thread(_RandomCrashThread())
|
||||
|
||||
# data server
|
||||
interface = self.device_manager.interface
|
||||
@@ -335,7 +342,7 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
if available_channel is None:
|
||||
self.device_manager.setup(DeviceHardwareInterface.INTERFACE_DUMMY)
|
||||
else:
|
||||
self._setup_device_manager(available_channel)
|
||||
self.broadcast_command('state:device_available')
|
||||
|
||||
except ServerShutdownException as e:
|
||||
self.interrupt(e)
|
||||
@@ -407,24 +414,6 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
self.log_verbose('available channel', available_channel)
|
||||
return available_channel
|
||||
|
||||
def _setup_device_manager(self, available_channel: List[int]):
|
||||
# device reset
|
||||
# only reset those device has channel available
|
||||
self.log_verbose('reset device')
|
||||
self.device_manager.reset(available_channel)
|
||||
|
||||
# device checking
|
||||
available_device = self.device_manager.available_device()
|
||||
|
||||
self.log_verbose('available device', available_device)
|
||||
self.broadcast_command('state:device_available')
|
||||
|
||||
if len(available_device) == 0:
|
||||
raise RuntimeError('empty device')
|
||||
|
||||
elif available_device != available_channel:
|
||||
raise RuntimeError('device/channel mismatch')
|
||||
|
||||
def _setup_restart_device_manager(self, interface: str):
|
||||
self.log_info('shutdown device manager')
|
||||
self.device_manager.shutdown()
|
||||
@@ -663,9 +652,9 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
if self.device_manager.scan_callback(callback, timeout=self._scan_max_timeout, all_device=True):
|
||||
self.broadcast_command(DataMessage.scan('done'))
|
||||
|
||||
if device_not_found:
|
||||
# no device found, longer the max scan time
|
||||
self._scan_max_timeout = min(10, self._scan_max_timeout + 2)
|
||||
# if device_not_found:
|
||||
# # no device found, longer the max scan time
|
||||
# self._scan_max_timeout = min(10, self._scan_max_timeout + 2)
|
||||
|
||||
@logging_info
|
||||
def hardware_device(self) -> List[DeviceResponseInfo]:
|
||||
@@ -1337,6 +1326,12 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
|
||||
# p = self.exp_manager.create_protocol(content, user_name)
|
||||
return
|
||||
|
||||
@logging_info
|
||||
def run_project(self, project) -> bool:
|
||||
project = self._project_manager.create(project)
|
||||
self._project_manager.run(project)
|
||||
return False
|
||||
|
||||
# @logging_info
|
||||
# def exp_pro_options(self, protocol: int) -> List[ExpOption]:
|
||||
# return self.exp_manager.protocol_options(protocol)
|
||||
|
||||
@@ -324,19 +324,52 @@ class RecordingProcess(Process):
|
||||
|
||||
if (save == False):
|
||||
self._wrong_cnt += 1
|
||||
print('jump cnt', self._wrong_cnt, 'times', datetime.now())
|
||||
print('jump cnt', self._wrong_cnt, 'times, device:', device, ',', datetime.now())
|
||||
|
||||
return save
|
||||
|
||||
def _check_jump_ram(self, raw_data: bytes, colum_now: int, colum_total: int, save: bool, device: int):
|
||||
i = colum_now
|
||||
|
||||
if (raw_data[i][0] == 255 and raw_data[i][3] == device):
|
||||
if (i <= colum_total - 3):
|
||||
if(raw_data[i + 1][1] - raw_data[i][1] == 1 and raw_data[i + 2][1] - raw_data[i + 1][1] == 1):
|
||||
if colum_total < 3:
|
||||
print('this ram data < 3 records, need to fix, colum_total = ', colum_total)
|
||||
if colum_total == 1:
|
||||
print('raw_data[0]', raw_data[0])
|
||||
|
||||
elif colum_total == 2:
|
||||
print('raw_data[0]', raw_data[0])
|
||||
print('raw_data[1]', raw_data[1])
|
||||
|
||||
else:
|
||||
|
||||
if((raw_data[i + 1][1] - raw_data[i][1] == 1 and raw_data[i + 2][1] - raw_data[i + 1][1] == 1) or
|
||||
(raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
|
||||
(raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
|
||||
|
||||
if ((raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
|
||||
(raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
|
||||
print('cnt = [254, 255, 0] or [255, 0, 1]')
|
||||
|
||||
save = True
|
||||
self._skip_ram_cnt += 1
|
||||
last_data_cnt = raw_data[i][1]
|
||||
print('skip RAM, but data is right, solve data', list(raw_data[i]), 'skip Ram', self._skip_ram_cnt, 'times')
|
||||
if (device == 4):
|
||||
print('self._last_cnt[4]:', self._last_cnt[4], ', last_data_cnt:', last_data_cnt)
|
||||
if (device == 5):
|
||||
print('self._last_cnt[5]:', self._last_cnt[5], ', last_data_cnt:', last_data_cnt)
|
||||
if (device == 6):
|
||||
print('self._last_cnt[6]:', self._last_cnt[6], ', last_data_cnt:', last_data_cnt)
|
||||
if (device == 7):
|
||||
print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
|
||||
|
||||
print('skip RAM, but data is right, solve data', list(raw_data[i][0:3]), 'skip Ram', self._skip_ram_cnt, 'times')
|
||||
# print('data:')
|
||||
# print('|', list(raw_data[0]))
|
||||
# print('|', list(raw_data[1]))
|
||||
# print('| ... ... ...')
|
||||
# print('| ... ... ...')
|
||||
# print('|', list(raw_data[colum_total-1]))
|
||||
print()
|
||||
|
||||
if (device == 4):
|
||||
@@ -465,7 +498,7 @@ class RecordingProcess(Process):
|
||||
"""
|
||||
raw_data = []
|
||||
index = 0
|
||||
elite_data_len = 20
|
||||
elite_data_len = 40
|
||||
mem_header_len = 3
|
||||
mem_tailer_len = 8
|
||||
single_data_len = elite_data_len + mem_header_len + mem_tailer_len
|
||||
|
||||
Reference in New Issue
Block a user