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

Rename "SERIAL" -> "SERIES". 

Use the more correct term "SERIES" for the corresponding equivalent
circuit model.
This commit is contained in:
Janne Huttunen 2014-10-13 18:56:16 +03:00 committed by Uwe Hermann
parent 34d117afb4
commit c7c8994c20
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/libsigrok/libsigrok.h
View File

@ -207,12 +207,12 @@ enum sr_mq {
SR_MQ_PARALLEL_CAPACITANCE, SR_MQ_PARALLEL_CAPACITANCE,
/** Parallel resistance (LCR meter model). */ /** Parallel resistance (LCR meter model). */
SR_MQ_PARALLEL_RESISTANCE, SR_MQ_PARALLEL_RESISTANCE,
/** Serial inductance (LCR meter model). */ /** Series inductance (LCR meter model). */
SR_MQ_SERIAL_INDUCTANCE, SR_MQ_SERIES_INDUCTANCE,
/** Serial capacitance (LCR meter model). */ /** Series capacitance (LCR meter model). */
SR_MQ_SERIAL_CAPACITANCE, SR_MQ_SERIES_CAPACITANCE,
/** Serial resistance (LCR meter model). */ /** Series resistance (LCR meter model). */
SR_MQ_SERIAL_RESISTANCE, SR_MQ_SERIES_RESISTANCE,
/** Dissipation factor. */ /** Dissipation factor. */
SR_MQ_DISSIPATION_FACTOR, SR_MQ_DISSIPATION_FACTOR,
/** Quality factor. */ /** Quality factor. */

6
src/lcr/es51919.c
View File

@ -416,14 +416,14 @@ static int parse_mq(const uint8_t *buf, int is_secondary, int is_parallel)
switch (is_secondary << 8 | buf[0]) { switch (is_secondary << 8 | buf[0]) {
case 0x001: case 0x001:
return is_parallel ? return is_parallel ?
SR_MQ_PARALLEL_INDUCTANCE : SR_MQ_SERIAL_INDUCTANCE; SR_MQ_PARALLEL_INDUCTANCE : SR_MQ_SERIES_INDUCTANCE;
case 0x002: case 0x002:
return is_parallel ? return is_parallel ?
SR_MQ_PARALLEL_CAPACITANCE : SR_MQ_SERIAL_CAPACITANCE; SR_MQ_PARALLEL_CAPACITANCE : SR_MQ_SERIES_CAPACITANCE;
case 0x003: case 0x003:
case 0x103: case 0x103:
return is_parallel ? return is_parallel ?
SR_MQ_PARALLEL_RESISTANCE : SR_MQ_SERIAL_RESISTANCE; SR_MQ_PARALLEL_RESISTANCE : SR_MQ_SERIES_RESISTANCE;
case 0x004: case 0x004:
return SR_MQ_RESISTANCE; return SR_MQ_RESISTANCE;
case 0x100: case 0x100: