X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=30fc62f21e0732799be6878ef61adece1d801159;hb=7a0b98b544ca00f351295f21f895442680b1c014;hp=5c979edefcd8b6049505f010f702dc0d42c90fae;hpb=dcd438ee3523098201c7937e75e55775da3b506f;p=libsigrok.git diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c index 5c979ede..30fc62f2 100644 --- a/src/hardware/motech-lps-30x/api.c +++ b/src/hardware/motech-lps-30x/api.c @@ -27,7 +27,6 @@ #include #include #include - #include "protocol.h" /* Forward declarations */ @@ -59,27 +58,27 @@ static const uint32_t scanopts[] = { static const uint32_t devopts[] = { /* Device class */ SR_CONF_POWER_SUPPLY, - /* Aquisition modes. */ + /* Acquisition modes. */ SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, /* Device configuration */ - SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; /** Hardware capabilities channel 1, 2. */ static const uint32_t devopts_ch12[] = { - SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, - 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_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, + SR_CONF_VOLTAGE | SR_CONF_GET, + SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_CURRENT | SR_CONF_GET, + SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, }; /** Hardware capabilities channel 3. (LPS-304/305 only). */ static const uint32_t devopts_ch3[] = { - SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, - SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, + SR_CONF_VOLTAGE | SR_CONF_GET, + SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, }; static const char *channel_modes[] = { @@ -444,7 +443,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o g_strstrip(buf); verstr = buf + 4; } - else /* Bug in device FW 1.17: Quering version string fails while output is active. + else /* Bug in device FW 1.17: Querying version string fails while output is active. Therefore just print an error message, but do not exit with error. */ sr_err("Failed to query for hardware version: %d %s", errno, strerror(errno)); @@ -502,8 +501,7 @@ exit_err: serial_close(serial); sr_serial_dev_inst_free(serial); } - if (devc) - g_free(devc); + g_free(devc); if (sdi) sr_dev_inst_free(sdi); @@ -563,7 +561,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s case SR_CONF_LIMIT_MSEC: *data = g_variant_new_uint64(devc->limit_msec); break; - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: *data = g_variant_new_string(channel_modes[devc->tracking_mode]); break; default: @@ -574,19 +572,19 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s ch = cg->channels->data; ch_idx = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE: + case SR_CONF_VOLTAGE: *data = g_variant_new_double(devc->channel_status[ch_idx].output_voltage_last); break; - case SR_CONF_OUTPUT_VOLTAGE_TARGET: + case SR_CONF_VOLTAGE_TARGET: *data = g_variant_new_double(devc->channel_status[ch_idx].output_voltage_max); break; - case SR_CONF_OUTPUT_CURRENT: + case SR_CONF_CURRENT: *data = g_variant_new_double(devc->channel_status[ch_idx].output_current_last); break; - case SR_CONF_OUTPUT_CURRENT_LIMIT: + case SR_CONF_CURRENT_LIMIT: *data = g_variant_new_double(devc->channel_status[ch_idx].output_current_max); break; - case SR_CONF_OUTPUT_ENABLED: + case SR_CONF_ENABLED: *data = g_variant_new_boolean(devc->channel_status[ch_idx].output_enabled); break; default: @@ -628,7 +626,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); break; - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: sval = g_variant_get_string(data, NULL); found = FALSE; for (idx = 0; idx < (int)ARRAY_SIZE(channel_modes); idx++) { @@ -656,7 +654,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd ch_idx = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE_TARGET: + case SR_CONF_VOLTAGE_TARGET: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[ch_idx].voltage[1]) return SR_ERR_ARG; @@ -677,7 +675,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd else return lps_cmd_ok(sdi->conn, "VSET%d %05.3f", ch_idx+1, dval); break; - case SR_CONF_OUTPUT_CURRENT_LIMIT: + case SR_CONF_CURRENT_LIMIT: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[ch_idx].current[1]) return SR_ERR_ARG; @@ -686,7 +684,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd devc->channel_status[ch_idx].output_current_max = dval; return lps_cmd_ok(sdi->conn, "ISET%d %05.4f", ch_idx+1, dval); break; - case SR_CONF_OUTPUT_ENABLED: + case SR_CONF_ENABLED: bval = g_variant_get_boolean(data); if (bval == devc->channel_status[ch_idx].output_enabled) /* Nothing to do. */ break; @@ -738,13 +736,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } /* Device options, independent from channel groups. */ - if (cg == NULL) { + if (!cg) { switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); return SR_OK; - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: if (devc->model->modelid <= LPS_303) { /* The 1-channel models. */ *data = g_variant_new_strv(channel_modes, 1); @@ -770,7 +768,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_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t)); break; - case SR_CONF_OUTPUT_VOLTAGE_TARGET: + case SR_CONF_VOLTAGE_TARGET: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) { @@ -779,7 +777,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_LIMIT: + case SR_CONF_CURRENT_LIMIT: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) {