X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=f29377e34617da5cfb22cdce0fc190e4ea959aa6;hb=d6fa8ace94ac0c17855c3433cca038a150689495;hp=2e62fb80c0b445147c71a83c9298375a8c0d6f36;hpb=5305266a28c1af09267f43f8941b6012be3d954f;p=libsigrok.git diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index 2e62fb80..f29377e3 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -36,18 +36,21 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t devopts_drv[] = { SR_CONF_POWER_SUPPLY, SR_CONF_CONTINUOUS, +}; + +static const uint32_t devopts_global[] = { SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, }; static const uint32_t devopts_cg[] = { SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, - SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, - SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, }; @@ -94,7 +97,7 @@ static GSList *scan(GSList *options, int modelid) struct pps_model *model; uint8_t packet[PACKET_SIZE]; unsigned int i; - int ret; + int delay_ms, ret; const char *conn, *serialcomm; char channel[10]; @@ -126,13 +129,13 @@ static GSList *scan(GSList *options, int modelid) return NULL; serial_flush(serial); - /* This is how the vendor software channels for hardware. */ + /* This is how the vendor software scans for hardware. */ memset(packet, 0, PACKET_SIZE); packet[0] = 0xaa; packet[1] = 0xaa; - if (serial_write_blocking(serial, packet, PACKET_SIZE) == -1) { - sr_err("Unable to write while probing for hardware: %s", - strerror(errno)); + delay_ms = serial_timeout(serial, PACKET_SIZE); + if (serial_write_blocking(serial, packet, PACKET_SIZE, delay_ms) < PACKET_SIZE) { + sr_err("Unable to write while probing for hardware."); return NULL; } /* The device responds with a 24-byte packet when it receives a packet. @@ -161,7 +164,7 @@ static GSList *scan(GSList *options, int modelid) return NULL; } - sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Atten", model->name, NULL); + sdi = sr_dev_inst_new(SR_ST_INACTIVE, "Atten", model->name, NULL); sdi->driver = di; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; @@ -179,6 +182,7 @@ static GSList *scan(GSList *options, int modelid) devc = g_malloc0(sizeof(struct dev_context)); devc->model = model; devc->config = g_malloc0(sizeof(struct per_channel_config) * model->num_channels); + devc->delay_ms = delay_ms; sdi->priv = devc; drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); @@ -239,13 +243,13 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s case SR_CONF_OUTPUT_VOLTAGE: *data = g_variant_new_double(devc->config[channel].output_voltage_last); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: *data = g_variant_new_double(devc->config[channel].output_voltage_max); break; case SR_CONF_OUTPUT_CURRENT: *data = g_variant_new_double(devc->config[channel].output_current_last); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_OUTPUT_CURRENT_LIMIT: *data = g_variant_new_double(devc->config[channel].output_current_max); break; case SR_CONF_OUTPUT_ENABLED: @@ -327,14 +331,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd channel = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[channel].voltage[1]) ret = SR_ERR_ARG; devc->config[channel].output_voltage_max = dval; devc->config_dirty = TRUE; break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_OUTPUT_CURRENT_LIMIT: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[channel].current[1]) ret = SR_ERR_ARG; @@ -367,24 +371,30 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariantBuilder gvb; int channel, ret, i; - /* Always available, even without sdi. */ + /* Always available. */ if (key == SR_CONF_SCAN_OPTIONS) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; } + if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_drv, ARRAY_SIZE(devopts_drv), sizeof(uint32_t)); + return SR_OK; + } + if (!sdi) return SR_ERR_ARG; - devc = sdi->priv; + devc = sdi->priv; ret = SR_OK; if (!cg) { /* No channel group: global options. */ switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); + devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t)); break; case SR_CONF_OUTPUT_CHANNEL_CONFIG: if (devc->model->channel_modes == CHANMODE_INDEPENDENT) { @@ -411,7 +421,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) { @@ -420,7 +430,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } *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++) {