Skip to content

Commit da550e9

Browse files
MarkoVcodeMarkoVcode
committed
fixing manifests
1 parent d335975 commit da550e9

5 files changed

Lines changed: 416 additions & 415 deletions

File tree

‎benchmesh-serial-service/src/benchmesh_service/api.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ def list_instruments():
212212
classes_list.append({
213213
"class": klass,
214214
"channels": ch_paths,
215+
"ui_component": klass_cfg.get('ui_component')
215216
})
216217
if classes_list:
217218
entry['classes'] = classes_list

‎benchmesh-serial-service/src/benchmesh_service/drivers/owon_oel/manifest.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,59 +48,59 @@
4848
"unit": "W",
4949
"max": 150.0
5050
}
51-
}
52-
},
53-
"modes": {
54-
"CC": {
55-
"setpoint": {
56-
"unit": "A",
57-
"min": 0.0,
58-
"max": 15.0,
59-
"step": 0.001,
60-
"ui_step": 0.01
51+
},
52+
"modes": {
53+
"CC": {
54+
"setpoint": {
55+
"unit": "A",
56+
"min": 0.0,
57+
"max": 15.0,
58+
"step": 0.001,
59+
"ui_step": 0.01
60+
},
61+
"protection": {
62+
"ovp": {
63+
"unit": "V",
64+
"min": 0,
65+
"max": 150,
66+
"step": 0.1
67+
}
68+
}
6169
},
62-
"protection": {
63-
"ovp": {
70+
"CV": {
71+
"setpoint": {
6472
"unit": "V",
65-
"min": 0,
66-
"max": 150,
67-
"step": 0.1
73+
"min": 0.0,
74+
"max": 150.0,
75+
"step": 0.01,
76+
"ui_step": 0.1
77+
},
78+
"protection": {
79+
"ocp": {
80+
"unit": "A",
81+
"min": 0,
82+
"max": 15,
83+
"step": 0.01
84+
}
6885
}
69-
}
70-
},
71-
"CV": {
72-
"setpoint": {
73-
"unit": "V",
74-
"min": 0.0,
75-
"max": 150.0,
76-
"step": 0.01,
77-
"ui_step": 0.1
7886
},
79-
"protection": {
80-
"ocp": {
81-
"unit": "A",
82-
"min": 0,
83-
"max": 15,
84-
"step": 0.01
87+
"CR": {
88+
"setpoint": {
89+
"unit": "Ω",
90+
"min": 0.05,
91+
"max": 1000,
92+
"step": 0.01,
93+
"ui_step": 0.1
94+
}
95+
},
96+
"CP": {
97+
"setpoint": {
98+
"unit": "W",
99+
"min": 0.5,
100+
"max": 200,
101+
"step": 0.1,
102+
"ui_step": 1.0
85103
}
86-
}
87-
},
88-
"CR": {
89-
"setpoint": {
90-
"unit": "Ω",
91-
"min": 0.05,
92-
"max": 1000,
93-
"step": 0.01,
94-
"ui_step": 0.1
95-
}
96-
},
97-
"CP": {
98-
"setpoint": {
99-
"unit": "W",
100-
"min": 0.5,
101-
"max": 200,
102-
"step": 0.1,
103-
"ui_step": 1.0
104104
}
105105
}
106106
}

‎benchmesh-serial-service/src/benchmesh_service/drivers/owon_spm/manifest.json‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -48,71 +48,71 @@
4848
"display": "W",
4949
"max": 300.0
5050
}
51-
}
52-
},
53-
"modes": {
54-
"CC": {
55-
"setpoint": {
56-
"type": "number",
57-
"display": "A",
58-
"min": 0.01,
59-
"max": 10.1,
60-
"step": 0.001,
61-
"ui_step": 0.001
62-
},
63-
"protection": {
64-
"OCP": {
51+
},
52+
"modes": {
53+
"CC": {
54+
"setpoint": {
6555
"type": "number",
6656
"display": "A",
67-
"min": 0.1,
68-
"max": 10.2,
69-
"step": 0.001
57+
"min": 0.01,
58+
"max": 10.1,
59+
"step": 0.001,
60+
"ui_step": 0.001
61+
},
62+
"protection": {
63+
"OCP": {
64+
"type": "number",
65+
"display": "A",
66+
"min": 0.1,
67+
"max": 10.2,
68+
"step": 0.001
69+
}
7070
}
71-
}
72-
},
73-
"CV": {
74-
"setpoint": {
75-
"type": "number",
76-
"display": "V",
77-
"min": 0.01,
78-
"max": 31.0,
79-
"step": 0.01,
80-
"ui_step": 0.01
8171
},
82-
"protection": {
83-
"OVP": {
72+
"CV": {
73+
"setpoint": {
8474
"type": "number",
8575
"display": "V",
86-
"min": 0.1,
87-
"max": 32,
88-
"step": 0.01
76+
"min": 0.01,
77+
"max": 31.0,
78+
"step": 0.01,
79+
"ui_step": 0.01
80+
},
81+
"protection": {
82+
"OVP": {
83+
"type": "number",
84+
"display": "V",
85+
"min": 0.1,
86+
"max": 32,
87+
"step": 0.01
88+
}
8989
}
9090
}
9191
}
92-
},
93-
"DMM": {
94-
"pooling": [
95-
{
96-
"method": "poll_status_dmm",
97-
"interval": 0.9
98-
}
92+
}
93+
},
94+
"DMM": {
95+
"pooling": [
96+
{
97+
"method": "poll_status_dmm",
98+
"interval": 0.9
99+
}
100+
],
101+
"ui_component": "GenericDMM",
102+
"features": {
103+
"channels": 1,
104+
"modes": [
105+
"VOLTage:DC",
106+
"VOLTage:AC",
107+
"CURRent:DC",
108+
"CURRent:AC",
109+
"RESistance",
110+
"CAPacitance",
111+
"DIODe",
112+
"CONTinuity"
99113
],
100-
"ui_component": "GenericDMM",
101-
"features": {
102-
"channels": 1,
103-
"modes": [
104-
"VOLTage:DC",
105-
"VOLTage:AC",
106-
"CURRent:DC",
107-
"CURRent:AC",
108-
"RESistance",
109-
"CAPacitance",
110-
"DIODe",
111-
"CONTinuity"
112-
],
113-
"hold": true,
114-
"delta": true
115-
},
114+
"hold": true,
115+
"delta": true,
116116
"RANGe": {
117117
"CAPacitance": [
118118
{

0 commit comments

Comments
 (0)