Rename "SERIAL" -> "SERIES".

Use the more correct term "SERIES" for the corresponding equivalent
circuit model.

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 499ee6c4fd985f667f7a04c8e66b6ef885249a42..837233aff31e3387e39fbe90cd3f483daafa20b8 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -207,12 +207,12 @@ enum sr_mq {
        SR_MQ_PARALLEL_CAPACITANCE,
        /** Parallel resistance (LCR meter model). */
        SR_MQ_PARALLEL_RESISTANCE,
-       /** Serial inductance (LCR meter model). */
-       SR_MQ_SERIAL_INDUCTANCE,
-       /** Serial capacitance (LCR meter model). */
-       SR_MQ_SERIAL_CAPACITANCE,
-       /** Serial resistance (LCR meter model). */
-       SR_MQ_SERIAL_RESISTANCE,
+       /** Series inductance (LCR meter model). */
+       SR_MQ_SERIES_INDUCTANCE,
+       /** Series capacitance (LCR meter model). */
+       SR_MQ_SERIES_CAPACITANCE,
+       /** Series resistance (LCR meter model). */
+       SR_MQ_SERIES_RESISTANCE,
        /** Dissipation factor. */
        SR_MQ_DISSIPATION_FACTOR,
        /** Quality factor. */

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 40fad3f6c85575b234e0ad6789ff239f4f86902c..a99db214f91a5e014ac84a58718f924b633b7883 100644 (file)
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -415,15 +415,15 @@ static int parse_mq(const uint8_t *buf, int is_secondary, int is_parallel)
 {
        switch (is_secondary << 8 | buf[0]) {
        case 0x001:
-               return is_parallel ?
-                       SR_MQ_PARALLEL_INDUCTANCE : SR_MQ_SERIAL_INDUCTANCE;
+               return is_parallel ?
+                       SR_MQ_PARALLEL_INDUCTANCE : SR_MQ_SERIES_INDUCTANCE;
        case 0x002:
                return is_parallel ?
-                       SR_MQ_PARALLEL_CAPACITANCE : SR_MQ_SERIAL_CAPACITANCE;
+                       SR_MQ_PARALLEL_CAPACITANCE : SR_MQ_SERIES_CAPACITANCE;
        case 0x003:
        case 0x103:
                return is_parallel ?
-                       SR_MQ_PARALLEL_RESISTANCE : SR_MQ_SERIAL_RESISTANCE;
+                       SR_MQ_PARALLEL_RESISTANCE : SR_MQ_SERIES_RESISTANCE;
        case 0x004:
                return SR_MQ_RESISTANCE;
        case 0x100: