*/
#include <config.h>
+#include <math.h>
#include <ieee1284.h>
#include "protocol.h"
{
struct dev_context *devc = sdi->priv;
float *data = devc->samples;
- struct sr_datafeed_analog_old analog = {
- .channels = devc->enabled_channel,
- .num_samples = num,
- .mq = SR_MQ_VOLTAGE,
- .unit = SR_UNIT_VOLT,
- .mqflags = 0,
- .data = data,
- };
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_packet packet = {
- .type = SR_DF_ANALOG_OLD,
+ .type = SR_DF_ANALOG,
.payload = &analog,
};
float factor = devc->factor;
while (num--)
data[num] = (buf[num] - 0x80) * factor;
- sr_session_send(devc->cb_data, &packet);
+ float vdivlog = log10f(factor);
+ int digits = -(int)vdivlog + (vdivlog < 0.0);
+
+ sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+ analog.meaning->channels = devc->enabled_channel;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
+ analog.num_samples = num;
+ analog.data = data;
+
+ sr_session_send(sdi, &packet);
}
static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
};
push_samples(sdi, buf, 6);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
buf += 6;
num -= 6;
}
return FALSE;
}
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (devc->channel) {
while (read_subframe(sdi, buf)) {
}
packet.type = SR_DF_FRAME_END;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (++devc->frame >= devc->frame_limit)
- hung_chang_dso_2100_dev_acquisition_stop(sdi, devc->cb_data);
+ hung_chang_dso_2100_dev_acquisition_stop(sdi);
else
hung_chang_dso_2100_move_to(sdi, 0x21);