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

gwinstek-gds-800: properly set encoding digits

This commit is contained in:
Aurelien Jacobs 2016-08-25 01:08:29 +02:00 committed by Uwe Hermann
parent 417412c8f8
commit 6c1c13cdcd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hardware/gwinstek-gds-800/protocol.c
View File

@ -18,6 +18,7 @@
*/ */
#include "protocol.h" #include "protocol.h"
#include <math.h>
#include <string.h> #include <string.h>
#define ANALOG_CHANNELS 2 #define ANALOG_CHANNELS 2
@ -235,12 +236,16 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
sr_spew("Received %d number of samples from channel " sr_spew("Received %d number of samples from channel "
"%d.", num_samples, devc->cur_acq_channel + 1); "%d.", num_samples, devc->cur_acq_channel + 1);
float vbit = volts_per_division * VERTICAL_DIVISIONS / 256.0;
float vbitlog = log10f(vbit);
int digits = -(int)vbitlog + (vbitlog < 0.0);
/* Convert data. */ /* Convert data. */
for (i = 0; i < num_samples; i++) for (i = 0; i < num_samples; i++)
samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) / 256. * VERTICAL_DIVISIONS * volts_per_division; samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) * vbit;
/* Fill frame. */ /* Fill frame. */
sr_analog_init(&analog, &encoding, &meaning, &spec, 0); sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel)); analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel));
analog.num_samples = num_samples; analog.num_samples = num_samples;
analog.data = samples; analog.data = samples;