X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=9609936a23ae0604df899b9ddc23482c12111715;hb=07411a605ed83f7a57db9d805731c0abe5893df7;hp=762fcae1ec8ed434a3095ad4cb410f617bcecd04;hpb=7e66bf058624f96d3cd8c4d1cb3dbd87e27e2440;p=libsigrok.git diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c index 762fcae1..9609936a 100644 --- a/src/hardware/scpi-pps/protocol.c +++ b/src/hardware/scpi-pps/protocol.c @@ -105,6 +105,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data) analog.meaning->channels = g_slist_append(NULL, devc->cur_acquisition_channel); analog.num_samples = 1; analog.meaning->mq = pch->mq; + analog.meaning->mqflags = pch->mqflags; if (pch->mq == SR_MQ_VOLTAGE) { analog.meaning->unit = SR_UNIT_VOLT; analog.encoding->digits = ch_spec->voltage[4]; @@ -117,8 +118,11 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data) analog.meaning->unit = SR_UNIT_WATT; analog.encoding->digits = ch_spec->power[4]; analog.spec->spec_digits = ch_spec->power[3]; + } else if (pch->mq == SR_MQ_FREQUENCY) { + analog.meaning->unit = SR_UNIT_HERTZ; + analog.encoding->digits = ch_spec->frequency[4]; + analog.spec->spec_digits = ch_spec->frequency[3]; } - analog.meaning->mqflags = SR_MQFLAG_DC; f = (float)g_variant_get_double(gvdata); g_variant_unref(gvdata); analog.data = &f;