From 2e1c4817c7f89b6a7eab8e9801b25d73a95089fb Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sun, 3 Jan 2016 22:27:43 +0100 Subject: [PATCH] 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 --- src/dmm/vc870.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 */