is_power_apparent_power is index 0 of function 0x39, so it is better to
process it first and the later indices after that (we need to add
another one with a different patch later).
Signed-off-by: Wolfram Sang <w...@the-dreams.de>
---
src/dmm/vc870.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index ee61483..2529f0b 100644
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -337,13 +337,6 @@ static void handle_flags(struct sr_datafeed_analog_old
*analog,
analog->mq = SR_MQ_POWER;
analog->unit = SR_UNIT_WATT;
}
- 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;
- }
if (info->is_power_apparent_power) {
analog->mq = SR_MQ_POWER;
analog->unit = SR_UNIT_WATT;
@@ -351,6 +344,13 @@ static void handle_flags(struct sr_datafeed_analog_old
*analog,
// analog->mq = SR_MQ_APPARENT_POWER;
// 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;
+ }
/* Measurement related flags */
if (info->is_ac)
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
