*
* Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
* Copyright (C) 2011 Håvard Espeland <gus@ping.uio.no>
+ * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
uint8_t *linevalues;
char *header;
int mark_trigger;
- uint64_t prevsample;
+// struct analog_sample *prevsample;
enum outputmode mode;
};
memset(ctx->linebuf, 0, i * ctx->linebuf_len);
}
-static int init(struct output *o, int default_spl, enum outputmode mode)
+static int init(struct sr_output *o, int default_spl, enum outputmode mode)
{
struct context *ctx;
struct probe *probe;
char *samplerate_s;
if (!(ctx = calloc(1, sizeof(struct context))))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
o->internal = ctx;
ctx->num_enabled_probes = 0;
}
ctx->probelist[ctx->num_enabled_probes] = 0;
- ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
+ ctx->unitsize = sizeof(struct analog_sample) +
+ (ctx->num_enabled_probes * sizeof(struct analog_probe));
ctx->line_offset = 0;
ctx->spl_cnt = 0;
ctx->mark_trigger = -1;
if (o->param && o->param[0]) {
ctx->samples_per_line = strtoul(o->param, NULL, 10);
if (ctx->samples_per_line < 1)
- return SIGROK_ERR;
+ return SR_ERR;
} else
ctx->samples_per_line = default_spl;
if (!(ctx->header = malloc(512))) {
free(ctx);
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
}
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR;
+ return SR_ERR;
}
snprintf(ctx->header + strlen(ctx->header),
511 - strlen(ctx->header),
if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
}
if (!(ctx->linevalues = calloc(1, num_probes))) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
}
- return SIGROK_OK;
+ return SR_OK;
}
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
uint64_t *length_out)
{
struct context *ctx;
outsize = ctx->num_enabled_probes
* (ctx->samples_per_line + 20) + 512;
if (!(outbuf = calloc(1, outsize)))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
flush_linebufs(ctx, outbuf);
*data_out = outbuf;
*length_out = strlen(outbuf);
break;
}
- return SIGROK_OK;
+ return SR_OK;
}
-static int init_bits(struct output *o)
+static int init_bits(struct sr_output *o)
{
return init(o, DEFAULT_BPL_BITS, MODE_BITS);
}
-static int data_bits(struct output *o, char *data_in, uint64_t length_in,
+static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
int max_linelen;
- uint64_t sample;
+ struct analog_sample *sample;
char *outbuf, c;
ctx = o->internal;
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
outbuf[0] = '\0';
if (ctx->header) {
ctx->header = NULL;
/* Ensure first transition. */
- memcpy(&ctx->prevsample, data_in, ctx->unitsize);
- ctx->prevsample = ~ctx->prevsample;
+// memcpy(&ctx->prevsample, data_in, ctx->unitsize);
+// ctx->prevsample = ~ctx->prevsample;
}
if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) {
- memcpy(&sample, data_in + offset, ctx->unitsize);
+ sample = (struct analog_sample *) (data_in + offset);
for (p = 0; p < ctx->num_enabled_probes; p++) {
- c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+ int val = sample->probes[p].val;
+ int res = sample->probes[p].res;
+ if (res == 1)
+ c = '0' + (val & ((1 << res) - 1));
+ else
+ /*
+ * Scale analog resolution down so it
+ * fits 25 letters
+ */
+ c = 'A' + (((val & ((1 << res) - 1)) /
+ (res * res)) / 10);
ctx->linebuf[p * ctx->linebuf_len +
ctx->line_offset] = c;
}
*data_out = outbuf;
*length_out = strlen(outbuf);
- return SIGROK_OK;
+ return SR_OK;
}
-
-static int init_hex(struct output *o)
+#if 0
+static int init_hex(struct sr_output *o)
{
return init(o, DEFAULT_BPL_HEX, MODE_HEX);
}
-static int data_hex(struct output *o, char *data_in, uint64_t length_in,
+static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out)
{
struct context *ctx;
/ ctx->samples_per_line * max_linelen + 512;
if (!(outbuf = calloc(1, outsize + 1)))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
outbuf[0] = '\0';
if (ctx->header) {
*data_out = outbuf;
*length_out = strlen(outbuf);
- return SIGROK_OK;
+ return SR_OK;
}
-static int init_ascii(struct output *o)
+static int init_ascii(struct sr_output *o)
{
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
+static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out)
{
struct context *ctx;
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
outbuf[0] = '\0';
if (ctx->header) {
*data_out = outbuf;
*length_out = strlen(outbuf);
- return SIGROK_OK;
+ return SR_OK;
}
+#endif
-
-struct output_format output_text_bits = {
- "bits",
+struct sr_output_format output_analog_bits = {
+ "analog_bits",
"Bits (takes argument, default 64)",
- DF_LOGIC,
+ DF_ANALOG,
init_bits,
data_bits,
event,
};
-
-struct output_format output_text_hex = {
- "hex",
+#if 0
+struct sr_output_format output_analog_hex = {
+ "analog_hex",
"Hexadecimal (takes argument, default 192)",
- DF_LOGIC,
+ DF_ANALOG,
init_hex,
data_hex,
event,
};
-struct output_format output_text_ascii = {
- "ascii",
+struct sr_output_format output_analog_ascii = {
+ "analog_ascii",
"ASCII (takes argument, default 74)",
- DF_LOGIC,
+ DF_ANALOG,
init_ascii,
data_ascii,
event,
};
+#endif
projects / libsigrok.git / blobdiff