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

analog.c: Fix key order, add missing items.

This commit is contained in:
Uwe Hermann 2015-08-28 14:25:24 +02:00
parent c984f2f997
commit f7bcc68604
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/analog.c
View File

@ -52,16 +52,17 @@ static struct unit_mq_string unit_strings[] = {
{ SR_UNIT_AMPERE, "A" },
{ SR_UNIT_OHM, "\xe2\x84\xa6" },
{ SR_UNIT_FARAD, "F" },
{ SR_UNIT_HENRY, "H" },
{ SR_UNIT_KELVIN, "K" },
{ SR_UNIT_CELSIUS, "\xc2\xb0""C" },
{ SR_UNIT_FAHRENHEIT, "\xc2\xb0""F" },
{ SR_UNIT_HERTZ, "Hz" },
{ SR_UNIT_PERCENTAGE, "%" },
{ SR_UNIT_BOOLEAN, "" },
{ SR_UNIT_SECOND, "s" },
{ SR_UNIT_SIEMENS, "S" },
{ SR_UNIT_DECIBEL_MW, "dBu" },
{ SR_UNIT_DECIBEL_VOLT, "dBv" },
{ SR_UNIT_UNITLESS, "" },
{ SR_UNIT_DECIBEL_SPL, "dB" },
{ SR_UNIT_CONCENTRATION, "ppm" },
{ SR_UNIT_REVOLUTIONS_PER_MINUTE, "RPM" },
@ -72,19 +73,22 @@ static struct unit_mq_string unit_strings[] = {
{ SR_UNIT_HECTOPASCAL, "hPa" },
{ SR_UNIT_HUMIDITY_293K, "%rF" },
{ SR_UNIT_DEGREE, "\xc2\xb0" },
{ SR_UNIT_HENRY, "H" },
{ SR_UNIT_GRAM, "g" },
{ SR_UNIT_CARAT, "ct" },
{ SR_UNIT_OUNCE, "oz" },
{ SR_UNIT_TROY_OUNCE, "oz t" },
{ SR_UNIT_POUND, "lb" },
{ SR_UNIT_PENNYWEIGHT, "dwt" },
{ SR_UNIT_GRAIN, "gr" },
{ SR_UNIT_TAEL, "tael" },
{ SR_UNIT_MOMME, "momme" },
{ SR_UNIT_TOLA, "tola" },
{ SR_UNIT_PIECE, "pcs" },
ALL_ZERO
};
static struct unit_mq_string mq_strings[] = {
{ SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
{ SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
{ SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
{ SR_MQFLAG_SPL_LAT, " LAT" },
/* Not a standard function for SLMs, so this is a made-up notation. */
{ SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
{ SR_MQFLAG_AC, " AC" },
{ SR_MQFLAG_DC, " DC" },
{ SR_MQFLAG_RMS, " RMS" },
@ -94,8 +98,19 @@ static struct unit_mq_string mq_strings[] = {
{ SR_MQFLAG_MIN, " MIN" },
{ SR_MQFLAG_AUTORANGE, " AUTO" },
{ SR_MQFLAG_RELATIVE, " REL" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
{ SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
{ SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
{ SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
{ SR_MQFLAG_SPL_LAT, " LAT" },
/* Not a standard function for SLMs, so this is a made-up notation. */
{ SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
{ SR_MQFLAG_DURATION, " DURATION" },
{ SR_MQFLAG_AVG, " AVG" },
{ SR_MQFLAG_REFERENCE, " REF" },
{ SR_MQFLAG_UNSTABLE, " UNSTABLE" },
ALL_ZERO
};