libsigrok.h: Add Joule, Coulomb, and Ah units.

Also extend a comment on energy in comparison to power.

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 0b06cb7c7ec71e68a8dd3dd34eea70721651d41f..c16278c407efb91a0eda0c90b23b90d1a503e3bb 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -294,7 +294,7 @@ enum sr_unit {
        SR_UNIT_VOLT_AMPERE,
        /** Real power [W]. */
        SR_UNIT_WATT,
-       /** Consumption [Wh]. */
+       /** Energy (consumption) in watt hour [Wh]. */
        SR_UNIT_WATT_HOUR,
        /** Wind speed in meters per second. */
        SR_UNIT_METER_SECOND,
@@ -328,6 +328,12 @@ enum sr_unit {
        SR_UNIT_TOLA,
        /** Pieces (number of items). */
        SR_UNIT_PIECE,
+       /** A relative unit of (power) measurement [dB]. */
+       SR_UNIT_JOULE,
+       /** Electric charge in coulomb. */
+       SR_UNIT_COULOMB,
+       /** Electric charge in ampere hour [Ah]. */
+       SR_UNIT_AMPERE_HOUR,
 
        /*
         * Update unit_strings[] (analog.c) and fancyprint() (output/analog.c)

diff --git a/src/analog.c b/src/analog.c
index a471f642af96dc60faae02cf1dc662d2c43b47c4..2a8e8d9054cfdd8bc691bb2e5e95534a0c50c0c7 100644 (file)
--- a/src/analog.c
+++ b/src/analog.c
@@ -88,6 +88,9 @@ static struct unit_mq_string unit_strings[] = {
        { SR_UNIT_MOMME, "momme" },
        { SR_UNIT_TOLA, "tola" },
        { SR_UNIT_PIECE, "pcs" },
+       { SR_UNIT_JOULE, "J" },
+       { SR_UNIT_COULOMB, "C" },
+       { SR_UNIT_AMPERE_HOUR, "Ah" },
        ALL_ZERO
 };