X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-6xxx%2Fapi.c;h=0f00cd3ea25b7a6fef2e7b9e46f84b2318432955;hb=f9c6b5cfd3c0f6cb737f6a68f69034ce6819f36d;hp=c3f3d881fd970f2ecff220e088252c224d4a1b37;hpb=0d8a3063e315064ff73f154ea7d94acb41fe8ba6;p=libsigrok.git diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c index c3f3d881..0f00cd3e 100644 --- a/src/hardware/hantek-6xxx/api.c +++ b/src/hardware/hantek-6xxx/api.c @@ -18,6 +18,7 @@ */ #include +#include #include "protocol.h" /* Max time in ms before we want to check on USB events */ @@ -62,12 +63,12 @@ static const struct hantek_6xxx_profile dev_profiles[] = { { 0x04b4, 0x6022, 0x04b5, 0x6022, "Hantek", "6022BE", "hantek-6022be.fw", - dc_coupling, ARRAY_SIZE(dc_coupling), + dc_coupling, ARRAY_SIZE(dc_coupling), FALSE, }, { 0x8102, 0x8102, 0x1D50, 0x608E, "Sainsmart", "DDS120", "sainsmart-dds120.fw", - acdc_coupling, ARRAY_SIZE(acdc_coupling), + acdc_coupling, ARRAY_SIZE(acdc_coupling), TRUE, }, ALL_ZERO }; @@ -306,7 +307,7 @@ static int dev_open(struct sr_dev_inst *sdi) err = libusb_claim_interface(usb->devhdl, USB_INTERFACE); if (err != 0) { sr_err("Unable to claim interface: %s.", - libusb_error_name(err)); + libusb_error_name(err)); return SR_ERR; } @@ -440,13 +441,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd break; case SR_CONF_COUPLING: tmp_str = g_variant_get_string(data, NULL); - for (i = 0; devc->coupling_vals[i]; i++) { + for (i = 0; i < devc->coupling_tab_size; i++) { if (!strcmp(tmp_str, devc->coupling_vals[i])) { devc->coupling[ch_idx] = i; break; } } - if (devc->coupling_vals[i] == 0) + if (i == devc->coupling_tab_size) ret = SR_ERR_ARG; break; default: @@ -465,9 +466,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariantBuilder gvb; unsigned int i; GVariant *gvar; - struct dev_context *devc; - - devc = sdi->priv; + struct dev_context *devc = NULL; if (key == SR_CONF_SCAN_OPTIONS) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, @@ -479,8 +478,8 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } - if (!sdi) - return SR_ERR_ARG; + if (sdi) + devc = sdi->priv; if (!cg) { switch (key) { @@ -506,6 +505,8 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); break; case SR_CONF_COUPLING: + if (!devc) + return SR_ERR_NA; *data = g_variant_new_strv(devc->coupling_vals, devc->coupling_tab_size); break; case SR_CONF_VDIV: @@ -561,55 +562,58 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, struct sr_analog_meaning meaning; struct sr_analog_spec spec; struct dev_context *devc = sdi->priv; - int num_channels, data_offset, i; - - const float ch1_bit = RANGE(0) / 255; - const float ch2_bit = RANGE(1) / 255; - const float ch1_center = RANGE(0) / 2; - const float ch2_center = RANGE(1) / 2; + GSList *channels = devc->enabled_channels; - const gboolean ch1_ena = !!devc->ch_enabled[0]; - const gboolean ch2_ena = !!devc->ch_enabled[1]; + const float ch_bit[] = { RANGE(0) / 255, RANGE(1) / 255 }; + const float ch_center[] = { RANGE(0) / 2, RANGE(1) / 2 }; sr_analog_init(&analog, &encoding, &meaning, &spec, 0); - num_channels = (ch1_ena && ch2_ena) ? 2 : 1; packet.type = SR_DF_ANALOG; packet.payload = &analog; - analog.meaning->channels = devc->enabled_channels; analog.num_samples = num_samples; analog.meaning->mq = SR_MQ_VOLTAGE; analog.meaning->unit = SR_UNIT_VOLT; analog.meaning->mqflags = 0; - analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels); + analog.data = g_try_malloc(num_samples * sizeof(float)); if (!analog.data) { sr_err("Analog data buffer malloc failed."); devc->dev_state = STOPPING; return; } - data_offset = 0; - for (i = 0; i < num_samples; i++) { - /* - * The device always sends data for both channels. If a channel - * is disabled, it contains a copy of the enabled channel's - * data. However, we only send the requested channels to - * the bus. - * - * Voltage values are encoded as a value 0-255, where the - * value is a point in the range represented by the vdiv - * setting. There are 10 vertical divs, so e.g. 500mV/div - * represents 5V peak-to-peak where 0 = -2.5V and 255 = +2.5V. - */ - if (ch1_ena) - ((float *)analog.data)[data_offset++] = (ch1_bit * *(buf + i * 2) - ch1_center); - if (ch2_ena) - ((float *)analog.data)[data_offset++] = (ch2_bit * *(buf + i * 2 + 1) - ch2_center); - } + for (int ch = 0; ch < 2; ch++) { + if (!devc->ch_enabled[ch]) + continue; - sr_session_send(sdi, &packet); + float vdivlog = log10f(ch_bit[ch]); + int digits = -(int)vdivlog + (vdivlog < 0.0); + analog.encoding->digits = digits; + analog.spec->spec_digits = digits; + analog.meaning->channels = g_slist_append(NULL, channels->data); + + for (int i = 0; i < num_samples; i++) { + /* + * The device always sends data for both channels. If a channel + * is disabled, it contains a copy of the enabled channel's + * data. However, we only send the requested channels to + * the bus. + * + * Voltage values are encoded as a value 0-255, where the + * value is a point in the range represented by the vdiv + * setting. There are 10 vertical divs, so e.g. 500mV/div + * represents 5V peak-to-peak where 0 = -2.5V and 255 = +2.5V. + */ + ((float *)analog.data)[i] = ch_bit[ch] * *(buf + i * 2 + ch) - ch_center[ch]; + } + + sr_session_send(sdi, &packet); + g_slist_free(analog.meaning->channels); + + channels = channels->next; + } g_free(analog.data); }