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

hameg-hmo: use common helper to setup description of an analog value 

Replace an open coded sequence of assignments to an aggregate of several
related structures. Prefer the common sr_analog_init() routine instead.
This commit is contained in:
Gerhard Sittig 2020-03-18 15:54:29 +01:00 committed by Uwe Hermann
parent 00f3c94386
commit 8c381a353c
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hardware/hameg-hmo/protocol.c
View File

@ -1423,25 +1423,9 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
/* Truncate acquisition if a smaller number of samples has been requested. */ /* Truncate acquisition if a smaller number of samples has been requested. */
if (devc->samples_limit > 0 && analog.num_samples > devc->samples_limit) if (devc->samples_limit > 0 && analog.num_samples > devc->samples_limit)
analog.num_samples = devc->samples_limit; analog.num_samples = devc->samples_limit;
analog.encoding = &encoding;
analog.meaning = &meaning;
analog.spec = &spec;
encoding.unitsize = sizeof(float);
encoding.is_signed = TRUE;
encoding.is_float = TRUE;
#ifdef WORDS_BIGENDIAN
encoding.is_bigendian = TRUE;
#else
encoding.is_bigendian = FALSE;
#endif
/* TODO: Use proper 'digits' value for this device (and its modes). */ /* TODO: Use proper 'digits' value for this device (and its modes). */
encoding.digits = 2; sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
encoding.is_digits_decimal = FALSE; encoding.is_signed = TRUE;
encoding.scale.p = 1;
encoding.scale.q = 1;
encoding.offset.p = 0;
encoding.offset.q = 1;
if (state->analog_channels[ch->index].probe_unit == 'V') { if (state->analog_channels[ch->index].probe_unit == 'V') {
meaning.mq = SR_MQ_VOLTAGE; meaning.mq = SR_MQ_VOLTAGE;
meaning.unit = SR_UNIT_VOLT; meaning.unit = SR_UNIT_VOLT;
@ -1449,10 +1433,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
meaning.mq = SR_MQ_CURRENT; meaning.mq = SR_MQ_CURRENT;
meaning.unit = SR_UNIT_AMPERE; meaning.unit = SR_UNIT_AMPERE;
} }
meaning.mqflags = 0;
meaning.channels = g_slist_append(NULL, ch); meaning.channels = g_slist_append(NULL, ch);
/* TODO: Use proper 'digits' value for this device (and its modes). */
spec.spec_digits = 2;
packet.payload = &analog; packet.payload = &analog;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
devc->num_samples = data->len / sizeof(float); devc->num_samples = data->len / sizeof(float);