add energy meter device type and related units

diff --git a/libsigrok.h b/libsigrok.h
index 67f3197159bcd12129bdfc1903a4887bb9c0a7be..17d7fc17d7a5249dff9d11c585ec95891bb596d9 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -217,6 +217,9 @@ enum {
         */
        SR_UNIT_CONCENTRATION,
        SR_UNIT_REVOLUTIONS_PER_MINUTE,
+       SR_UNIT_VOLT_AMPERE,
+       SR_UNIT_WATT,
+       SR_UNIT_WATT_HOUR,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -583,6 +586,9 @@ enum {
        /** The device can measure humidity. */
        SR_CONF_HYGROMETER,
 
+       /** The device can measure energy consumption. */
+       SR_CONF_ENERGYMETER,
+
        /*--- Driver scan options -------------------------------------------*/
 
        /**

diff --git a/output/analog.c b/output/analog.c
index 7437663924f86d1688fc190f134fe2fa9aee7e80..50189b41334924ed45673ac76baea3c1a7b703fd 100644 (file)
--- a/output/analog.c
+++ b/output/analog.c
@@ -175,6 +175,14 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
                break;
        case SR_UNIT_REVOLUTIONS_PER_MINUTE:
                si_printf(value, out, "RPM");
+       case SR_UNIT_VOLT_AMPERE:
+               si_printf(value, out, "VA");
+               break;
+       case SR_UNIT_WATT:
+               si_printf(value, out, "W");
+               break;
+       case SR_UNIT_WATT_HOUR:
+               si_printf(value, out, "Wh");
                break;
        default:
                si_printf(value, out, "");