extern struct sr_hwcap_option sr_hwcap_options[];
static uint64_t limit_samples = 0;
+static uint64_t limit_frames = 0;
static struct sr_output_format *output_format = NULL;
static int default_output_format = FALSE;
static char *output_format_param = NULL;
static gchar *opt_output_format = NULL;
static gchar *opt_time = NULL;
static gchar *opt_samples = NULL;
+static gchar *opt_frames = NULL;
static gchar *opt_continuous = NULL;
static GOptionEntry optargs[] = {
"How long to sample (ms)", NULL},
{"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples,
"Number of samples to acquire", NULL},
+ {"frames", 0, 0, G_OPTION_ARG_STRING, &opt_frames,
+ "Number of frames to acquire", NULL},
{"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous,
"Sample continuously", NULL},
{NULL, 0, 0, 0, NULL, NULL, NULL}
static void show_dev_detail(void)
{
struct sr_dev *dev;
- struct sr_hwcap_option *hwo;
+ const struct sr_hwcap_option *hwo;
const struct sr_samplerates *samplerates;
- int cap, *hwcaps, i;
+ struct sr_rational *rationals;
+ uint64_t *integers;
+ const int *hwcaps;
+ int cap, i;
char *s, *title;
const char *charopts, **stropts;
}
if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
+ /* Pattern generator modes */
printf(" %s", hwo->shortname);
if (sr_dev_info_get(dev, SR_DI_PATTERNS,
(const void **)&stropts) == SR_OK) {
} else {
printf("\n");
}
+
} else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
- printf(" %s", hwo->shortname);
/* Supported samplerates */
+ printf(" %s", hwo->shortname);
if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
(const void **)&samplerates) != SR_OK) {
printf("\n");
continue;
}
-
if (samplerates->step) {
/* low */
if (!(s = sr_samplerate_string(samplerates->low)))
g_free(s);
} else {
printf(" - supported samplerates:\n");
- for (i = 0; samplerates->list[i]; i++) {
+ for (i = 0; samplerates->list[i]; i++)
printf(" %s\n", sr_samplerate_string(samplerates->list[i]));
- }
}
+
+ } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+ /* Supported buffer sizes */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_BUFFERSIZES,
+ (const void **)&integers) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported buffer sizes:\n");
+ for (i = 0; integers[i]; i++)
+ printf(" %"PRIu64"\n", integers[i]);
+
+ } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+ /* Supported time bases */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_TIMEBASES,
+ (const void **)&rationals) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported time bases:\n");
+ for (i = 0; rationals[i].p && rationals[i].q; i++)
+ printf(" %s\n", sr_period_string(
+ rationals[i].p * rationals[i].q));
+
+ } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+ /* Supported trigger sources */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_TRIGGER_SOURCES,
+ (const void **)&stropts) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported trigger sources:\n");
+ for (i = 0; stropts[i]; i++)
+ printf(" %s\n", stropts[i]);
+
+ } else if (hwo->hwcap == SR_HWCAP_FILTER) {
+ /* Supported trigger sources */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_FILTERS,
+ (const void **)&stropts) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported filter targets:\n");
+ for (i = 0; stropts[i]; i++)
+ printf(" %s\n", stropts[i]);
+
+ } else if (hwo->hwcap == SR_HWCAP_VDIV) {
+ /* Supported volts/div values */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_VDIVS,
+ (const void **)&rationals) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported volts/div:\n");
+ for (i = 0; rationals[i].p && rationals[i].q; i++)
+ printf(" %s\n", sr_voltage_string( &rationals[i]));
+
+ } else if (hwo->hwcap == SR_HWCAP_COUPLING) {
+ /* Supported coupling settings */
+ printf(" %s", hwo->shortname);
+ if (sr_dev_info_get(dev, SR_DI_COUPLING,
+ (const void **)&stropts) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported coupling options:\n");
+ for (i = 0; stropts[i]; i++)
+ printf(" %s\n", stropts[i]);
+
} else {
+ /* Everything else */
printf(" %s\n", hwo->shortname);
}
}
{
static struct sr_output *o = NULL;
static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
- static int analog_probelist[SR_MAX_NUM_PROBES] = { 0 };
+ static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
static uint64_t received_samples = 0;
static int unitsize = 0;
static int triggered = 0;
static FILE *outfile = NULL;
static int num_analog_probes = 0;
struct sr_probe *probe;
- struct sr_datafeed_header *header;
struct sr_datafeed_logic *logic;
struct sr_datafeed_meta_logic *meta_logic;
struct sr_datafeed_analog *analog;
struct sr_datafeed_meta_analog *meta_analog;
+ static int num_enabled_analog_probes = 0;
int num_enabled_probes, sample_size, ret, i;
uint64_t output_len, filter_out_len;
uint8_t *output_buf, *filter_out;
- float asample1, asample2;
/* If the first packet to come in isn't a header, don't even try. */
if (packet->type != SR_DF_HEADER && o == NULL)
}
if (o->format->event) {
o->format->event(o, SR_DF_END, &output_buf, &output_len);
- if (output_len) {
+ if (output_buf) {
if (outfile)
fwrite(output_buf, 1, output_len, outfile);
g_free(output_buf);
output_len = 0;
if (o->format->data && packet->type == o->format->df_type)
o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
- if (output_len) {
+ if (output_buf) {
fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
g_free(output_buf);
}
}
g_message("cli: Received SR_DF_META_ANALOG");
meta_analog = packet->payload;
num_analog_probes = meta_analog->num_probes;
- num_enabled_probes = 0;
+ num_enabled_analog_probes = 0;
for (i = 0; i < num_analog_probes; i++) {
probe = g_slist_nth_data(dev->probes, i);
if (probe->enabled)
- analog_probelist[num_enabled_probes++] = probe->index;
+ analog_probelist[num_enabled_analog_probes++] = probe;
}
outfile = stdout;
outfile = g_fopen(opt_output_file, "wb");
}
}
-// if (opt_pds)
-// srd_session_start(num_enabled_probes, unitsize,
-// meta_logic->samplerate);
break;
case SR_DF_ANALOG:
if (limit_samples && received_samples >= limit_samples)
break;
- for (i = 0; i < analog->num_samples; i++) {
- asample1 = analog->data[i * num_analog_probes];
- asample2 = analog->data[i * num_analog_probes + 1];
- printf("CH1 %f CH2 %f\n", asample1, asample2);
-// write(STDOUT_FILENO, &asample1, sizeof(float));
+ if (o->format->data && packet->type == o->format->df_type) {
+ o->format->data(o, (const uint8_t *)analog->data,
+ analog->num_samples * sizeof(float),
+ &output_buf, &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
}
-// output_len = 0;
-// if (o->format->data && packet->type == o->format->df_type)
-// o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
-
received_samples += analog->num_samples;
+ break;
+
+ case SR_DF_FRAME_BEGIN:
+ g_debug("cli: received SR_DF_FRAME_BEGIN");
+ if (o->format->event) {
+ o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
+ &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
+ }
+ break;
+
+ case SR_DF_FRAME_END:
+ g_debug("cli: received SR_DF_FRAME_END");
+ if (o->format->event) {
+ o->format->event(o, SR_DF_FRAME_END, &output_buf,
+ &output_len);
+ if (output_buf) {
+ fwrite(output_buf, 1, output_len, outfile);
+ fflush(outfile);
+ g_free(output_buf);
+ }
+ }
+ break;
default:
g_message("received unknown packet type %d", packet->type);
{
struct srd_decoder_inst *di_from, *di_to;
int ret, i;
- char **pds;
+ char **pds, **ids;
/* Set up the protocol decoder stack. */
pds = g_strsplit(opt_pds, ",", 0);
}
}
- if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+ /* First PD goes at the bottom of the stack. */
+ ids = g_strsplit(pds[0], ":", 0);
+ if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+ g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[0]);
return 1;
}
+ g_strfreev(ids);
+
+ /* Every subsequent PD goes on top. */
for (i = 1; pds[i]; i++) {
- if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+ ids = g_strsplit(pds[i], ":", 0);
+ if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+ g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[i]);
return 1;
}
+ g_strfreev(ids);
if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
return 1;
*/
default_output_format = TRUE;
}
+
fmtargs = parse_generic_arg(opt_output_format);
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec) {
for (i = 0; annotations[i]; i++)
printf("\"%s\" ", annotations[i]);
printf("\n");
+ fflush(stdout);
}
static int select_probes(struct sr_dev *dev)
GHashTableIter iter;
gpointer key, value;
int ret, i;
+ float tmp_float;
uint64_t tmp_u64;
- gboolean found;
+ struct sr_rational tmp_rat;
gboolean tmp_bool;
+ gboolean found;
g_hash_table_iter_init(&iter, args);
while (g_hash_table_iter_next(&iter, &key, &value)) {
sr_hwcap_options[i].hwcap,
GINT_TO_POINTER(tmp_bool));
break;
+ case SR_T_FLOAT:
+ tmp_float = strtof(value, NULL);
+ ret = dev->driver->dev_config_set(dev->driver_index,
+ sr_hwcap_options[i].hwcap, &tmp_float);
+ break;
+ case SR_T_RATIONAL_PERIOD:
+ if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
+ break;
+ ret = dev->driver->dev_config_set(dev->driver_index,
+ sr_hwcap_options[i].hwcap, &tmp_rat);
+ break;
+ case SR_T_RATIONAL_VOLT:
+ if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
+ break;
+ ret = dev->driver->dev_config_set(dev->driver_index,
+ sr_hwcap_options[i].hwcap, &tmp_rat);
+ break;
default:
ret = SR_ERR;
}
}
}
+ if (opt_frames) {
+ if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
+ || (dev->driver->dev_config_set(dev->driver_index,
+ SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+ printf("Failed to configure frame limit.\n");
+ sr_session_destroy();
+ return;
+ }
+ }
+
if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
g_critical("Failed to configure probes.");
show_dev_list();
else if (opt_input_file)
load_input_file();
- else if (opt_samples || opt_time || opt_continuous)
+ else if (opt_samples || opt_time || opt_frames || opt_continuous)
run_session();
else if (opt_dev)
show_dev_detail();
projects / sigrok-cli.git / blobdiff