Compare commits

...

6 Commits

Author SHA1 Message Date
peterlu14 6b3649c8a0 [update] change wifi name auto update 2022-01-20 15:48:46 +08:00
Roy 95d27aa6f2 mem data don't save in database 2022-01-19 15:53:22 +08:00
benny a3d794d9a1 change initial value of FREQ_STOP and DC_BIAS 2022-01-13 17:53:09 +08:00
benny 197a3a6f05 Merge branch 'dev/eis' into main 2022-01-12 17:53:21 +08:00
peterlu14 ae2f8e7e70 [update] support get device by mac_address_str 2021-12-24 10:32:42 +08:00
peterlu14 a13dde3055 [update] add gitignore 2021-12-24 10:31:43 +08:00
6 changed files with 35 additions and 15 deletions
+7
View File
@@ -0,0 +1,7 @@
.DS_Store
*.cpython-37.opt-2.pyc
*.pyc
*/__pycache__
/.vscode
/media
python/biopro/sever/_identify.py
+5
View File
@@ -575,6 +575,11 @@ class DeviceManager(MasterDevice, Synchronized):
if slave.device_id == device:
return slave
elif isinstance(device, str):
for slave in self._device:
if ':'.join(format(b, 'x') for b in slave.mac_address) == device:
return slave
elif isinstance(device, DeviceInfo):
for slave in self._device:
if device.match(slave):
+7 -6
View File
@@ -948,12 +948,13 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
ret.append_data(3, cycle_number)
# 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, 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
+9 -2
View File
@@ -307,8 +307,15 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
if len(controller) == 0:
ControllerAPI.create(hardware_info)
elif len(controller) > 0:
if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id']:
ControllerAPI.updateByAttrs('mac_address', hardware_info['mac_address'], {'software_version': hardware_info['software_version'], 'mqtt_id': mqtt_id })
if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id'] or hardware_info['wifi_name'] != controller[0]['wifi_name']:
ControllerAPI.updateByAttrs (
'mac_address', hardware_info['mac_address'], {
'software_version': hardware_info['software_version'],
'mqtt_id': mqtt_id,
'name': hardware_info['name'],
'wifi_name': hardware_info['wifi_name']
}
)
def _setup_device(self):
# wait data server
+5 -5
View File
@@ -509,11 +509,11 @@ class RecordingProcess(Process):
print_flag = True
print('delete data:', list(raw_data[i]))
if print_flag:
print('delete data context:')
for i in range(0, len(data), single_data_len):
print(list(data[i:i+single_data_len]))
print()
# if print_flag:
# print('delete data context:')
# for i in range(0, len(data), single_data_len):
# print(list(data[i:i+single_data_len]))
# print()
return
+2 -2
View File
@@ -67,7 +67,7 @@
"FREQ_STOP": {
"description": "End of Freq Scan",
"record_meta": true,
"initial": 1,
"initial": 7,
"domain": [
"FREQ_MAX"
],
@@ -100,7 +100,7 @@
"DC_BIAS": {
"description": "DC voltage bias in mV",
"record_meta": true,
"initial": 0,
"initial": 15000,
"domain": [
35001
],