#include <string.h>
#include <math.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/analog"
}
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
static void fancyprint(int unit, int mqflags, float value, GString *out)
{
switch (unit) {
case SR_UNIT_FARAD:
si_printf(value, out, "F");
break;
- case SR_UNIT_HENRY:
- si_printf(value, out, "H");
- break;
case SR_UNIT_KELVIN:
si_printf(value, out, "K");
break;
case SR_UNIT_DECIBEL_VOLT:
si_printf(value, out, "dBV");
break;
+ case SR_UNIT_UNITLESS:
+ si_printf(value, out, "");
+ break;
case SR_UNIT_DECIBEL_SPL:
if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
si_printf(value, out, "dB(A)");
g_string_append(out, " %oA");
break;
case SR_UNIT_CONCENTRATION:
- g_string_append_printf(out, "%f ppm", value * 1000000);
+ g_string_append_printf(out, "%f ppm", value * (1000 * 1000));
break;
case SR_UNIT_REVOLUTIONS_PER_MINUTE:
si_printf(value, out, "RPM");
si_printf(value, out, "");
g_string_append_unichar(out, 0x00b0);
break;
+ case SR_UNIT_HENRY:
+ si_printf(value, out, "H");
+ break;
+ case SR_UNIT_GRAM:
+ si_printf(value, out, "g");
+ break;
+ case SR_UNIT_CARAT:
+ si_printf(value, out, "ct");
+ break;
+ case SR_UNIT_OUNCE:
+ si_printf(value, out, "oz");
+ break;
+ case SR_UNIT_TROY_OUNCE:
+ si_printf(value, out, "oz t");
+ break;
+ case SR_UNIT_POUND:
+ si_printf(value, out, "lb");
+ break;
+ case SR_UNIT_PENNYWEIGHT:
+ si_printf(value, out, "dwt");
+ break;
+ case SR_UNIT_GRAIN:
+ si_printf(value, out, "gr");
+ break;
+ case SR_UNIT_TAEL:
+ si_printf(value, out, "tael");
+ break;
+ case SR_UNIT_MOMME:
+ si_printf(value, out, "momme");
+ break;
+ case SR_UNIT_TOLA:
+ si_printf(value, out, "tola");
+ break;
+ case SR_UNIT_PIECE:
+ si_printf(value, out, "pcs");
+ break;
default:
si_printf(value, out, "");
break;
}
+ /* Please use the same order as in enum sr_mqflag (libsigrok.h). */
if (mqflags & SR_MQFLAG_AC)
g_string_append_printf(out, " AC");
if (mqflags & SR_MQFLAG_DC)
g_string_append_printf(out, " AUTO");
if (mqflags & SR_MQFLAG_RELATIVE)
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)
g_string_append_printf(out, " AVG");
if (mqflags & SR_MQFLAG_REFERENCE)
g_string_append_printf(out, " REF");
+ if (mqflags & SR_MQFLAG_UNSTABLE)
+ g_string_append_printf(out, " UNSTABLE");
g_string_append_c(out, '\n');
}
.id = "analog",
.name = "Analog",
.desc = "Analog data and types",
+ .exts = NULL,
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,