BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: properly set encoding digits

This commit is contained in:
Aurelien Jacobs 2016-08-24 02:11:24 +02:00 committed by Uwe Hermann
parent 1e1fdbc994
commit 417412c8f8
3 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/hardware/hantek-dso/api.c
View File

@ -18,6 +18,7 @@
*/ */
#include <config.h> #include <config.h>
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -191,8 +192,8 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
devc->profile = prof; devc->profile = prof;
devc->dev_state = IDLE; devc->dev_state = IDLE;
devc->timebase = DEFAULT_TIMEBASE; devc->timebase = DEFAULT_TIMEBASE;
devc->ch1_enabled = TRUE; devc->ch_enabled[0] = TRUE;
devc->ch2_enabled = TRUE; devc->ch_enabled[1] = TRUE;
devc->voltage[0] = DEFAULT_VOLTAGE; devc->voltage[0] = DEFAULT_VOLTAGE;
devc->voltage[1] = DEFAULT_VOLTAGE; devc->voltage[1] = DEFAULT_VOLTAGE;
devc->coupling[0] = DEFAULT_COUPLING; devc->coupling[0] = DEFAULT_COUPLING;
@ -219,13 +220,13 @@ static int configure_channels(const struct sr_dev_inst *sdi)
devc = sdi->priv; devc = sdi->priv;
g_slist_free(devc->enabled_channels); g_slist_free(devc->enabled_channels);
devc->ch1_enabled = devc->ch2_enabled = FALSE; devc->ch_enabled[0] = devc->ch_enabled[1] = FALSE;
for (l = sdi->channels, p = 0; l; l = l->next, p++) { for (l = sdi->channels, p = 0; l; l = l->next, p++) {
ch = l->data; ch = l->data;
if (p == 0) if (p == 0)
devc->ch1_enabled = ch->enabled; devc->ch_enabled[0] = ch->enabled;
else else
devc->ch2_enabled = ch->enabled; devc->ch_enabled[1] = ch->enabled;
if (ch->enabled) if (ch->enabled)
devc->enabled_channels = g_slist_append(devc->enabled_channels, ch); devc->enabled_channels = g_slist_append(devc->enabled_channels, ch);
} }
@ -692,54 +693,52 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
struct sr_analog_encoding encoding; struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning; struct sr_analog_meaning meaning;
struct sr_analog_spec spec; struct sr_analog_spec spec;
struct dev_context *devc; struct dev_context *devc = sdi->priv;
float ch1, ch2, range; GSList *channels = devc->enabled_channels;
int num_channels, data_offset;
unsigned int i;
devc = sdi->priv;
num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
packet.type = SR_DF_ANALOG; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
/* TODO: support for 5xxx series 9-bit samples */ /* TODO: support for 5xxx series 9-bit samples */
sr_analog_init(&analog, &encoding, &meaning, &spec, 0); sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.meaning->channels = devc->enabled_channels;
analog.num_samples = num_samples; analog.num_samples = num_samples;
analog.meaning->mq = SR_MQ_VOLTAGE; analog.meaning->mq = SR_MQ_VOLTAGE;
analog.meaning->unit = SR_UNIT_VOLT; analog.meaning->unit = SR_UNIT_VOLT;
analog.meaning->mqflags = 0; analog.meaning->mqflags = 0;
/* TODO: Check malloc return value. */ /* TODO: Check malloc return value. */
analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels); analog.data = g_try_malloc(num_samples * sizeof(float));
data_offset = 0;
for (i = 0; i < analog.num_samples; i++) { for (int ch = 0; ch < 2; ch++) {
/* if (!devc->ch_enabled[ch])
* The device always sends data for both channels. If a channel continue;
* is disabled, it contains a copy of the enabled channel's
* data. However, we only send the requested channels to float range = ((float)vdivs[devc->voltage[ch]][0] / vdivs[devc->voltage[ch]][1]) * 8;
* the bus. float vdivlog = log10f(range / 255);
* int digits = -(int)vdivlog + (vdivlog < 0.0);
* Voltage values are encoded as a value 0-255 (0-512 on the analog.encoding->digits = digits;
* DSO-5200*), where the value is a point in the range analog.spec->spec_digits = digits;
* represented by the vdiv setting. There are 8 vertical divs, analog.meaning->channels = g_slist_append(NULL, channels->data);
* so e.g. 500mV/div represents 4V peak-to-peak where 0 = -2V
* and 255 = +2V. for (int i = 0; i < num_samples; i++) {
*/ /*
/* TODO: Support for DSO-5xxx series 9-bit samples. */ * The device always sends data for both channels. If a channel
if (devc->ch1_enabled) { * is disabled, it contains a copy of the enabled channel's
range = ((float)vdivs[devc->voltage[0]][0] / vdivs[devc->voltage[0]][1]) * 8; * data. However, we only send the requested channels to
ch1 = range / 255 * *(buf + i * 2 + 1); * the bus.
/* Value is centered around 0V. */ *
ch1 -= range / 2; * Voltage values are encoded as a value 0-255 (0-512 on the
((float *)analog.data)[data_offset++] = ch1; * DSO-5200*), where the value is a point in the range
} * represented by the vdiv setting. There are 8 vertical divs,
if (devc->ch2_enabled) { * so e.g. 500mV/div represents 4V peak-to-peak where 0 = -2V
range = ((float)vdivs[devc->voltage[1]][0] / vdivs[devc->voltage[1]][1]) * 8; * and 255 = +2V.
ch2 = range / 255 * *(buf + i * 2); */
ch2 -= range / 2; /* TODO: Support for DSO-5xxx series 9-bit samples. */
((float *)analog.data)[data_offset++] = ch2; ((float *)analog.data)[i] = range / 255 * *(buf + i * 2 + 1 - ch) - range / 2;
} }
sr_session_send(sdi, &packet);
g_slist_free(analog.meaning->channels);
channels = channels->next;
} }
sr_session_send(sdi, &packet);
g_free(analog.data); g_free(analog.data);
} }
@ -918,7 +917,7 @@ static int handle_event(int fd, int revents, void *cb_data)
/* Remember where in the captured frame the trigger is. */ /* Remember where in the captured frame the trigger is. */
devc->trigger_offset = trigger_offset; devc->trigger_offset = trigger_offset;
num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; num_channels = (devc->ch_enabled[0] && devc->ch_enabled[1]) ? 2 : 1;
devc->framebuf = g_malloc(devc->framesize * num_channels * 2); devc->framebuf = g_malloc(devc->framesize * num_channels * 2);
devc->samp_buffered = devc->samp_received = 0; devc->samp_buffered = devc->samp_received = 0;

4
src/hardware/hantek-dso/dso.c
View File

@ -315,8 +315,8 @@ static int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
cmdstring[2] |= (tmp & 0x07) << 5; cmdstring[2] |= (tmp & 0x07) << 5;
/* Enabled channels: 00=CH1 01=CH2 10=both */ /* Enabled channels: 00=CH1 01=CH2 10=both */
sr_dbg("Channels CH1=%d CH2=%d", devc->ch1_enabled, devc->ch2_enabled); sr_dbg("Channels CH1=%d CH2=%d", devc->ch_enabled[0], devc->ch_enabled[1]);
tmp = (((devc->ch2_enabled ? 1 : 0) << 1) + (devc->ch1_enabled ? 1 : 0)) - 1; tmp = (((devc->ch_enabled[1] ? 1 : 0) << 1) + (devc->ch_enabled[0] ? 1 : 0)) - 1;
cmdstring[3] = tmp; cmdstring[3] = tmp;
/* Fast rates channel */ /* Fast rates channel */

3
src/hardware/hantek-dso/dso.h
View File

@ -177,8 +177,7 @@ struct dev_context {
/* Oscilloscope settings. */ /* Oscilloscope settings. */
int timebase; int timebase;
gboolean ch1_enabled; gboolean ch_enabled[2];
gboolean ch2_enabled;
int voltage[2]; int voltage[2];
int coupling[2]; int coupling[2];
// voltage offset (vertical position) // voltage offset (vertical position)