From 4ba08a5c7f1b5fc9fc8c1de5d3cd0a42394e3136 Mon Sep 17 00:00:00 2001
From: Mario <mario@osaka.com>
Date: Mon, 26 Jul 2021 12:09:32 +0900
Subject: [PATCH] updated default PS cfg
---
configs/lr_powersupply.json | 68 ++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 31 deletions(-)
diff --git a/configs/lr_powersupply.json b/configs/lr_powersupply.json
index 06b8cd0..366abb4 100644
--- a/configs/lr_powersupply.json
+++ b/configs/lr_powersupply.json
@@ -1,5 +1,5 @@
{
- "LR_lib_path": "/path/to/labRemote/build/lib",
+ "LR_lib_path": "/path/to/lr/build/lib",
"channels_to_be_used_by_the_scanoperator": [
{
"name": "LV"
@@ -7,57 +7,63 @@
],
"version": "1.0",
-
- "options" : {
+ "options": {
"autoconfigure": false
},
- "devices": {
- "HMP4040" : {
+ "devices": [
+ {
+ "name": "HMP4040",
"hw-type": "PS",
"hw-model": "RS_HMP4040",
- "communication": {
- "protocol" : "TextSerialCom",
- "port" : "/dev/ttyACM0"
- }
- },
- "Keithley" : {
- "hw-type": "PS",
- "hw-model": "Keithley24XX",
"communication": {
"protocol": "TextSerialCom",
- "port": "/dev/ttyUSB1",
- "baudrate": "B9600",
- "termination": "\r"
+ "port": "/dev/ttyACM0",
+ "termination": "\n"
}
},
- "KeithleyGPIB" : {
+{
+ "name": "Keithley",
+ "hw-type": "PS",
+ "hw-model": "Keithley24XX",
+ "communication": {
+ "protocol": "TextSerialCom",
+ "port": "/dev/ttyUSB0",
+ "baudrate": "B9600",
+ "termination": "\r"
+ }
+},
+ {
+ "name": "KeithleyGPIB",
"hw-type": "PS",
"hw-model": "Keithley24XX",
"communication": {
"protocol": "GPIBSerialCom",
- "port": "/dev/ttyUSB1",
+ "port": "/dev/ttyUSB0",
"gpib_addr": 24
}
}
- },
- "channels": {
- "LV" : {
- "hw-type" : "PS",
+ ],
+ "channels": [
+ {
+ "name": "LV",
+ "hw-type": "PS",
"device": "HMP4040",
- "channel" : 1
+ "channel": 2
},
- "HVGPIB" : {
- "hw-type" : "PS",
+ {
+ "name": "HVGPIB",
+ "hw-type": "PS",
"device": "KeithleyGPIB",
- "channel" : 1,
+ "channel": 1,
"program": {
"maxvoltage": 40
}
},
- "HV" : {
- "hw-type" : "PS",
+ {
+ "name": "HV",
+ "hw-type": "PS",
"device": "Keithley",
- "channel" : 1
+ "channel": 1
}
- }
-}
+ ]
+}
\ No newline at end of file
--
GitLab