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

yokogawa-dlm: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-28 17:47:45 +02:00
parent 16544b3856
commit 44040ea65e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hardware/yokogawa-dlm/protocol.c
View File

@ -964,7 +964,10 @@ static int dlm_analog_samples_send(GArray *data,
struct dev_context *devc; struct dev_context *devc;
struct scope_state *model_state; struct scope_state *model_state;
struct sr_channel *ch; struct sr_channel *ch;
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 sr_datafeed_packet packet; struct sr_datafeed_packet packet;
devc = sdi->priv; devc = sdi->priv;
@ -992,16 +995,17 @@ static int dlm_analog_samples_send(GArray *data,
g_array_append_val(float_data, voltage); g_array_append_val(float_data, voltage);
} }
analog.channels = g_slist_append(NULL, ch); sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.meaning->channels = g_slist_append(NULL, ch);
analog.num_samples = float_data->len; analog.num_samples = float_data->len;
analog.data = (float*)float_data->data; analog.data = (float*)float_data->data;
analog.mq = SR_MQ_VOLTAGE; analog.meaning->mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT; analog.meaning->unit = SR_UNIT_VOLT;
analog.mqflags = 0; analog.meaning->mqflags = 0;
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
g_slist_free(analog.channels); g_slist_free(analog.meaning->channels);
g_array_free(float_data, TRUE); g_array_free(float_data, TRUE);
g_array_remove_range(data, 0, samples * sizeof(uint8_t)); g_array_remove_range(data, 0, samples * sizeof(uint8_t));