X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=a50b1a4214318f0352d10ee7fbd1e03f06aafb3b;hb=1e1bfcd0fef7c397b3d8fc6cd244263e6828a5da;hp=929ba9ecf6a42a382a2c8bc33d96f81d11a7893a;hpb=811155da461851e8a7f75df898a301a7db48c667;p=libsigrok.git diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c index 929ba9ec..a50b1a42 100644 --- a/hardware/uni-t-dmm/protocol.c +++ b/hardware/uni-t-dmm/protocol.c @@ -66,14 +66,16 @@ * - ... */ -static void decode_packet(struct dev_context *devc, int dmm, const uint8_t *buf) +static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf) { struct sr_datafeed_packet packet; struct sr_datafeed_analog analog; + struct dev_context *devc; struct fs9721_info info; float floatval; int ret; + devc = sdi->priv; memset(&analog, 0, sizeof(struct sr_datafeed_analog)); /* Parse the protocol packet. */ @@ -88,6 +90,7 @@ static void decode_packet(struct dev_context *devc, int dmm, const uint8_t *buf) } /* Send a sample packet with one analog value. */ + analog.probes = sdi->probes; analog.num_samples = 1; analog.data = &floatval; packet.type = SR_DF_ANALOG; @@ -255,11 +258,13 @@ static int uni_t_dmm_receive_data(int fd, int revents, int dmm, void *cb_data) if (data_byte_counter == NUM_DATA_BYTES) { log_dmm_packet(pbuf); data_byte_counter = 0; - if (!sr_fs9721_packet_valid(pbuf)) { - sr_err("Invalid packet."); - return TRUE; + if (dmm == VOLTCRAFT_VC820) { + if (!sr_fs9721_packet_valid(pbuf)) { + sr_err("Invalid packet."); + return TRUE; + } } - decode_packet(devc, dmm, pbuf); + decode_packet(sdi, dmm, pbuf); memset(pbuf, 0x00, NUM_DATA_BYTES); } }