X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=776f29549074dcbae0a23188ef53ce92b40b28c7;hb=8c012adbc15fcb00aee23f472b08b108d46b818b;hp=4ae8550fb112265b6e59f315e7f1efee4849b0e1;hpb=161a8a272699a7b818ddab01043838f07d7cf6eb;p=libsigrok.git diff --git a/output/analog.c b/output/analog.c index 4ae8550f..776f2954 100644 --- a/output/analog.c +++ b/output/analog.c @@ -19,11 +19,19 @@ #include #include +#include #include -#include "config.h" #include "libsigrok.h" #include "libsigrok-internal.h" -#include + +/* Message logging helpers with driver-specific prefix string. */ +#define DRIVER_LOG_DOMAIN "output/analog: " +#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) +#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) +#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) +#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) +#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) +#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) struct context { int num_enabled_probes; @@ -31,19 +39,21 @@ struct context { GString *out; }; - static int init(struct sr_output *o) { struct context *ctx; struct sr_probe *probe; GSList *l; - sr_spew("output/analog: initializing"); + sr_spew("Initializing output module."); + if (!o || !o->sdi) return SR_ERR_ARG; - if (!(ctx = g_try_malloc0(sizeof(struct context)))) + if (!(ctx = g_try_malloc0(sizeof(struct context)))) { + sr_err("Output module context malloc failed."); return SR_ERR_MALLOC; + } o->internal = ctx; /* Get the number of probes and their names. */ @@ -63,21 +73,27 @@ static int init(struct sr_output *o) static void si_printf(float value, GString *out, char *unitstr) { + float v; - if (value > 1000000000L) - g_string_append_printf(out, "%f G%s", value / 1000000000L, unitstr); - else if (value > 1000000) - g_string_append_printf(out, "%f M%s", value / 1000000, unitstr); - else if (value > 1000) - g_string_append_printf(out, "%f k%s", value / 1000, unitstr); - else if (value < 0.000000000001) - g_string_append_printf(out, "%f p%s", value * 1000000000000, unitstr); - else if (value < 0.000000001) - g_string_append_printf(out, "%f n%s", value * 1000000000, unitstr); - else if (value < 0.000001) - g_string_append_printf(out, "%f u%s", value * 1000000, unitstr); - else if (value < 0.001) - g_string_append_printf(out, "%f m%s", value * 1000, unitstr); + if (signbit(value)) + v = -(value); + else + v = value; + + if (v < 1e-12 || v > 1e+12) + g_string_append_printf(out, "%f %s", value, unitstr); + else if (v > 1e+9) + g_string_append_printf(out, "%f G%s", value / 1e+9, unitstr); + else if (v > 1e+6) + g_string_append_printf(out, "%f M%s", value / 1e+6, unitstr); + else if (v > 1e+3) + g_string_append_printf(out, "%f k%s", value / 1e+3, unitstr); + else if (v < 1e-9) + g_string_append_printf(out, "%f n%s", value * 1e+9, unitstr); + else if (v < 1e-6) + g_string_append_printf(out, "%f u%s", value * 1e+6, unitstr); + else if (v < 1e-3) + g_string_append_printf(out, "%f m%s", value * 1e+3, unitstr); else g_string_append_printf(out, "%f %s", value, unitstr); @@ -85,7 +101,6 @@ static void si_printf(float value, GString *out, char *unitstr) static void fancyprint(int unit, int mqflags, float value, GString *out) { - switch (unit) { case SR_UNIT_VOLT: si_printf(value, out, "V"); @@ -125,16 +140,52 @@ static void fancyprint(int unit, int mqflags, float value, GString *out) else g_string_append_printf(out, "FALSE"); break; + case SR_UNIT_SECOND: + si_printf(value, out, "s"); + break; + case SR_UNIT_SIEMENS: + si_printf(value, out, "S"); + break; + case SR_UNIT_DECIBEL_MW: + si_printf(value, out, "dBu"); + break; + case SR_UNIT_DECIBEL_VOLT: + si_printf(value, out, "dBV"); + break; + case SR_UNIT_DECIBEL_SPL: + if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A) + si_printf(value, out, "dB(A)"); + else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_C) + si_printf(value, out, "dB(C)"); + else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_Z) + si_printf(value, out, "dB(Z)"); + else + /* No frequency weighting, or non-standard "flat" */ + si_printf(value, out, "dB(SPL)"); + if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_S) + g_string_append(out, " S"); + else if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_F) + g_string_append(out, " F"); + if (mqflags & SR_MQFLAG_SPL_LAT) + g_string_append(out, " LAT"); + else if (mqflags & SR_MQFLAG_SPL_PCT_OVER_ALARM) + /* Not a standard function for SLMs, so this is + * a made-up notation. */ + g_string_append(out, " %oA"); + break; + default: + si_printf(value, out, ""); } - if (mqflags & SR_MQFLAG_AC) + if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC)) + g_string_append_printf(out, " AC+DC"); + else if (mqflags & SR_MQFLAG_AC) g_string_append_printf(out, " AC"); else if (mqflags & SR_MQFLAG_DC) g_string_append_printf(out, " DC"); g_string_append_c(out, '\n'); - } -static GString *recv(struct sr_output *o, const struct sr_dev_inst *sdi, +static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi, struct sr_datafeed_packet *packet) { struct sr_datafeed_analog *analog; @@ -142,6 +193,8 @@ static GString *recv(struct sr_output *o, const struct sr_dev_inst *sdi, float *fdata; int i, j; + (void)sdi; + if (!o || !o->sdi) return NULL; ctx = o->internal; @@ -189,12 +242,11 @@ static int cleanup(struct sr_output *o) return SR_OK; } - SR_PRIV struct sr_output_format output_analog = { .id = "analog", .description = "Analog data", .df_type = SR_DF_ANALOG, .init = init, - .recv = recv, + .recv = receive, .cleanup = cleanup };