BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2016-01-03 22:27:43 +01:00 committed by Uwe Hermann
parent 4867dd177f
commit 2e1c4817c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dmm/vc870.c
View File

@ -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 */