From: Wolfram Sang <redacted>
Date: Sun, 3 Jan 2016 21:27:43 +0000 (+0100)
Subject: dmm: vc870: render POWER_FACTOR as such and not as frequency
X-Git-Tag: libsigrok-0.4.0~35
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2e1c4817c7f89b6a7eab8e9801b25d73a95089fb;p=libsigrok.git

dmm: vc870: render POWER_FACTOR as such and not as frequency

The primary display is the power factor, the secondary is the frequency.
This got mixed up, so change the order. We also need to fix the
conversion factor.

Signed-off-by: Wolfram Sang <redacted>
---

diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 2529f0ba..125f4712 100644
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -59,7 +59,7 @@ static const float factors[][8] = {
 	/* TODO: Verify factor for ACA */
 	{1e-3,  0,     0,     0,    0,    0,    0,    0},    /* ACA */
 	{1e-1,  0,     0,     0,    0,    0,    0,    0},    /* Act+apparent power */
-	{1e-1,  0,     0,     0,    0,    0,    0,    0},    /* Power factor / freq */
+	{1e-3,  0,     0,     0,    0,    0,    0,    0},    /* Power factor / freq */
 	{1e-1,  0,     0,     0,    0,    0,    0,    0},    /* V eff + A eff */
 };
 
@@ -345,11 +345,11 @@ static void handle_flags(struct sr_datafeed_analog_old *analog,
 		// analog->unit = SR_UNIT_VOLT_AMPERE;
 	}
 	if (info->is_power_factor_freq) {
-		/* TODO: Handle power factor. */
-		// analog->mq = SR_MQ_POWER_FACTOR;
-		// analog->unit = SR_UNIT_UNITLESS;
-		analog->mq = SR_MQ_FREQUENCY;
-		analog->unit = SR_UNIT_HERTZ;
+		analog->mq = SR_MQ_POWER_FACTOR;
+		analog->unit = SR_UNIT_UNITLESS;
+		/* TODO: Handle frequency. */
+		// analog->mq = SR_MQ_FREQUENCY;
+		// analog->unit = SR_UNIT_HERTZ;
 	}
 
 	/* Measurement related flags */