fluke-dmm: Fix Fluke 28x unit mappings

The Fluke 28x unit mapping has a couple of bugs: 'dBm' incorrectly
maps to SQ_MQ_VOLTAGE and 'AAC_PLUS_DC' incorrectly maps to
SR_MQ_VOLTAGE. Fix these issues.

Signed-off-by: Andreas Sandberg <redacted>

diff --git a/src/hardware/fluke-dmm/fluke-28x.c b/src/hardware/fluke-dmm/fluke-28x.c
index e4383fbeeb70905c523a8d05edbb7472a4530b9b..7faac44aacd70746548b64870abfbe1456ba18d7 100644 (file)
--- a/src/hardware/fluke-dmm/fluke-28x.c
+++ b/src/hardware/fluke-dmm/fluke-28x.c
@@ -94,7 +94,7 @@ static const struct unit_mapping unit_map[] = {
        { "ADC", SR_MQ_CURRENT, SR_UNIT_AMPERE, SR_MQFLAG_DC },
        { "AAC", SR_MQ_CURRENT, SR_UNIT_AMPERE, SR_MQFLAG_AC | SR_MQFLAG_RMS },
        { "VAC_PLUS_DC", SR_MQ_VOLTAGE, SR_UNIT_VOLT, 0 },
-       { "AAC_PLUS_DC", SR_MQ_VOLTAGE, SR_UNIT_VOLT, 0 },
+       { "AAC_PLUS_DC", SR_MQ_CURRENT, SR_UNIT_AMPERE, 0 },
        /* Used in peak */
        { "V", SR_MQ_VOLTAGE, SR_UNIT_VOLT, 0 },
        /* Used in peak */
@@ -107,7 +107,7 @@ static const struct unit_mapping unit_map[] = {
        { "CEL", SR_MQ_TEMPERATURE, SR_UNIT_CELSIUS, 0 },
        { "FAR", SR_MQ_TEMPERATURE, SR_UNIT_FAHRENHEIT, 0 },
        { "PCT", SR_MQ_DUTY_CYCLE, SR_UNIT_PERCENTAGE, 0 },
-       { "dBm", SR_MQ_VOLTAGE, SR_UNIT_DECIBEL_MW, SR_MQFLAG_AC | SR_MQFLAG_RMS },
+       { "dBm", SR_MQ_POWER, SR_UNIT_DECIBEL_MW, SR_MQFLAG_AC | SR_MQFLAG_RMS },
        { "dBV", SR_MQ_VOLTAGE, SR_UNIT_DECIBEL_VOLT, SR_MQFLAG_AC | SR_MQFLAG_RMS },
 };