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

dmm: vc870: keep the order when processing modes 

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

14
src/dmm/vc870.c
View File

@ -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)