]>
Commit | Line | Data |
---|---|---|
d4eabea8 BV |
1 | /* |
2 | * This file is part of the libsigrok project. | |
3 | * | |
4 | * Copyright (C) 2014 Bert Vermeulen <bert@biot.com> | |
4ee1e2f3 AG |
5 | * Copyright (C) 2015 Google, Inc. |
6 | * (Written by Alexandru Gagniuc <mrnuke@google.com> for Google, Inc.) | |
7e66bf05 | 7 | * Copyright (C) 2017,2019 Frank Stettner <frank-stettner@gmx.net> |
d4eabea8 BV |
8 | * |
9 | * This program is free software: you can redistribute it and/or modify | |
10 | * it under the terms of the GNU General Public License as published by | |
11 | * the Free Software Foundation, either version 3 of the License, or | |
12 | * (at your option) any later version. | |
13 | * | |
14 | * This program is distributed in the hope that it will be useful, | |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 | * GNU General Public License for more details. | |
18 | * | |
19 | * You should have received a copy of the GNU General Public License | |
20 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
21 | */ | |
22 | ||
6ec6c43b | 23 | #include <config.h> |
22c18b03 | 24 | #include <string.h> |
ba464a12 | 25 | #include <strings.h> |
d4eabea8 BV |
26 | #include "protocol.h" |
27 | ||
28 | #define CH_IDX(x) (1 << x) | |
6ed709fe | 29 | #define FREQ_DC_ONLY {0, 0, 0, 0, 0} |
49a468ed FS |
30 | #define NO_OVP_LIMITS {0, 0, 0, 0, 0} |
31 | #define NO_OCP_LIMITS {0, 0, 0, 0, 0} | |
d4eabea8 | 32 | |
5c9e56c9 AG |
33 | /* Agilent/Keysight N5700A series */ |
34 | static const uint32_t agilent_n5700a_devopts[] = { | |
e91bb0a6 | 35 | SR_CONF_CONTINUOUS, |
88e4daa9 ML |
36 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
37 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
5c9e56c9 AG |
38 | }; |
39 | ||
40 | static const uint32_t agilent_n5700a_devopts_cg[] = { | |
41 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
42 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
43 | SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
da005885 UH |
44 | SR_CONF_VOLTAGE | SR_CONF_GET, |
45 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
46 | SR_CONF_CURRENT | SR_CONF_GET, | |
47 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
5c9e56c9 AG |
48 | }; |
49 | ||
6cc93128 | 50 | static const struct channel_group_spec agilent_n5700a_cg[] = { |
f2bbcc33 | 51 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
6cc93128 AG |
52 | }; |
53 | ||
8cb5affe | 54 | static const struct channel_spec agilent_n5767a_ch[] = { |
49a468ed | 55 | { "1", { 0, 60, 0.0072, 3, 4 }, { 0, 25, 0.003, 3, 4 }, { 0, 1500 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
5c9e56c9 AG |
56 | }; |
57 | ||
6cc93128 | 58 | static const struct channel_spec agilent_n5763a_ch[] = { |
49a468ed | 59 | { "1", { 0, 12.5, 0.0015, 3, 4 }, { 0, 120, 0.0144, 3, 4 }, { 0, 1500 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
5c9e56c9 AG |
60 | }; |
61 | ||
62 | /* | |
63 | * TODO: OVER_CURRENT_PROTECTION_ACTIVE status can be determined by the OC bit | |
562a3490 | 64 | * in STAT:QUES:EVEN?, but this is not implemented. |
5c9e56c9 | 65 | */ |
8cb5affe | 66 | static const struct scpi_command agilent_n5700a_cmd[] = { |
5c9e56c9 AG |
67 | { SCPI_CMD_REMOTE, "SYST:COMM:RLST REM" }, |
68 | { SCPI_CMD_LOCAL, "SYST:COMM:RLST LOC" }, | |
69 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
70 | { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" }, | |
71 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
72 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
73 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
74 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
75 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP:STAT?" }, | |
76 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, | |
77 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, | |
78 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" }, | |
79 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" }, | |
80 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":CURR:PROT:STAT?" }, | |
81 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":CURR:PROT:STAT ON?"}, | |
82 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT OFF?"}, | |
562a3490 | 83 | /* Current limit (CC mode) and OCP are set using the same command. */ |
5c9e56c9 AG |
84 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR?" }, |
85 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR %.6f" }, | |
91ef511d | 86 | ALL_ZERO |
5c9e56c9 AG |
87 | }; |
88 | ||
c3bfb959 MW |
89 | /* BK Precision 9130 series */ |
90 | static const uint32_t bk_9130_devopts[] = { | |
91 | SR_CONF_CONTINUOUS, | |
92 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, | |
93 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
94 | }; | |
95 | ||
96 | static const uint32_t bk_9130_devopts_cg[] = { | |
97 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
98 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
99 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
100 | SR_CONF_CURRENT | SR_CONF_GET, | |
101 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
102 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
103 | }; | |
104 | ||
105 | static const struct channel_spec bk_9130_ch[] = { | |
106 | { "1", { 0, 30, 0.001, 3, 3 }, { 0, 3, 0.001, 3, 3 }, { 0, 90, 0, 3, 3 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
107 | { "2", { 0, 30, 0.001, 3, 3 }, { 0, 3, 0.001, 3, 3 }, { 0, 90, 0, 3, 3 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
108 | { "3", { 0, 5, 0.001, 3, 3 }, { 0, 3, 0.001, 3, 3 }, { 0, 15, 0, 3, 3 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
109 | }; | |
110 | ||
111 | static const struct channel_group_spec bk_9130_cg[] = { | |
f2bbcc33 FS |
112 | { "1", CH_IDX(0), PPS_OVP, SR_MQFLAG_DC }, |
113 | { "2", CH_IDX(1), PPS_OVP, SR_MQFLAG_DC }, | |
114 | { "3", CH_IDX(2), PPS_OVP, SR_MQFLAG_DC }, | |
c3bfb959 MW |
115 | }; |
116 | ||
117 | static const struct scpi_command bk_9130_cmd[] = { | |
118 | { SCPI_CMD_REMOTE, "SYST:REMOTE" }, | |
119 | { SCPI_CMD_LOCAL, "SYST:LOCAL" }, | |
120 | { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" }, | |
121 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
122 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
123 | { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWER?" }, | |
124 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
125 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
126 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
127 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
128 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, | |
129 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP 1" }, | |
130 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP 0" }, | |
131 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT?" }, | |
132 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT %.6f" }, | |
133 | ALL_ZERO | |
134 | }; | |
135 | ||
4ee1e2f3 AG |
136 | /* Chroma 61600 series AC source */ |
137 | static const uint32_t chroma_61604_devopts[] = { | |
e91bb0a6 | 138 | SR_CONF_CONTINUOUS, |
88e4daa9 ML |
139 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
140 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
4ee1e2f3 AG |
141 | }; |
142 | ||
143 | static const uint32_t chroma_61604_devopts_cg[] = { | |
144 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
145 | SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
da005885 UH |
146 | SR_CONF_VOLTAGE | SR_CONF_GET, |
147 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
6c0c9dd2 AG |
148 | SR_CONF_OUTPUT_FREQUENCY | SR_CONF_GET, |
149 | SR_CONF_OUTPUT_FREQUENCY_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
da005885 UH |
150 | SR_CONF_CURRENT | SR_CONF_GET, |
151 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
4ee1e2f3 AG |
152 | }; |
153 | ||
8cb5affe | 154 | static const struct channel_spec chroma_61604_ch[] = { |
49a468ed | 155 | { "1", { 0, 300, 0.1, 1, 1 }, { 0, 16, 0.1, 2, 2 }, { 0, 2000, 0, 1, 1 }, { 1.0, 1000.0, 0.01 }, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
4ee1e2f3 AG |
156 | }; |
157 | ||
8cb5affe | 158 | static const struct channel_group_spec chroma_61604_cg[] = { |
f2bbcc33 | 159 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_AC }, |
4ee1e2f3 AG |
160 | }; |
161 | ||
8cb5affe | 162 | static const struct scpi_command chroma_61604_cmd[] = { |
4ee1e2f3 AG |
163 | { SCPI_CMD_REMOTE, "SYST:REM" }, |
164 | { SCPI_CMD_LOCAL, "SYST:LOC" }, | |
165 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":FETC:VOLT:ACDC?" }, | |
6c0c9dd2 | 166 | { SCPI_CMD_GET_MEAS_FREQUENCY, ":FETC:FREQ?" }, |
4ee1e2f3 AG |
167 | { SCPI_CMD_GET_MEAS_CURRENT, ":FETC:CURR:AC?" }, |
168 | { SCPI_CMD_GET_MEAS_POWER, ":FETC:POW:AC?" }, | |
169 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT:AC?" }, | |
170 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT:AC %.1f" }, | |
6c0c9dd2 AG |
171 | { SCPI_CMD_GET_FREQUENCY_TARGET, ":SOUR:FREQ?" }, |
172 | { SCPI_CMD_SET_FREQUENCY_TARGET, ":SOUR:FREQ %.2f" }, | |
4ee1e2f3 AG |
173 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, |
174 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, | |
175 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, | |
176 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:LIM:AC?" }, | |
177 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:LIM:AC %.1f" }, | |
562a3490 | 178 | /* This is not a current limit mode. It is overcurrent protection. */ |
4ee1e2f3 AG |
179 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM?" }, |
180 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM %.2f" }, | |
91ef511d | 181 | ALL_ZERO |
4ee1e2f3 AG |
182 | }; |
183 | ||
5281993e | 184 | /* Chroma 62000 series DC source */ |
5281993e | 185 | static const uint32_t chroma_62000_devopts[] = { |
e91bb0a6 | 186 | SR_CONF_CONTINUOUS, |
88e4daa9 ML |
187 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
188 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
5281993e AG |
189 | }; |
190 | ||
191 | static const uint32_t chroma_62000_devopts_cg[] = { | |
192 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
193 | SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
194 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
195 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
196 | SR_CONF_CURRENT | SR_CONF_GET, | |
197 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
198 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
199 | }; | |
200 | ||
5281993e | 201 | static const struct channel_group_spec chroma_62000_cg[] = { |
f2bbcc33 | 202 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
5281993e AG |
203 | }; |
204 | ||
205 | static const struct scpi_command chroma_62000_cmd[] = { | |
206 | { SCPI_CMD_REMOTE, ":CONF:REM ON" }, | |
207 | { SCPI_CMD_LOCAL, ":CONF:REM OFF" }, | |
208 | { SCPI_CMD_BEEPER, ":CONF:BEEP?" }, | |
209 | { SCPI_CMD_BEEPER_ENABLE, ":CONF:BEEP ON" }, | |
210 | { SCPI_CMD_BEEPER_DISABLE, ":CONF:BEEP OFF" }, | |
211 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
212 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
213 | { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POW?" }, | |
214 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
215 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.2f" }, | |
216 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
217 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
218 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":CONF:OUTP?" }, | |
219 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":CONF:OUTP ON" }, | |
220 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":CONF:OUTP OFF" }, | |
221 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:HIGH?" }, | |
222 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:HIGH %.6f" }, | |
223 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:PROT:HIGH?" }, | |
224 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:PROT:HIGH %.6f" }, | |
91ef511d | 225 | ALL_ZERO |
5281993e AG |
226 | }; |
227 | ||
9a5185c7 AG |
228 | static int chroma_62000p_probe_channels(struct sr_dev_inst *sdi, |
229 | struct sr_scpi_hw_info *hw_info, | |
230 | struct channel_spec **channels, unsigned int *num_channels, | |
231 | struct channel_group_spec **channel_groups, | |
232 | unsigned int *num_channel_groups) | |
233 | { | |
6ed709fe | 234 | unsigned int volts, amps, watts; |
9a5185c7 AG |
235 | struct channel_spec *channel; |
236 | ||
237 | (void)sdi; | |
238 | ||
6ed709fe AJ |
239 | sscanf(hw_info->model, "620%uP-%u-%u", &watts, &volts, &s); |
240 | watts *= 100; | |
241 | sr_dbg("Found device rated for %d V, %d A and %d W", volts, amps, watts); | |
9a5185c7 AG |
242 | |
243 | if (volts > 600) { | |
244 | sr_err("Probed max voltage of %u V is out of spec.", volts); | |
245 | return SR_ERR_BUG; | |
246 | } | |
247 | ||
6ed709fe | 248 | if (amps > 120) { |
9a5185c7 AG |
249 | sr_err("Probed max current of %u A is out of spec.", amps); |
250 | return SR_ERR_BUG; | |
251 | } | |
252 | ||
6ed709fe AJ |
253 | if (watts > 5000) { |
254 | sr_err("Probed max power of %u W is out of spec.", watts); | |
255 | return SR_ERR_BUG; | |
256 | } | |
257 | ||
9a5185c7 AG |
258 | channel = g_malloc0(sizeof(struct channel_spec)); |
259 | channel->name = "1"; | |
6ed709fe | 260 | channel->voltage[0] = channel->current[0] = channel->power[0] = 0.0; |
bcee1299 UH |
261 | channel->voltage[1] = volts; |
262 | channel->current[1] = amps; | |
263 | channel->power[1] = watts; | |
9a5185c7 | 264 | channel->voltage[2] = channel->current[2] = 0.01; |
6ed709fe AJ |
265 | channel->voltage[3] = channel->voltage[4] = 3; |
266 | channel->current[3] = channel->current[4] = 4; | |
9a5185c7 AG |
267 | *channels = channel; |
268 | *num_channels = 1; | |
269 | ||
270 | *channel_groups = g_malloc(sizeof(struct channel_group_spec)); | |
271 | **channel_groups = chroma_62000_cg[0]; | |
272 | *num_channel_groups = 1; | |
273 | ||
274 | return SR_OK; | |
275 | } | |
276 | ||
319fe9ce UH |
277 | /* Rigol DP700 series */ |
278 | static const uint32_t rigol_dp700_devopts[] = { | |
279 | SR_CONF_CONTINUOUS, | |
88e4daa9 ML |
280 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
281 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
319fe9ce UH |
282 | }; |
283 | ||
284 | static const uint32_t rigol_dp700_devopts_cg[] = { | |
285 | SR_CONF_REGULATION | SR_CONF_GET, | |
286 | SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
287 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, | |
d828b05e | 288 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, |
319fe9ce UH |
289 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, |
290 | SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET, | |
d828b05e | 291 | SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, |
319fe9ce UH |
292 | SR_CONF_VOLTAGE | SR_CONF_GET, |
293 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
294 | SR_CONF_CURRENT | SR_CONF_GET, | |
295 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
296 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
297 | }; | |
298 | ||
299 | static const struct channel_spec rigol_dp711_ch[] = { | |
d828b05e | 300 | { "1", { 0, 30, 0.01, 3, 3 }, { 0, 5, 0.01, 3, 3 }, { 0, 150, 0, 3, 3 }, FREQ_DC_ONLY, { 0.01, 33, 0.01}, { 0.01, 5.5, 0.01 } }, |
319fe9ce UH |
301 | }; |
302 | ||
303 | static const struct channel_spec rigol_dp712_ch[] = { | |
d828b05e | 304 | { "1", { 0, 50, 0.01, 3, 3 }, { 0, 3, 0.01, 3, 3 }, { 0, 150, 0, 3, 3 }, FREQ_DC_ONLY, { 0.01, 55, 0.01}, { 0.01, 3.3, 0.01 } }, |
319fe9ce UH |
305 | }; |
306 | ||
307 | static const struct channel_group_spec rigol_dp700_cg[] = { | |
f2bbcc33 | 308 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
319fe9ce UH |
309 | }; |
310 | ||
311 | /* Same as the DP800 series, except for the missing :SYST:OTP* commands. */ | |
312 | static const struct scpi_command rigol_dp700_cmd[] = { | |
313 | { SCPI_CMD_REMOTE, "SYST:REMOTE" }, | |
314 | { SCPI_CMD_LOCAL, "SYST:LOCAL" }, | |
315 | { SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" }, | |
316 | { SCPI_CMD_BEEPER_ENABLE, "SYST:BEEP:STAT ON" }, | |
317 | { SCPI_CMD_BEEPER_DISABLE, "SYST:BEEP:STAT OFF" }, | |
318 | { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" }, | |
319 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
320 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
321 | { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE?" }, | |
322 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
323 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
324 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
325 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
326 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, | |
327 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, | |
328 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, | |
329 | { SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE?" }, | |
330 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP?" }, | |
331 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, ":OUTP:OVP ON" }, | |
332 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, ":OUTP:OVP OFF" }, | |
333 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES?" }, | |
334 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL?" }, | |
335 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL %.6f" }, | |
336 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP?" }, | |
337 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":OUTP:OCP:STAT ON" }, | |
338 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":OUTP:OCP:STAT OFF" }, | |
339 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES?" }, | |
340 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL?" }, | |
341 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL %.6f" }, | |
342 | ALL_ZERO | |
343 | }; | |
344 | ||
d4eabea8 | 345 | /* Rigol DP800 series */ |
584560f1 | 346 | static const uint32_t rigol_dp800_devopts[] = { |
e91bb0a6 | 347 | SR_CONF_CONTINUOUS, |
5827f61b | 348 | SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET, |
88e4daa9 ML |
349 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
350 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
d4eabea8 BV |
351 | }; |
352 | ||
584560f1 | 353 | static const uint32_t rigol_dp800_devopts_cg[] = { |
7a0b98b5 | 354 | SR_CONF_REGULATION | SR_CONF_GET, |
5827f61b BV |
355 | SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, |
356 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, | |
357 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
358 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
359 | SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET, | |
360 | SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
7a0b98b5 AJ |
361 | SR_CONF_VOLTAGE | SR_CONF_GET, |
362 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
363 | SR_CONF_CURRENT | SR_CONF_GET, | |
364 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
365 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
d4eabea8 BV |
366 | }; |
367 | ||
8cb5affe | 368 | static const struct channel_spec rigol_dp821a_ch[] = { |
49a468ed FS |
369 | { "1", { 0, 60, 0.001, 3, 3 }, { 0, 1, 0.0001, 4, 4 }, { 0, 60, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
370 | { "2", { 0, 8, 0.001, 3, 3 }, { 0, 10, 0.001, 3, 3 }, { 0, 80, 0, 3, 3 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
cfcdf576 ML |
371 | }; |
372 | ||
8cb5affe | 373 | static const struct channel_spec rigol_dp831_ch[] = { |
49a468ed FS |
374 | { "1", { 0, 8, 0.001, 3, 4 }, { 0, 5, 0.0003, 3, 4 }, { 0, 40, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
375 | { "2", { 0, 30, 0.001, 3, 4 }, { 0, 2, 0.0001, 3, 4 }, { 0, 60, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
376 | { "3", { 0, -30, 0.001, 3, 4 }, { 0, 2, 0.0001, 3, 4 }, { 0, 60, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
d4eabea8 BV |
377 | }; |
378 | ||
8cb5affe | 379 | static const struct channel_spec rigol_dp832_ch[] = { |
49a468ed FS |
380 | { "1", { 0, 30, 0.001, 3, 4 }, { 0, 3, 0.001, 3, 4 }, { 0, 90, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
381 | { "2", { 0, 30, 0.001, 3, 4 }, { 0, 3, 0.001, 3, 4 }, { 0, 90, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
382 | { "3", { 0, 5, 0.001, 3, 4 }, { 0, 3, 0.001, 3, 4 }, { 0, 90, 0, 3, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
3222ee10 BV |
383 | }; |
384 | ||
8cb5affe | 385 | static const struct channel_group_spec rigol_dp820_cg[] = { |
f2bbcc33 FS |
386 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
387 | { "2", CH_IDX(1), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, | |
cfcdf576 ML |
388 | }; |
389 | ||
8cb5affe | 390 | static const struct channel_group_spec rigol_dp830_cg[] = { |
f2bbcc33 FS |
391 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
392 | { "2", CH_IDX(1), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, | |
393 | { "3", CH_IDX(2), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, | |
d4eabea8 BV |
394 | }; |
395 | ||
8cb5affe | 396 | static const struct scpi_command rigol_dp800_cmd[] = { |
60475cd7 BV |
397 | { SCPI_CMD_REMOTE, "SYST:REMOTE" }, |
398 | { SCPI_CMD_LOCAL, "SYST:LOCAL" }, | |
ee2860ee BV |
399 | { SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" }, |
400 | { SCPI_CMD_BEEPER_ENABLE, "SYST:BEEP:STAT ON" }, | |
401 | { SCPI_CMD_BEEPER_DISABLE, "SYST:BEEP:STAT OFF" }, | |
60475cd7 BV |
402 | { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" }, |
403 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
404 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
405 | { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE?" }, | |
406 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
407 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
408 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
409 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
410 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, | |
411 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, | |
412 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, | |
413 | { SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE?" }, | |
d4eabea8 | 414 | { SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION, ":SYST:OTP?" }, |
53a81803 BV |
415 | { SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE, ":SYST:OTP ON" }, |
416 | { SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE, ":SYST:OTP OFF" }, | |
60475cd7 BV |
417 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP?" }, |
418 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, ":OUTP:OVP ON" }, | |
419 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, ":OUTP:OVP OFF" }, | |
420 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES?" }, | |
421 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL?" }, | |
422 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL %.6f" }, | |
423 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP?" }, | |
424 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":OUTP:OCP:STAT ON" }, | |
425 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":OUTP:OCP:STAT OFF" }, | |
426 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES?" }, | |
427 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL?" }, | |
428 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL %.6f" }, | |
91ef511d | 429 | ALL_ZERO |
d4eabea8 BV |
430 | }; |
431 | ||
dbc519f7 | 432 | /* HP 663xA series */ |
e76a3575 AG |
433 | static const uint32_t hp_6630a_devopts[] = { |
434 | SR_CONF_CONTINUOUS, | |
88e4daa9 ML |
435 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
436 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
7c517d02 FS |
437 | }; |
438 | ||
439 | static const uint32_t hp_6630a_devopts_cg[] = { | |
e76a3575 AG |
440 | SR_CONF_ENABLED | SR_CONF_SET, |
441 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
442 | SR_CONF_CURRENT | SR_CONF_GET, | |
443 | SR_CONF_VOLTAGE_TARGET | SR_CONF_SET | SR_CONF_LIST, | |
444 | SR_CONF_CURRENT_LIMIT | SR_CONF_SET | SR_CONF_LIST, | |
f083ae63 | 445 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, |
49a468ed | 446 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_SET | SR_CONF_LIST, |
e76a3575 | 447 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET, |
f083ae63 FS |
448 | SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET, |
449 | SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET, | |
0ad7074c | 450 | SR_CONF_REGULATION | SR_CONF_GET, |
e76a3575 AG |
451 | }; |
452 | ||
5ce427c7 FS |
453 | static const struct channel_spec hp_6632a_ch[] = { |
454 | { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS }, | |
455 | }; | |
456 | ||
dbc519f7 FS |
457 | static const struct channel_spec hp_6633a_ch[] = { |
458 | { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS }, | |
459 | }; | |
460 | ||
5ce427c7 FS |
461 | static const struct channel_spec hp_6634a_ch[] = { |
462 | { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS }, | |
463 | }; | |
464 | ||
dbc519f7 FS |
465 | static const struct channel_group_spec hp_6630a_cg[] = { |
466 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, | |
467 | }; | |
468 | ||
469 | static const struct scpi_command hp_6630a_cmd[] = { | |
470 | { SCPI_CMD_SET_OUTPUT_ENABLE, "OUT 1" }, | |
471 | { SCPI_CMD_SET_OUTPUT_DISABLE, "OUT 0" }, | |
472 | { SCPI_CMD_GET_MEAS_VOLTAGE, "VOUT?" }, | |
473 | { SCPI_CMD_GET_MEAS_CURRENT, "IOUT?" }, | |
474 | { SCPI_CMD_SET_VOLTAGE_TARGET, "VSET %.4f" }, | |
475 | { SCPI_CMD_SET_CURRENT_LIMIT, "ISET %.4f" }, | |
f083ae63 FS |
476 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, "STS?" }, |
477 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "OVSET %.4f" }, | |
dbc519f7 FS |
478 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, "OCP 1" }, |
479 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, "OCP 0" }, | |
f083ae63 FS |
480 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, "STS?" }, |
481 | { SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE, "STS?" }, | |
0ad7074c | 482 | { SCPI_CMD_GET_OUTPUT_REGULATION, "STS?" }, |
dbc519f7 FS |
483 | ALL_ZERO |
484 | }; | |
485 | ||
fd243315 | 486 | static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi) |
fdf03652 FS |
487 | { |
488 | struct sr_scpi_dev_inst *scpi; | |
fdf03652 FS |
489 | |
490 | scpi = sdi->conn; | |
491 | ||
492 | /* | |
493 | * Monitor CV (1), CC+ (2), UR (4), OVP (8), OTP (16), OCP (64) and | |
494 | * CC- (256) bits of the Status Register for the FAULT? query. | |
495 | */ | |
b89e6db9 | 496 | return sr_scpi_send(scpi, "UNMASK 607"); |
fdf03652 FS |
497 | } |
498 | ||
499 | static int hp_6630a_update_status(const struct sr_dev_inst *sdi) | |
500 | { | |
501 | struct sr_scpi_dev_inst *scpi; | |
502 | int ret; | |
503 | int fault; | |
504 | gboolean cv, cc_pos, unreg, cc_neg; | |
505 | gboolean regulation_changed; | |
506 | char *regulation; | |
507 | ||
508 | scpi = sdi->conn; | |
509 | ||
510 | /* | |
511 | * Use the FAULT register (only 0->1 transitions), this way multiple set | |
512 | * regulation bits in the STS/ASTS registers are ignored. In rare cases | |
513 | * we will miss some changes (1->0 transitions, e.g. no regulation at all), | |
514 | * but SPS/ASPS doesn't work either, unless all states are stored and | |
515 | * compared to the states in STS/ASTS. | |
516 | * TODO: Use SPoll or SRQ when SCPI over GPIB is used. | |
517 | */ | |
518 | ret = sr_scpi_get_int(scpi, "FAULT?", &fault); | |
519 | if (ret != SR_OK) | |
520 | return ret; | |
521 | ||
522 | /* OVP */ | |
523 | if (fault & (1 << 3)) | |
524 | sr_session_send_meta(sdi, SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE, | |
525 | g_variant_new_boolean(fault & (1 << 3))); | |
526 | ||
527 | /* OCP */ | |
528 | if (fault & (1 << 6)) | |
529 | sr_session_send_meta(sdi, SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE, | |
530 | g_variant_new_boolean(fault & (1 << 6))); | |
531 | ||
532 | /* OTP */ | |
533 | if (fault & (1 << 4)) | |
534 | sr_session_send_meta(sdi, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE, | |
535 | g_variant_new_boolean(fault & (1 << 4))); | |
536 | ||
537 | /* CV */ | |
538 | cv = (fault & (1 << 0)); | |
539 | regulation_changed = (fault & (1 << 0)); | |
540 | /* CC+ */ | |
541 | cc_pos = (fault & (1 << 1)); | |
542 | regulation_changed = (fault & (1 << 1)) | regulation_changed; | |
543 | /* UNREG */ | |
544 | unreg = (fault & (1 << 2)); | |
545 | regulation_changed = (fault & (1 << 2)) | regulation_changed; | |
546 | /* CC- */ | |
547 | cc_neg = (fault & (1 << 9)); | |
548 | regulation_changed = (fault & (1 << 9)) | regulation_changed; | |
549 | ||
550 | if (regulation_changed) { | |
b89e6db9 | 551 | if (cv && !cc_pos && !cc_neg && !unreg) |
fdf03652 FS |
552 | regulation = "CV"; |
553 | else if (cc_pos && !cv && !cc_neg && !unreg) | |
554 | regulation = "CC"; | |
555 | else if (cc_neg && !cv && !cc_pos && !unreg) | |
556 | regulation = "CC-"; | |
557 | else if (unreg && !cv && !cc_pos && !cc_neg) | |
558 | regulation = "UR"; | |
b89e6db9 | 559 | else if (!cv && !cc_pos && !cc_neg && !unreg) |
fdf03652 FS |
560 | regulation = ""; |
561 | else { | |
562 | sr_dbg("Undefined regulation for HP 66xxA " | |
563 | "(CV=%i, CC+=%i, CC-=%i, UR=%i).", | |
564 | cv, cc_pos, cc_neg, unreg); | |
565 | return FALSE; | |
566 | } | |
567 | sr_session_send_meta(sdi, SR_CONF_REGULATION, | |
568 | g_variant_new_string(regulation)); | |
569 | } | |
570 | ||
571 | return SR_OK; | |
572 | } | |
573 | ||
dbc519f7 | 574 | /* HP 663xB series */ |
a61c8cce | 575 | static const uint32_t hp_6630b_devopts[] = { |
e91bb0a6 | 576 | SR_CONF_CONTINUOUS, |
88e4daa9 ML |
577 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
578 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
7c517d02 FS |
579 | }; |
580 | ||
a61c8cce | 581 | static const uint32_t hp_6630b_devopts_cg[] = { |
7a0b98b5 AJ |
582 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, |
583 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
584 | SR_CONF_CURRENT | SR_CONF_GET, | |
585 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
586 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
8b5eadf4 | 587 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, |
49a468ed | 588 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, |
7e381bfc | 589 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, |
8b5eadf4 FS |
590 | SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET, |
591 | SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET, | |
43ff1110 | 592 | SR_CONF_REGULATION | SR_CONF_GET, |
bc4a2a46 BV |
593 | }; |
594 | ||
5ce427c7 FS |
595 | static const struct channel_spec hp_6611c_ch[] = { |
596 | { "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 41.92297 }, FREQ_DC_ONLY, { 0, 12, 0.06 }, NO_OCP_LIMITS }, | |
597 | }; | |
598 | ||
599 | static const struct channel_spec hp_6612c_ch[] = { | |
600 | { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS }, | |
601 | }; | |
602 | ||
603 | static const struct channel_spec hp_6613c_ch[] = { | |
604 | { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 52.40627 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS }, | |
605 | }; | |
606 | ||
607 | static const struct channel_spec hp_6614c_ch[] = { | |
608 | { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 0.5118, 0.000125, 4, 5 }, { 0, 52.39808 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS }, | |
609 | }; | |
610 | ||
a61c8cce | 611 | static const struct channel_spec hp_6631b_ch[] = { |
49a468ed | 612 | { "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 10.237, 0.00263, 4, 5 }, { 0, 83.84103 }, FREQ_DC_ONLY, { 0, 12, 0.06 }, NO_OCP_LIMITS }, |
a61c8cce FS |
613 | }; |
614 | ||
8cb5affe | 615 | static const struct channel_spec hp_6632b_ch[] = { |
49a468ed | 616 | { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS }, |
bc4a2a46 BV |
617 | }; |
618 | ||
0b0f40d8 MW |
619 | static const struct channel_spec hp_66312a_ch[] = { |
620 | { "1", { 0, 20.475, 0.0001, 4, 5 }, { 0, 2.0475, 0.0001, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.01 }, NO_OCP_LIMITS }, | |
621 | }; | |
622 | ||
a61c8cce | 623 | static const struct channel_spec hp_66332a_ch[] = { |
49a468ed | 624 | { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS }, |
a61c8cce FS |
625 | }; |
626 | ||
627 | static const struct channel_spec hp_6633b_ch[] = { | |
49a468ed | 628 | { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.000526, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS }, |
a61c8cce FS |
629 | }; |
630 | ||
631 | static const struct channel_spec hp_6634b_ch[] = { | |
49a468ed | 632 | { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.000263, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS }, |
a61c8cce FS |
633 | }; |
634 | ||
dbc519f7 | 635 | static const struct channel_group_spec hp_6630b_cg[] = { |
3d1aa50f | 636 | { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC }, |
bc4a2a46 BV |
637 | }; |
638 | ||
a61c8cce | 639 | static const struct scpi_command hp_6630b_cmd[] = { |
26e96658 FS |
640 | /* |
641 | * SCPI_CMD_REMOTE and SCPI_CMD_LOCAL are not used when GPIB is used, | |
642 | * otherwise the device will report (non critical) error 602. | |
643 | */ | |
7e381bfc FS |
644 | { SCPI_CMD_REMOTE, "SYST:REM" }, |
645 | { SCPI_CMD_LOCAL, "SYST:LOC" }, | |
bc4a2a46 | 646 | { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" }, |
53a81803 BV |
647 | { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" }, |
648 | { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" }, | |
bc4a2a46 BV |
649 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, |
650 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
ca95e90f BV |
651 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, |
652 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
653 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
654 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
7e381bfc FS |
655 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":CURR:PROT:STAT?" }, |
656 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":CURR:PROT:STAT 1" }, | |
657 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT 0" }, | |
8b5eadf4 FS |
658 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, "STAT:QUES:COND?" }, |
659 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, "STAT:QUES:COND?" }, | |
7e381bfc FS |
660 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" }, |
661 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" }, | |
8b5eadf4 | 662 | { SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE, "STAT:QUES:COND?" }, |
43ff1110 | 663 | { SCPI_CMD_GET_OUTPUT_REGULATION, "STAT:OPER:COND?" }, |
91ef511d | 664 | ALL_ZERO |
bc4a2a46 BV |
665 | }; |
666 | ||
fd243315 | 667 | static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi) |
fe4bb774 FS |
668 | { |
669 | struct sr_scpi_dev_inst *scpi; | |
670 | int ret; | |
671 | ||
672 | scpi = sdi->conn; | |
673 | ||
674 | /* | |
675 | * Monitor CV (256), CC+ (1024) and CC- (2048) bits of the | |
676 | * Operational Status Register. | |
677 | * Use both positive and negative transitions of the status bits. | |
678 | */ | |
679 | ret = sr_scpi_send(scpi, "STAT:OPER:PTR 3328;NTR 3328;ENAB 3328"); | |
680 | if (ret != SR_OK) | |
681 | return ret; | |
682 | ||
683 | /* | |
684 | * Monitor OVP (1), OCP (2), OTP (16) and Unreg (1024) bits of the | |
685 | * Questionable Status Register. | |
686 | * Use both positive and negative transitions of the status bits. | |
687 | */ | |
688 | ret = sr_scpi_send(scpi, "STAT:QUES:PTR 1043;NTR 1043;ENAB 1043"); | |
689 | if (ret != SR_OK) | |
690 | return ret; | |
691 | ||
692 | /* | |
693 | * Service Request Enable Register set for Operational Status Register | |
694 | * bits (128) and Questionable Status Register bits (8). | |
695 | * This masks the Status Register generating a SRQ/RQS. Not implemented yet! | |
696 | */ | |
697 | /* | |
698 | ret = sr_scpi_send(scpi, "*SRE 136"); | |
699 | if (ret != SR_OK) | |
700 | return ret; | |
701 | */ | |
702 | ||
703 | return SR_OK; | |
704 | } | |
705 | ||
706 | static int hp_6630b_update_status(const struct sr_dev_inst *sdi) | |
707 | { | |
708 | struct sr_scpi_dev_inst *scpi; | |
709 | int ret; | |
710 | int stb; | |
711 | int ques_even, ques_cond; | |
712 | int oper_even, oper_cond; | |
713 | gboolean output_enabled; | |
714 | gboolean unreg, cv, cc_pos, cc_neg; | |
715 | gboolean regulation_changed; | |
716 | char *regulation; | |
717 | ||
718 | scpi = sdi->conn; | |
719 | ||
720 | unreg = FALSE; | |
721 | cv = FALSE; | |
722 | cc_pos = FALSE; | |
723 | cc_neg = FALSE; | |
724 | regulation_changed = FALSE; | |
725 | ||
726 | /* | |
727 | * Use SPoll when SCPI uses GPIB as transport layer. | |
728 | * SPoll is approx. twice as fast as a normal GPIB write + read would be! | |
729 | */ | |
730 | #ifdef HAVE_LIBGPIB | |
731 | char spoll_buf; | |
732 | ||
733 | if (scpi->transport == SCPI_TRANSPORT_LIBGPIB) { | |
734 | ret = sr_scpi_gpib_spoll(scpi, &spoll_buf); | |
735 | if (ret != SR_OK) | |
736 | return ret; | |
737 | stb = (uint8_t)spoll_buf; | |
738 | } | |
739 | else { | |
740 | #endif | |
741 | ret = sr_scpi_get_int(scpi, "*STB?", &stb); | |
742 | if (ret != SR_OK) | |
743 | return ret; | |
744 | #ifdef HAVE_LIBGPIB | |
745 | } | |
746 | #endif | |
747 | ||
748 | /* Questionable status summary bit */ | |
749 | if (stb & (1 << 3)) { | |
750 | /* Read the event register to clear it! */ | |
751 | ret = sr_scpi_get_int(scpi, "STAT:QUES:EVEN?", &ques_even); | |
752 | if (ret != SR_OK) | |
753 | return ret; | |
754 | /* Now get the values. */ | |
755 | ret = sr_scpi_get_int(scpi, "STAT:QUES:COND?", &ques_cond); | |
756 | if (ret != SR_OK) | |
757 | return ret; | |
758 | ||
759 | /* OVP */ | |
760 | if (ques_even & (1 << 0)) | |
761 | sr_session_send_meta(sdi, SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE, | |
762 | g_variant_new_boolean(ques_cond & (1 << 0))); | |
763 | ||
764 | /* OCP */ | |
765 | if (ques_even & (1 << 1)) | |
766 | sr_session_send_meta(sdi, SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE, | |
767 | g_variant_new_boolean(ques_cond & (1 << 1))); | |
768 | ||
769 | /* OTP */ | |
770 | if (ques_even & (1 << 4)) | |
771 | sr_session_send_meta(sdi, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE, | |
772 | g_variant_new_boolean(ques_cond & (1 << 4))); | |
773 | ||
774 | /* UNREG */ | |
775 | unreg = (ques_cond & (1 << 10)); | |
776 | regulation_changed = (ques_even & (1 << 10)) | regulation_changed; | |
777 | ||
778 | /* | |
779 | * Check if output state has changed, due to one of the | |
780 | * questionable states changed. | |
b89e6db9 UH |
781 | * NOTE: The output state is sent even if it hasn't changed, |
782 | * but that only happens rarely. | |
fe4bb774 FS |
783 | */ |
784 | ret = sr_scpi_get_bool(scpi, "OUTP:STAT?", &output_enabled); | |
785 | if (ret != SR_OK) | |
786 | return ret; | |
787 | sr_session_send_meta(sdi, SR_CONF_ENABLED, | |
788 | g_variant_new_boolean(output_enabled)); | |
789 | } | |
790 | ||
791 | /* Operation status summary bit */ | |
792 | if (stb & (1 << 7)) { | |
793 | /* Read the event register to clear it! */ | |
794 | ret = sr_scpi_get_int(scpi, "STAT:OPER:EVEN?", &oper_even); | |
795 | if (ret != SR_OK) | |
796 | return ret; | |
797 | /* Now get the values. */ | |
798 | ret = sr_scpi_get_int(scpi, "STAT:OPER:COND?", &oper_cond); | |
799 | if (ret != SR_OK) | |
800 | return ret; | |
801 | ||
802 | /* CV */ | |
803 | cv = (oper_cond & (1 << 8)); | |
804 | regulation_changed = (oper_even & (1 << 8)) | regulation_changed; | |
805 | /* CC+ */ | |
806 | cc_pos = (oper_cond & (1 << 10)); | |
807 | regulation_changed = (oper_even & (1 << 10)) | regulation_changed; | |
808 | /* CC- */ | |
809 | cc_neg = (oper_cond & (1 << 11)); | |
810 | regulation_changed = (oper_even & (1 << 11)) | regulation_changed; | |
811 | } | |
812 | ||
813 | if (regulation_changed) { | |
b89e6db9 | 814 | if (cv && !cc_pos && !cc_neg && !unreg) |
fe4bb774 FS |
815 | regulation = "CV"; |
816 | else if (cc_pos && !cv && !cc_neg && !unreg) | |
817 | regulation = "CC"; | |
818 | else if (cc_neg && !cv && !cc_pos && !unreg) | |
819 | regulation = "CC-"; | |
820 | else if (unreg && !cv && !cc_pos && !cc_neg) | |
821 | regulation = "UR"; | |
b89e6db9 UH |
822 | else if (!cv && !cc_pos && !cc_neg && !unreg) |
823 | /* This happens in case of OCP active. */ | |
fe4bb774 FS |
824 | regulation = ""; |
825 | else { | |
b89e6db9 | 826 | /* This happens from time to time (CV and CC+ active). */ |
fe4bb774 FS |
827 | sr_dbg("Undefined regulation for HP 66xxB " |
828 | "(CV=%i, CC+=%i, CC-=%i, UR=%i).", | |
829 | cv, cc_pos, cc_neg, unreg); | |
830 | return FALSE; | |
831 | } | |
832 | sr_session_send_meta(sdi, SR_CONF_REGULATION, | |
833 | g_variant_new_string(regulation)); | |
834 | } | |
835 | ||
836 | return SR_OK; | |
837 | } | |
838 | ||
c3eadb07 | 839 | /* Philips/Fluke PM2800 series */ |
9d9cf1c4 | 840 | static const uint32_t philips_pm2800_devopts[] = { |
e91bb0a6 | 841 | SR_CONF_CONTINUOUS, |
88e4daa9 ML |
842 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
843 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
9d9cf1c4 BV |
844 | }; |
845 | ||
c3eadb07 | 846 | static const uint32_t philips_pm2800_devopts_cg[] = { |
7a0b98b5 AJ |
847 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, |
848 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
849 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
850 | SR_CONF_CURRENT | SR_CONF_GET, | |
851 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
c3eadb07 BV |
852 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, |
853 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
854 | SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
855 | SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET, | |
7a0b98b5 | 856 | SR_CONF_REGULATION | SR_CONF_GET, |
c3eadb07 BV |
857 | }; |
858 | ||
859 | enum philips_pm2800_modules { | |
860 | PM2800_MOD_30V_10A = 1, | |
861 | PM2800_MOD_60V_5A, | |
862 | PM2800_MOD_60V_10A, | |
863 | PM2800_MOD_8V_15A, | |
864 | PM2800_MOD_60V_2A, | |
865 | PM2800_MOD_120V_1A, | |
866 | }; | |
867 | ||
329733d9 | 868 | static const struct philips_pm2800_module_spec { |
c3eadb07 | 869 | /* Min, max, programming resolution. */ |
bcee1299 UH |
870 | double voltage[5]; |
871 | double current[5]; | |
872 | double power[5]; | |
c3eadb07 BV |
873 | } philips_pm2800_module_specs[] = { |
874 | /* Autoranging modules. */ | |
6ed709fe AJ |
875 | [PM2800_MOD_30V_10A] = { { 0, 30, 0.0075, 2, 4 }, { 0, 10, 0.0025, 2, 4 }, { 0, 60 } }, |
876 | [PM2800_MOD_60V_5A] = { { 0, 60, 0.015, 2, 3 }, { 0, 5, 0.00125, 2, 5 }, { 0, 60 } }, | |
877 | [PM2800_MOD_60V_10A] = { { 0, 60, 0.015, 2, 3 }, { 0, 10, 0.0025, 2, 5 }, { 0, 120 } }, | |
c3eadb07 | 878 | /* Linear modules. */ |
6ed709fe AJ |
879 | [PM2800_MOD_8V_15A] = { { 0, 8, 0.002, 3, 3 }, { -15, 15, 0.00375, 3, 5 }, { 0, 120 } }, |
880 | [PM2800_MOD_60V_2A] = { { 0, 60, 0.015, 2, 3 }, { -2, 2, 0.0005, 3, 4 }, { 0, 120 } }, | |
881 | [PM2800_MOD_120V_1A] = { { 0, 120, 0.030, 2, 2 }, { -1, 1, 0.00025, 3, 5 }, { 0, 120 } }, | |
c3eadb07 BV |
882 | }; |
883 | ||
329733d9 | 884 | static const struct philips_pm2800_model { |
c3eadb07 BV |
885 | unsigned int chassis; |
886 | unsigned int num_modules; | |
887 | unsigned int set; | |
888 | unsigned int modules[3]; | |
889 | } philips_pm2800_matrix[] = { | |
890 | /* Autoranging chassis. */ | |
891 | { 1, 1, 0, { PM2800_MOD_30V_10A, 0, 0 } }, | |
892 | { 1, 1, 1, { PM2800_MOD_60V_5A, 0, 0 } }, | |
893 | { 1, 2, 0, { PM2800_MOD_30V_10A, PM2800_MOD_30V_10A, 0 } }, | |
894 | { 1, 2, 1, { PM2800_MOD_60V_5A, PM2800_MOD_60V_5A, 0 } }, | |
895 | { 1, 2, 2, { PM2800_MOD_30V_10A, PM2800_MOD_60V_5A, 0 } }, | |
896 | { 1, 2, 3, { PM2800_MOD_30V_10A, PM2800_MOD_60V_10A, 0 } }, | |
897 | { 1, 2, 4, { PM2800_MOD_60V_5A, PM2800_MOD_60V_10A, 0 } }, | |
898 | { 1, 3, 0, { PM2800_MOD_30V_10A, PM2800_MOD_30V_10A, PM2800_MOD_30V_10A } }, | |
899 | { 1, 3, 1, { PM2800_MOD_60V_5A, PM2800_MOD_60V_5A, PM2800_MOD_60V_5A } }, | |
900 | { 1, 3, 2, { PM2800_MOD_30V_10A, PM2800_MOD_30V_10A, PM2800_MOD_60V_5A } }, | |
901 | { 1, 3, 3, { PM2800_MOD_30V_10A, PM2800_MOD_60V_5A, PM2800_MOD_60V_5A } }, | |
902 | /* Linear chassis. */ | |
903 | { 3, 1, 0, { PM2800_MOD_60V_2A, 0, 0 } }, | |
904 | { 3, 1, 1, { PM2800_MOD_120V_1A, 0, 0 } }, | |
905 | { 3, 1, 2, { PM2800_MOD_8V_15A, 0, 0 } }, | |
906 | { 3, 2, 0, { PM2800_MOD_60V_2A, 0, 0 } }, | |
907 | { 3, 2, 1, { PM2800_MOD_120V_1A, 0, 0 } }, | |
908 | { 3, 2, 2, { PM2800_MOD_60V_2A, PM2800_MOD_120V_1A, 0 } }, | |
909 | { 3, 2, 3, { PM2800_MOD_8V_15A, PM2800_MOD_8V_15A, 0 } }, | |
910 | }; | |
911 | ||
329733d9 | 912 | static const char *philips_pm2800_names[] = { "1", "2", "3" }; |
c3eadb07 BV |
913 | |
914 | static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi, | |
915 | struct sr_scpi_hw_info *hw_info, | |
916 | struct channel_spec **channels, unsigned int *num_channels, | |
917 | struct channel_group_spec **channel_groups, unsigned int *num_channel_groups) | |
918 | { | |
329733d9 UH |
919 | const struct philips_pm2800_model *model; |
920 | const struct philips_pm2800_module_spec *spec; | |
c3eadb07 BV |
921 | unsigned int chassis, num_modules, set, module, m, i; |
922 | ||
923 | (void)sdi; | |
924 | ||
925 | /* | |
926 | * The model number as reported by *IDN? looks like e.g. PM2813/11, | |
927 | * Where "PM28" is fixed, followed by the chassis code (1 = autoranging, | |
928 | * 3 = linear series) and the number of modules: 1-3 for autoranging, | |
929 | * 1-2 for linear. | |
930 | * After the slash, the first digit denotes the module set. The | |
931 | * digit after that denotes front (5) or rear (1) binding posts. | |
932 | */ | |
933 | chassis = hw_info->model[4] - 0x30; | |
934 | num_modules = hw_info->model[5] - 0x30; | |
935 | set = hw_info->model[7] - 0x30; | |
936 | for (m = 0; m < ARRAY_SIZE(philips_pm2800_matrix); m++) { | |
937 | model = &philips_pm2800_matrix[m]; | |
938 | if (model->chassis == chassis && model->num_modules == num_modules | |
939 | && model->set == set) | |
940 | break; | |
941 | } | |
942 | if (m == ARRAY_SIZE(philips_pm2800_matrix)) { | |
943 | sr_dbg("Model %s not found in matrix.", hw_info->model); | |
944 | return SR_ERR; | |
945 | } | |
946 | ||
947 | sr_dbg("Found %d output channel%s:", num_modules, num_modules > 1 ? "s" : ""); | |
948 | *channels = g_malloc0(sizeof(struct channel_spec) * num_modules); | |
949 | *channel_groups = g_malloc0(sizeof(struct channel_group_spec) * num_modules); | |
950 | for (i = 0; i < num_modules; i++) { | |
951 | module = model->modules[i]; | |
952 | spec = &philips_pm2800_module_specs[module]; | |
6ed709fe | 953 | sr_dbg("output %d: %.0f - %.0fV, %.0f - %.0fA, %.0f - %.0fW", i + 1, |
c3eadb07 | 954 | spec->voltage[0], spec->voltage[1], |
6ed709fe | 955 | spec->current[0], spec->current[1], |
d9251a2c | 956 | spec->power[0], spec->power[1]); |
329733d9 | 957 | (*channels)[i].name = (char *)philips_pm2800_names[i]; |
bcee1299 | 958 | memcpy(&((*channels)[i].voltage), spec, sizeof(double) * 15); |
329733d9 | 959 | (*channel_groups)[i].name = (char *)philips_pm2800_names[i]; |
c3eadb07 BV |
960 | (*channel_groups)[i].channel_index_mask = 1 << i; |
961 | (*channel_groups)[i].features = PPS_OTP | PPS_OVP | PPS_OCP; | |
f2bbcc33 | 962 | (*channel_groups)[i].mqflags = SR_MQFLAG_DC; |
c3eadb07 BV |
963 | } |
964 | *num_channels = *num_channel_groups = num_modules; | |
965 | ||
966 | return SR_OK; | |
967 | } | |
968 | ||
8cb5affe | 969 | static const struct scpi_command philips_pm2800_cmd[] = { |
c3eadb07 BV |
970 | { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" }, |
971 | { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" }, | |
972 | { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" }, | |
973 | { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" }, | |
974 | { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" }, | |
975 | { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" }, | |
976 | { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" }, | |
977 | { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" }, | |
978 | { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" }, | |
979 | { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" }, | |
980 | { SCPI_CMD_GET_OUTPUT_REGULATION, ":SOUR:FUNC:MODE?" }, | |
981 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":SOUR:VOLT:PROT:TRIP?" }, | |
982 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:LEV?" }, | |
983 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:LEV %.6f" }, | |
984 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":SOUR:CURR:PROT:STAT?" }, | |
985 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":SOUR:CURR:PROT:STAT ON" }, | |
986 | { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":SOUR:CURR:PROT:STAT OFF" }, | |
987 | { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":SOUR:CURR:PROT:TRIP?" }, | |
91ef511d | 988 | ALL_ZERO |
c3eadb07 BV |
989 | }; |
990 | ||
81eb36d6 MS |
991 | static const uint32_t rs_hmc8043_devopts[] = { |
992 | SR_CONF_CONTINUOUS, | |
88e4daa9 ML |
993 | SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, |
994 | SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, | |
81eb36d6 MS |
995 | }; |
996 | ||
997 | static const uint32_t rs_hmc8043_devopts_cg[] = { | |
998 | SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
999 | SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET, | |
1000 | SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET, | |
1001 | SR_CONF_VOLTAGE | SR_CONF_GET, | |
1002 | SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
1003 | SR_CONF_CURRENT | SR_CONF_GET, | |
1004 | SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, | |
1005 | SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, | |
1006 | }; | |
1007 | ||
1008 | static const struct channel_spec rs_hmc8043_ch[] = { | |
49a468ed FS |
1009 | { "1", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, |
1010 | { "2", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
1011 | { "3", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS }, | |
81eb36d6 MS |
1012 | }; |
1013 | ||
1014 | static const struct channel_group_spec rs_hmc8043_cg[] = { | |
f2bbcc33 FS |
1015 | { "1", CH_IDX(0), PPS_OVP, SR_MQFLAG_DC }, |
1016 | { "2", CH_IDX(1), PPS_OVP, SR_MQFLAG_DC }, | |
1017 | { "3", CH_IDX(2), PPS_OVP, SR_MQFLAG_DC }, | |
81eb36d6 MS |
1018 | }; |
1019 | ||
1020 | static const struct scpi_command rs_hmc8043_cmd[] = { | |
1021 | { SCPI_CMD_SELECT_CHANNEL, "INST:NSEL %s" }, | |
1022 | { SCPI_CMD_GET_MEAS_VOLTAGE, "MEAS:VOLT?" }, | |
1023 | { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" }, | |
1024 | { SCPI_CMD_GET_VOLTAGE_TARGET, "VOLT?" }, | |
1025 | { SCPI_CMD_SET_VOLTAGE_TARGET, "VOLT %.6f" }, | |
1026 | { SCPI_CMD_GET_CURRENT_LIMIT, "CURR?" }, | |
1027 | { SCPI_CMD_SET_CURRENT_LIMIT, "CURR %.6f" }, | |
1028 | { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP?" }, | |
1029 | { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP ON" }, | |
1030 | { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP OFF" }, | |
1031 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, "VOLT:PROT:TRIP?" }, | |
1032 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:PROT:LEV?" }, | |
1033 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:PROT:LEV %.6f" }, | |
1034 | { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, "VOLT:PROT:STAT?" }, | |
1035 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, "VOLT:PROT:STAT ON" }, | |
1036 | { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, "VOLT:PROT:STAT OFF" }, | |
1037 | ALL_ZERO | |
1038 | }; | |
1039 | ||
d4eabea8 | 1040 | SR_PRIV const struct scpi_pps pps_profiles[] = { |
6cc93128 | 1041 | /* Agilent N5763A */ |
5e7377f4 | 1042 | { "Agilent", "N5763A", SCPI_DIALECT_UNKNOWN, 0, |
6cc93128 AG |
1043 | ARRAY_AND_SIZE(agilent_n5700a_devopts), |
1044 | ARRAY_AND_SIZE(agilent_n5700a_devopts_cg), | |
1045 | ARRAY_AND_SIZE(agilent_n5763a_ch), | |
1046 | ARRAY_AND_SIZE(agilent_n5700a_cg), | |
1047 | agilent_n5700a_cmd, | |
1048 | .probe_channels = NULL, | |
fd243315 | 1049 | .init_acquisition = NULL, |
7e66bf05 | 1050 | .update_status = NULL, |
6cc93128 | 1051 | }, |
ca314e06 | 1052 | |
5c9e56c9 | 1053 | /* Agilent N5767A */ |
5e7377f4 | 1054 | { "Agilent", "N5767A", SCPI_DIALECT_UNKNOWN, 0, |
5c9e56c9 AG |
1055 | ARRAY_AND_SIZE(agilent_n5700a_devopts), |
1056 | ARRAY_AND_SIZE(agilent_n5700a_devopts_cg), | |
1057 | ARRAY_AND_SIZE(agilent_n5767a_ch), | |
6cc93128 | 1058 | ARRAY_AND_SIZE(agilent_n5700a_cg), |
91ef511d | 1059 | agilent_n5700a_cmd, |
5c9e56c9 | 1060 | .probe_channels = NULL, |
fd243315 | 1061 | .init_acquisition = NULL, |
7e66bf05 | 1062 | .update_status = NULL, |
5c9e56c9 | 1063 | }, |
ca314e06 | 1064 | |
c3bfb959 | 1065 | /* BK Precision 9310 */ |
5e7377f4 | 1066 | { "BK", "^9130$", SCPI_DIALECT_UNKNOWN, 0, |
c3bfb959 MW |
1067 | ARRAY_AND_SIZE(bk_9130_devopts), |
1068 | ARRAY_AND_SIZE(bk_9130_devopts_cg), | |
1069 | ARRAY_AND_SIZE(bk_9130_ch), | |
1070 | ARRAY_AND_SIZE(bk_9130_cg), | |
1071 | bk_9130_cmd, | |
1072 | .probe_channels = NULL, | |
fd243315 | 1073 | .init_acquisition = NULL, |
7e66bf05 | 1074 | .update_status = NULL, |
c3bfb959 MW |
1075 | }, |
1076 | ||
4ee1e2f3 | 1077 | /* Chroma 61604 */ |
5e7377f4 | 1078 | { "Chroma", "61604", SCPI_DIALECT_UNKNOWN, 0, |
4ee1e2f3 AG |
1079 | ARRAY_AND_SIZE(chroma_61604_devopts), |
1080 | ARRAY_AND_SIZE(chroma_61604_devopts_cg), | |
1081 | ARRAY_AND_SIZE(chroma_61604_ch), | |
1082 | ARRAY_AND_SIZE(chroma_61604_cg), | |
91ef511d | 1083 | chroma_61604_cmd, |
4ee1e2f3 | 1084 | .probe_channels = NULL, |
fd243315 | 1085 | .init_acquisition = NULL, |
7e66bf05 | 1086 | .update_status = NULL, |
4ee1e2f3 | 1087 | }, |
ca314e06 | 1088 | |
5281993e | 1089 | /* Chroma 62000 series */ |
5e7377f4 | 1090 | { "Chroma", "620[0-9]{2}P-[0-9]{2,3}-[0-9]{1,3}", SCPI_DIALECT_UNKNOWN, 0, |
5281993e AG |
1091 | ARRAY_AND_SIZE(chroma_62000_devopts), |
1092 | ARRAY_AND_SIZE(chroma_62000_devopts_cg), | |
9a5185c7 AG |
1093 | NULL, 0, |
1094 | NULL, 0, | |
91ef511d | 1095 | chroma_62000_cmd, |
9a5185c7 | 1096 | .probe_channels = chroma_62000p_probe_channels, |
fd243315 | 1097 | .init_acquisition = NULL, |
7e66bf05 | 1098 | .update_status = NULL, |
5281993e | 1099 | }, |
ca314e06 | 1100 | |
5ce427c7 FS |
1101 | /* |
1102 | * This entry is for testing the HP COMP language with a HP 6632B power | |
1103 | * supply switched to the COMP language ("SYST:LANG COMP"). When used, | |
1104 | * disable the entry for the HP 6632B below! | |
1105 | */ | |
1106 | /* | |
1107 | { "HP", "6632B", SCPI_DIALECT_HP_COMP, 0, | |
1108 | ARRAY_AND_SIZE(hp_6630a_devopts), | |
1109 | ARRAY_AND_SIZE(hp_6630a_devopts_cg), | |
1110 | ARRAY_AND_SIZE(hp_6632a_ch), | |
1111 | ARRAY_AND_SIZE(hp_6630a_cg), | |
1112 | hp_6630a_cmd, | |
1113 | .probe_channels = NULL, | |
fd243315 | 1114 | hp_6630a_init_acquisition, |
5ce427c7 FS |
1115 | hp_6630a_update_status, |
1116 | }, | |
1117 | */ | |
1118 | ||
1119 | /* HP 6632A */ | |
1120 | { "HP", "6632A", SCPI_DIALECT_HP_COMP, 0, | |
1121 | ARRAY_AND_SIZE(hp_6630a_devopts), | |
1122 | ARRAY_AND_SIZE(hp_6630a_devopts_cg), | |
1123 | ARRAY_AND_SIZE(hp_6632a_ch), | |
1124 | ARRAY_AND_SIZE(hp_6630a_cg), | |
1125 | hp_6630a_cmd, | |
1126 | .probe_channels = NULL, | |
fd243315 | 1127 | hp_6630a_init_acquisition, |
5ce427c7 FS |
1128 | hp_6630a_update_status, |
1129 | }, | |
1130 | ||
e76a3575 | 1131 | /* HP 6633A */ |
5e7377f4 | 1132 | { "HP", "6633A", SCPI_DIALECT_HP_COMP, 0, |
e76a3575 | 1133 | ARRAY_AND_SIZE(hp_6630a_devopts), |
7c517d02 | 1134 | ARRAY_AND_SIZE(hp_6630a_devopts_cg), |
e76a3575 | 1135 | ARRAY_AND_SIZE(hp_6633a_ch), |
dbc519f7 | 1136 | ARRAY_AND_SIZE(hp_6630a_cg), |
e76a3575 AG |
1137 | hp_6630a_cmd, |
1138 | .probe_channels = NULL, | |
fd243315 | 1139 | hp_6630a_init_acquisition, |
fdf03652 | 1140 | hp_6630a_update_status, |
e76a3575 AG |
1141 | }, |
1142 | ||
5ce427c7 FS |
1143 | /* HP 6634A */ |
1144 | { "HP", "6634A", SCPI_DIALECT_HP_COMP, 0, | |
1145 | ARRAY_AND_SIZE(hp_6630a_devopts), | |
1146 | ARRAY_AND_SIZE(hp_6630a_devopts_cg), | |
1147 | ARRAY_AND_SIZE(hp_6634a_ch), | |
1148 | ARRAY_AND_SIZE(hp_6630a_cg), | |
1149 | hp_6630a_cmd, | |
1150 | .probe_channels = NULL, | |
fd243315 | 1151 | hp_6630a_init_acquisition, |
5ce427c7 FS |
1152 | hp_6630a_update_status, |
1153 | }, | |
1154 | ||
1155 | /* HP 6611C */ | |
1156 | { "HP", "6611C", SCPI_DIALECT_HP_66XXB, PPS_OTP, | |
1157 | ARRAY_AND_SIZE(hp_6630b_devopts), | |
1158 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1159 | ARRAY_AND_SIZE(hp_6611c_ch), | |
1160 | ARRAY_AND_SIZE(hp_6630b_cg), | |
1161 | hp_6630b_cmd, | |
1162 | .probe_channels = NULL, | |
fd243315 | 1163 | hp_6630b_init_acquisition, |
5ce427c7 FS |
1164 | hp_6630b_update_status, |
1165 | }, | |
1166 | ||
1167 | /* HP 6612C */ | |
1168 | { "HP", "6612C", SCPI_DIALECT_HP_66XXB, PPS_OTP, | |
1169 | ARRAY_AND_SIZE(hp_6630b_devopts), | |
1170 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1171 | ARRAY_AND_SIZE(hp_6612c_ch), | |
1172 | ARRAY_AND_SIZE(hp_6630b_cg), | |
1173 | hp_6630b_cmd, | |
1174 | .probe_channels = NULL, | |
fd243315 | 1175 | hp_6630b_init_acquisition, |
5ce427c7 FS |
1176 | hp_6630b_update_status, |
1177 | }, | |
1178 | ||
1179 | /* HP 6613C */ | |
1180 | { "HP", "6613C", SCPI_DIALECT_HP_66XXB, PPS_OTP, | |
1181 | ARRAY_AND_SIZE(hp_6630b_devopts), | |
1182 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1183 | ARRAY_AND_SIZE(hp_6613c_ch), | |
1184 | ARRAY_AND_SIZE(hp_6630b_cg), | |
1185 | hp_6630b_cmd, | |
1186 | .probe_channels = NULL, | |
fd243315 | 1187 | hp_6630b_init_acquisition, |
5ce427c7 FS |
1188 | hp_6630b_update_status, |
1189 | }, | |
1190 | ||
1191 | /* HP 6614C */ | |
1192 | { "HP", "6614C", SCPI_DIALECT_HP_66XXB, PPS_OTP, | |
1193 | ARRAY_AND_SIZE(hp_6630b_devopts), | |
1194 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1195 | ARRAY_AND_SIZE(hp_6614c_ch), | |
1196 | ARRAY_AND_SIZE(hp_6630b_cg), | |
1197 | hp_6630b_cmd, | |
1198 | .probe_channels = NULL, | |
fd243315 | 1199 | hp_6630b_init_acquisition, |
5ce427c7 FS |
1200 | hp_6630b_update_status, |
1201 | }, | |
1202 | ||
a61c8cce | 1203 | /* HP 6631B */ |
3d1aa50f | 1204 | { "HP", "6631B", SCPI_DIALECT_HP_66XXB, PPS_OTP, |
a61c8cce FS |
1205 | ARRAY_AND_SIZE(hp_6630b_devopts), |
1206 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1207 | ARRAY_AND_SIZE(hp_6631b_ch), | |
dbc519f7 | 1208 | ARRAY_AND_SIZE(hp_6630b_cg), |
a61c8cce FS |
1209 | hp_6630b_cmd, |
1210 | .probe_channels = NULL, | |
fd243315 | 1211 | hp_6630b_init_acquisition, |
fe4bb774 | 1212 | hp_6630b_update_status, |
a61c8cce FS |
1213 | }, |
1214 | ||
bc4a2a46 | 1215 | /* HP 6632B */ |
3d1aa50f | 1216 | { "HP", "6632B", SCPI_DIALECT_HP_66XXB, PPS_OTP, |
a61c8cce FS |
1217 | ARRAY_AND_SIZE(hp_6630b_devopts), |
1218 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
bc4a2a46 | 1219 | ARRAY_AND_SIZE(hp_6632b_ch), |
dbc519f7 | 1220 | ARRAY_AND_SIZE(hp_6630b_cg), |
a61c8cce FS |
1221 | hp_6630b_cmd, |
1222 | .probe_channels = NULL, | |
fd243315 | 1223 | hp_6630b_init_acquisition, |
fe4bb774 | 1224 | hp_6630b_update_status, |
a61c8cce FS |
1225 | }, |
1226 | ||
0b0f40d8 MW |
1227 | /* HP 66312A */ |
1228 | { "HP", "66312A", SCPI_DIALECT_HP_66XXB, PPS_OTP, | |
1229 | ARRAY_AND_SIZE(hp_6630b_devopts), | |
1230 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1231 | ARRAY_AND_SIZE(hp_66312a_ch), | |
1232 | ARRAY_AND_SIZE(hp_6630b_cg), | |
1233 | hp_6630b_cmd, | |
1234 | .probe_channels = NULL, | |
1235 | hp_6630b_init_acquisition, | |
1236 | hp_6630b_update_status, | |
1237 | }, | |
1238 | ||
a61c8cce | 1239 | /* HP 66332A */ |
3d1aa50f | 1240 | { "HP", "66332A", SCPI_DIALECT_HP_66XXB, PPS_OTP, |
a61c8cce FS |
1241 | ARRAY_AND_SIZE(hp_6630b_devopts), |
1242 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1243 | ARRAY_AND_SIZE(hp_66332a_ch), | |
dbc519f7 | 1244 | ARRAY_AND_SIZE(hp_6630b_cg), |
a61c8cce FS |
1245 | hp_6630b_cmd, |
1246 | .probe_channels = NULL, | |
fd243315 | 1247 | hp_6630b_init_acquisition, |
fe4bb774 | 1248 | hp_6630b_update_status, |
a61c8cce FS |
1249 | }, |
1250 | ||
1251 | /* HP 6633B */ | |
3d1aa50f | 1252 | { "HP", "6633B", SCPI_DIALECT_HP_66XXB, PPS_OTP, |
a61c8cce FS |
1253 | ARRAY_AND_SIZE(hp_6630b_devopts), |
1254 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1255 | ARRAY_AND_SIZE(hp_6633b_ch), | |
dbc519f7 | 1256 | ARRAY_AND_SIZE(hp_6630b_cg), |
a61c8cce FS |
1257 | hp_6630b_cmd, |
1258 | .probe_channels = NULL, | |
fd243315 | 1259 | hp_6630b_init_acquisition, |
fe4bb774 | 1260 | hp_6630b_update_status, |
a61c8cce FS |
1261 | }, |
1262 | ||
1263 | /* HP 6634B */ | |
3d1aa50f | 1264 | { "HP", "6634B", SCPI_DIALECT_HP_66XXB, PPS_OTP, |
a61c8cce FS |
1265 | ARRAY_AND_SIZE(hp_6630b_devopts), |
1266 | ARRAY_AND_SIZE(hp_6630b_devopts_cg), | |
1267 | ARRAY_AND_SIZE(hp_6634b_ch), | |
dbc519f7 | 1268 | ARRAY_AND_SIZE(hp_6630b_cg), |
a61c8cce | 1269 | hp_6630b_cmd, |
c3eadb07 | 1270 | .probe_channels = NULL, |
fd243315 | 1271 | hp_6630b_init_acquisition, |
fe4bb774 | 1272 | hp_6630b_update_status, |
bc4a2a46 BV |
1273 | }, |
1274 | ||
319fe9ce | 1275 | /* Rigol DP700 series */ |
5e7377f4 | 1276 | { "Rigol", "^DP711$", SCPI_DIALECT_UNKNOWN, 0, |
319fe9ce UH |
1277 | ARRAY_AND_SIZE(rigol_dp700_devopts), |
1278 | ARRAY_AND_SIZE(rigol_dp700_devopts_cg), | |
1279 | ARRAY_AND_SIZE(rigol_dp711_ch), | |
1280 | ARRAY_AND_SIZE(rigol_dp700_cg), | |
1281 | rigol_dp700_cmd, | |
1282 | .probe_channels = NULL, | |
fd243315 | 1283 | .init_acquisition = NULL, |
7e66bf05 | 1284 | .update_status = NULL, |
319fe9ce | 1285 | }, |
5e7377f4 | 1286 | { "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0, |
319fe9ce UH |
1287 | ARRAY_AND_SIZE(rigol_dp700_devopts), |
1288 | ARRAY_AND_SIZE(rigol_dp700_devopts_cg), | |
1289 | ARRAY_AND_SIZE(rigol_dp712_ch), | |
1290 | ARRAY_AND_SIZE(rigol_dp700_cg), | |
1291 | rigol_dp700_cmd, | |
1292 | .probe_channels = NULL, | |
fd243315 | 1293 | .init_acquisition = NULL, |
7e66bf05 | 1294 | .update_status = NULL, |
319fe9ce UH |
1295 | }, |
1296 | ||
d4eabea8 | 1297 | /* Rigol DP800 series */ |
5e7377f4 | 1298 | { "Rigol", "^DP821A$", SCPI_DIALECT_UNKNOWN, PPS_OTP, |
cfcdf576 ML |
1299 | ARRAY_AND_SIZE(rigol_dp800_devopts), |
1300 | ARRAY_AND_SIZE(rigol_dp800_devopts_cg), | |
1301 | ARRAY_AND_SIZE(rigol_dp821a_ch), | |
1302 | ARRAY_AND_SIZE(rigol_dp820_cg), | |
91ef511d | 1303 | rigol_dp800_cmd, |
cfcdf576 | 1304 | .probe_channels = NULL, |
fd243315 | 1305 | .init_acquisition = NULL, |
7e66bf05 | 1306 | .update_status = NULL, |
cfcdf576 | 1307 | }, |
5e7377f4 | 1308 | { "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP, |
3222ee10 BV |
1309 | ARRAY_AND_SIZE(rigol_dp800_devopts), |
1310 | ARRAY_AND_SIZE(rigol_dp800_devopts_cg), | |
1311 | ARRAY_AND_SIZE(rigol_dp831_ch), | |
cfcdf576 | 1312 | ARRAY_AND_SIZE(rigol_dp830_cg), |
91ef511d | 1313 | rigol_dp800_cmd, |
c3eadb07 | 1314 | .probe_channels = NULL, |
fd243315 | 1315 | .init_acquisition = NULL, |
7e66bf05 | 1316 | .update_status = NULL, |
3222ee10 | 1317 | }, |
5e7377f4 | 1318 | { "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP, |
3222ee10 BV |
1319 | ARRAY_AND_SIZE(rigol_dp800_devopts), |
1320 | ARRAY_AND_SIZE(rigol_dp800_devopts_cg), | |
1321 | ARRAY_AND_SIZE(rigol_dp832_ch), | |
cfcdf576 | 1322 | ARRAY_AND_SIZE(rigol_dp830_cg), |
91ef511d | 1323 | rigol_dp800_cmd, |
c3eadb07 | 1324 | .probe_channels = NULL, |
fd243315 | 1325 | .init_acquisition = NULL, |
7e66bf05 | 1326 | .update_status = NULL, |
c3eadb07 BV |
1327 | }, |
1328 | ||
1329 | /* Philips/Fluke PM2800 series */ | |
5e7377f4 | 1330 | { "Philips", "^PM28[13][123]/[01234]{1,2}$", SCPI_DIALECT_PHILIPS, 0, |
9d9cf1c4 | 1331 | ARRAY_AND_SIZE(philips_pm2800_devopts), |
c3eadb07 BV |
1332 | ARRAY_AND_SIZE(philips_pm2800_devopts_cg), |
1333 | NULL, 0, | |
1334 | NULL, 0, | |
91ef511d | 1335 | philips_pm2800_cmd, |
c3eadb07 | 1336 | philips_pm2800_probe_channels, |
fd243315 | 1337 | .init_acquisition = NULL, |
7e66bf05 | 1338 | .update_status = NULL, |
d4eabea8 | 1339 | }, |
81eb36d6 MS |
1340 | |
1341 | /* Rohde & Schwarz HMC8043 */ | |
5e7377f4 | 1342 | { "Rohde&Schwarz", "HMC8043", SCPI_DIALECT_UNKNOWN, 0, |
81eb36d6 MS |
1343 | ARRAY_AND_SIZE(rs_hmc8043_devopts), |
1344 | ARRAY_AND_SIZE(rs_hmc8043_devopts_cg), | |
1345 | ARRAY_AND_SIZE(rs_hmc8043_ch), | |
1346 | ARRAY_AND_SIZE(rs_hmc8043_cg), | |
1347 | rs_hmc8043_cmd, | |
1348 | .probe_channels = NULL, | |
fd243315 | 1349 | .init_acquisition = NULL, |
7e66bf05 | 1350 | .update_status = NULL, |
81eb36d6 | 1351 | }, |
d4eabea8 | 1352 | }; |
d4eabea8 | 1353 | |
1beccaed | 1354 | SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles); |