X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fasycii.c;h=96a462c5e6d2b4a666a220e319be58f1bf024d9e;hb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;hp=54858ffa60b91737191eeb3c90834b0393eb9d34;hpb=661aa24aa6f6715b615a566082c16fa643ebf955;p=libsigrok.git diff --git a/src/dmm/asycii.c b/src/dmm/asycii.c index 54858ffa..96a462c5 100644 --- a/src/dmm/asycii.c +++ b/src/dmm/asycii.c @@ -379,7 +379,7 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval, if (info->is_dc) analog->meaning->mqflags |= SR_MQFLAG_DC; if (info->is_diode) - analog->meaning->mqflags |= SR_MQFLAG_DIODE; + analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC; if (info->is_peak_max) analog->meaning->mqflags |= SR_MQFLAG_MAX; if (info->is_peak_min) @@ -446,7 +446,7 @@ static gboolean flags_valid(const struct asycii_info *info) return TRUE; } -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM /** * Arrange for the reception of another measurement from the DMM. * @@ -455,8 +455,6 @@ static gboolean flags_valid(const struct asycii_info *info) * without the PC's intervention. * * @param[in] serial The serial connection. - * - * @private */ SR_PRIV int sr_asycii_packet_request(struct sr_serial_dev_inst *serial) { @@ -519,7 +517,7 @@ SR_PRIV int sr_asycii_parse(const uint8_t *buf, float *floatval, int ret, exponent; struct asycii_info *info_local; - info_local = (struct asycii_info *)info; + info_local = info; /* Don't print byte 15. That one contains the carriage return. */ sr_dbg("DMM packet: \"%.15s\"", buf);