extern unsigned int num_pps_profiles;
extern const struct scpi_pps pps_profiles[];
-static const int32_t scanopts[] = {
+static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
return NULL;
}
- sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, vendor, hw_info->model,
+ sdi = sr_dev_inst_new(SR_ST_ACTIVE, vendor, hw_info->model,
hw_info->firmware_version);
sdi->conn = scpi;
sdi->driver = di;
return SR_OK;
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
gvtype = G_VARIANT_TYPE_DOUBLE;
- cmd = SCPI_CMD_GET_VOLTAGE_MAX;
+ cmd = SCPI_CMD_GET_VOLTAGE_TARGET;
break;
case SR_CONF_OUTPUT_CURRENT:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_CURRENT;
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
gvtype = G_VARIANT_TYPE_DOUBLE;
- cmd = SCPI_CMD_GET_CURRENT_MAX;
+ cmd = SCPI_CMD_GET_CURRENT_LIMIT;
break;
case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
gvtype = G_VARIANT_TYPE_BOOLEAN;
return ret;
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct sr_channel *ch;
struct pps_channel *pch;
double d;
int ret;
- const char *s;
if (!sdi)
return SR_ERR_ARG;
switch (key) {
/* No channel group: global options. */
case SR_CONF_OUTPUT_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, s);
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE);
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, d);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, d);
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, d);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, d);
break;
case SR_CONF_OVER_TEMPERATURE_PROTECTION:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION, s);
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE);
break;
default:
ret = SR_ERR_NA;
pch = ch->priv;
switch (key) {
case SR_CONF_OUTPUT_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, pch->hwname, s);
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE, pch->hwname);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE, pch->hwname);
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, pch->hwname, d);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, pch->hwname, d);
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, pch->hwname, d);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, pch->hwname, d);
break;
case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED,
- pch->hwname, s);
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
+ pch->hwname);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
+ pch->hwname);
break;
case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
d = g_variant_get_double(data);
pch->hwname, d);
break;
case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED,
- pch->hwname, s);
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE,
+ pch->hwname);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE,
+ pch->hwname);
break;
case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
d = g_variant_get_double(data);
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
/* Always available, even without sdi. */
if (key == SR_CONF_SCAN_OPTIONS) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK;
}
/* No channel group: global options. */
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devc->device->devopts, devc->device->num_devopts,
- sizeof(int32_t));
+ sizeof(uint32_t));
break;
case SR_CONF_OUTPUT_CHANNEL_CONFIG:
/* Not used. */
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devc->device->devopts_cg, devc->device->num_devopts_cg,
- sizeof(int32_t));
+ sizeof(uint32_t));
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
ch_spec = &(devc->device->channels[ch->index]);
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, write resolution. */
}
*data = g_variant_builder_end(&gvb);
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, step. */
for (i = 0; i < 3; i++) {