Compare commits

...

4 Commits

Author SHA1 Message Date
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
3 changed files with 14 additions and 2 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):
+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
],