X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fvc870.c;h=fc795678e6dcb02a3ee68c694eb00180db694fbc;hb=ee2e9be21be59e9455a78ce3598db49e3b38e6f6;hp=125f4712d5fb23179bc09d363292c4940ece5b47;hpb=2e1c4817c7f89b6a7eab8e9801b25d73a95089fb;p=libsigrok.git

diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 125f4712..fc795678 100644
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -150,7 +150,7 @@ static int parse_range(uint8_t b, float *floatval,
 		mode = 16; /* Act+apparent power */
 	else if (info->is_power_factor_freq)
 		mode = 17; /* Power factor / freq */
-	else if (info->is_v_a_eff_value)
+	else if (info->is_v_a_rms_value)
 		mode = 18; /* V eff + A eff */
 	else {
 		sr_dbg("Invalid mode, range byte was: 0x%02x.", b);
@@ -225,7 +225,7 @@ static void parse_flags(const uint8_t *buf, struct vc870_info *info)
 			info->is_power_factor_freq = TRUE;
 		else if (buf[1] == 0x32)
 			/* Voltage effective value + current effective value */
-			info->is_v_a_eff_value = TRUE;
+			info->is_v_a_rms_value = TRUE;
 		break;
 	default:
 		sr_dbg("Invalid function bytes: %02x %02x.", buf[0], buf[1]);
@@ -351,6 +351,14 @@ static void handle_flags(struct sr_datafeed_analog_old *analog,
 		// analog->mq = SR_MQ_FREQUENCY;
 		// analog->unit = SR_UNIT_HERTZ;
 	}
+	if (info->is_v_a_rms_value) {
+		analog->mqflags |= SR_MQFLAG_RMS;
+		analog->mq = SR_MQ_VOLTAGE;
+		analog->unit = SR_UNIT_VOLT;
+		/* TODO: Handle effective current value */
+		// analog->mq = SR_MQ_CURRENT;
+		// analog->unit = SR_UNIT_AMPERE;
+	}
 
 	/* Measurement related flags */
 	if (info->is_ac)