X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=fbc41d88ffa9e52e1f010fcd705aeca52b203f16;hb=f774095496a5ab9b68ce79503ae7d45f717c0006;hp=131e24c487bfee8177a3cd6c24759178ef4da4df;hpb=44559b2c3bfa2c892242097e3aba871a11f943eb;p=libsigrok.git diff --git a/output/analog.c b/output/analog.c index 131e24c4..fbc41d88 100644 --- a/output/analog.c +++ b/output/analog.c @@ -178,6 +178,15 @@ static void fancyprint(int unit, int mqflags, float value, GString *out) case SR_UNIT_WATT_HOUR: si_printf(value, out, "Wh"); break; + case SR_UNIT_METER_SECOND: + si_printf(value, out, "m/s"); + break; + case SR_UNIT_HECTOPASCAL: + si_printf(value, out, "hPa"); + break; + case SR_UNIT_HUMIDITY_293K: + si_printf(value, out, "%rF"); + break; default: si_printf(value, out, ""); break; @@ -206,8 +215,8 @@ static void fancyprint(int unit, int mqflags, float value, GString *out) g_string_append_c(out, '\n'); } -static int receive(struct sr_output *o, const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet, GString **out) +static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet, + GString **out) { const struct sr_datafeed_analog *analog; struct sr_channel *ch; @@ -215,8 +224,6 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi, const float *fdata; int i, p; - (void)sdi; - *out = NULL; if (!o || !o->sdi) return SR_ERR_ARG;