#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"
if (!o || !o->sdi)
return SR_ERR_ARG;
- o->priv = ctx = g_try_malloc0(sizeof(struct context));
+ o->priv = ctx = g_malloc0(sizeof(struct context));
s = g_variant_get_string(g_hash_table_lookup(options, "digits"), NULL);
if (!strcmp(s, "all"))
ctx->digits = DIGITS_ALL;
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_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;
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');
}
float *fdata;
unsigned int i;
int num_channels, c, ret, si, digits;
- char number[32], suffix[32];
+ char *number, *suffix;
*out = NULL;
if (!o || !o->sdi)
/* TODO we don't know how to print by number of bits yet. */
digits = 6;
}
- sr_analog_unit_to_string(analog2, suffix, sizeof(suffix));
+ sr_analog_unit_to_string(analog2, &suffix);
num_channels = g_slist_length(analog2->meaning->channels);
for (i = 0; i < analog2->num_samples; i++) {
for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
sr_analog_float_to_string(fdata[i * num_channels + c],
- digits, number, sizeof(number));
+ digits, &number);
g_string_append(*out, number);
+ g_free(number);
g_string_append(*out, " ");
g_string_append(*out, suffix);
g_string_append(*out, "\n");
}
}
+ g_free(suffix);
break;
}
.id = "analog",
.name = "Analog",
.desc = "Analog data and types",
+ .exts = NULL,
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,