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

output/analog: Fix key order, add missing items.

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

12
src/output/analog.c
View File

@ -111,9 +111,6 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
case SR_UNIT_FARAD: case SR_UNIT_FARAD:
si_printf(value, out, "F"); si_printf(value, out, "F");
break; break;
case SR_UNIT_HENRY:
si_printf(value, out, "H");
break;
case SR_UNIT_KELVIN: case SR_UNIT_KELVIN:
si_printf(value, out, "K"); si_printf(value, out, "K");
break; break;
@ -151,6 +148,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
case SR_UNIT_DECIBEL_VOLT: case SR_UNIT_DECIBEL_VOLT:
si_printf(value, out, "dBV"); si_printf(value, out, "dBV");
break; break;
case SR_UNIT_UNITLESS:
si_printf(value, out, "");
break;
case SR_UNIT_DECIBEL_SPL: case SR_UNIT_DECIBEL_SPL:
if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A) if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
si_printf(value, out, "dB(A)"); si_printf(value, out, "dB(A)");
@ -200,6 +200,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
si_printf(value, out, ""); si_printf(value, out, "");
g_string_append_unichar(out, 0x00b0); g_string_append_unichar(out, 0x00b0);
break; break;
case SR_UNIT_HENRY:
si_printf(value, out, "H");
break;
case SR_UNIT_GRAM: case SR_UNIT_GRAM:
si_printf(value, out, "g"); si_printf(value, out, "g");
break; break;
@ -256,6 +259,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
g_string_append_printf(out, " AUTO"); g_string_append_printf(out, " AUTO");
if (mqflags & SR_MQFLAG_RELATIVE) if (mqflags & SR_MQFLAG_RELATIVE)
g_string_append_printf(out, " REL"); g_string_append_printf(out, " REL");
/* Note: SR_MQFLAG_SPL_* is handled above. */
if (mqflags & SR_MQFLAG_DURATION)
g_string_append_printf(out, " DURATION");
if (mqflags & SR_MQFLAG_AVG) if (mqflags & SR_MQFLAG_AVG)
g_string_append_printf(out, " AVG"); g_string_append_printf(out, " AVG");
if (mqflags & SR_MQFLAG_REFERENCE) if (mqflags & SR_MQFLAG_REFERENCE)