*/
#include <config.h>
+#include <math.h>
#include "protocol.h"
/* Max time in ms before we want to check on USB events */
"CH1", "CH2",
};
-static const char *coupling[] = {
+static const char *dc_coupling[] = {
+ "DC", "DC",
+};
+
+static const char *acdc_coupling[] = {
"AC", "DC",
};
{
0x04b4, 0x6022, 0x04b5, 0x6022,
"Hantek", "6022BE", "hantek-6022be.fw",
+ dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
},
{
0x8102, 0x8102, 0x1D50, 0x608E,
"Sainsmart", "DDS120", "sainsmart-dds120.fw",
+ acdc_coupling, ARRAY_SIZE(acdc_coupling), TRUE,
},
ALL_ZERO
};
devc->voltage[i] = DEFAULT_VOLTAGE;
devc->coupling[i] = DEFAULT_COUPLING;
}
+ devc->coupling_vals = prof->coupling_vals;
+ devc->coupling_tab_size = prof->coupling_tab_size;
devc->sample_buf = NULL;
devc->sample_buf_write = 0;
usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
prof = NULL;
- for (j = 0; j < (int)ARRAY_SIZE(dev_profiles); j++) {
+ for (j = 0; dev_profiles[j].orig_vid; j++) {
if (des.idVendor == dev_profiles[j].orig_vid
&& des.idProduct == dev_profiles[j].orig_pid) {
/* Device matches the pre-firmware profile. */
*data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]);
+ *data = g_variant_new_string(devc->coupling_vals[devc->coupling[ch_idx]]);
break;
}
}
break;
case SR_CONF_COUPLING:
tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; coupling[i]; i++) {
- if (!strcmp(tmp_str, coupling[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 (coupling[i] == 0)
+ if (i == devc->coupling_tab_size)
ret = SR_ERR_ARG;
break;
default:
GVariantBuilder gvb;
unsigned int i;
GVariant *gvar;
+ struct dev_context *devc = NULL;
if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
return SR_OK;
}
- if (!sdi)
- return SR_ERR_ARG;
+ if (sdi)
+ devc = sdi->priv;
if (!cg) {
switch (key) {
devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+ if (!devc)
+ return SR_ERR_NA;
+ *data = g_variant_new_strv(devc->coupling_vals, devc->coupling_tab_size);
break;
case SR_CONF_VDIV:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
static uint32_t data_amount(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
- uint32_t data_left;
+ uint32_t data_left, data_left_2, i;
int32_t time_left;
if (devc->limit_msec) {
data_left = devc->samplerate * NUM_CHANNELS;
}
- data_left += MIN_PACKET_SIZE; /* Driver does not handle small buffers. */
+ /* Round up to nearest power of two. */
+ for (i = MIN_PACKET_SIZE; i < data_left; i *= 2)
+ ;
+ data_left_2 = i;
- sr_spew("data_amount %u", data_left);
+ sr_spew("data_amount: %u (rounded to power of 2: %u)", data_left, data_left_2);
- return data_left;
+ return data_left_2;
}
static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
int num_samples)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog_old analog;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc = sdi->priv;
- int num_channels, data_offset, i;
+ GSList *channels = devc->enabled_channels;
- 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;
+ const float ch_bit[] = { RANGE(0) / 255, RANGE(1) / 255 };
+ const float ch_center[] = { RANGE(0) / 2, RANGE(1) / 2 };
- const gboolean ch1_ena = !!devc->ch_enabled[0];
- const gboolean ch2_ena = !!devc->ch_enabled[1];
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
- num_channels = (ch1_ena && ch2_ena) ? 2 : 1;
- packet.type = SR_DF_ANALOG_OLD;
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- analog.channels = devc->enabled_channels;
analog.num_samples = num_samples;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
+ 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)
- analog.data[data_offset++] = (ch1_bit * *(buf + i * 2) - ch1_center);
- if (ch2_ena)
- 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;
+
+ 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);
- sr_session_send(sdi, &packet);
+ channels = channels->next;
+ }
g_free(analog.data);
}
*/
usb_source_remove(sdi->session, drvc->sr_ctx);
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
devc->dev_state = IDLE;
if (hantek_6xxx_init(sdi) != SR_OK)
return SR_ERR;
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
devc->samp_received = 0;
devc->dev_state = FLUSH;