Skip to content

Fix bug #1331, fix memory leaks, support Volts/div units, sort channels by type, do not show all read capabilities, parse SCPI commands #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gtrentalancia wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix bug #1331, fix memory leaks, support Volts/div units, sort channels by type, do not show all read capabilities, parse SCPI commands #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c388dc5
The listing of the following configuration options is currently
gtrentalancia Nov 18, 2018
c2fc81f
Add missing function calls to free the memory used by the GVariant
gtrentalancia Nov 18, 2018
490c9f4
Support printing Volts per division (V/div) units (used for
gtrentalancia Nov 21, 2018
ac9b02c
Sort channels by type and not only by index.
gtrentalancia Dec 13, 2018
6366add
Do not show all capabilities that can be read.
gtrentalancia Dec 16, 2018
e212d53
Support parsing SCPI commands in sigrok-cli.
gtrentalancia Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,21 @@ int select_channels(struct sr_dev_inst *sdi)
int maybe_config_get(struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
uint32_t key, GVariant **gvar)
{
if (sr_dev_config_capabilities_list(sdi, cg, key) & SR_CONF_GET_MASK)
return sr_config_get(driver, sdi, cg, key, gvar);

return SR_ERR_NA;
}

/*
* Same as maybe_config_get(), but strictly for capabilities that can
* be only read. Automatic Measurements for example, should not be
* normally listed, so they are skipped by this function.
*/
int maybe_config_get_and_show(struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
uint32_t key, GVariant **gvar)
{
if (sr_dev_config_capabilities_list(sdi, cg, key) & SR_CONF_GET)
return sr_config_get(driver, sdi, cg, key, gvar);
Expand Down
10 changes: 9 additions & 1 deletion parsers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,22 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
GHashTable *hash;
int i;
char **elements, *e;
const struct sr_key_info *info;

if (!arg || !arg[0])
return NULL;

i = 0;
hash = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, g_free);
elements = g_strsplit(arg, ":", 0);

/* In the SCPI command syntax the ":" character is reserved. */
info = sr_key_info_get(SR_KEY_CONFIG, SR_CONF_CUSTOM_CMD);
if (info && !strncmp(info->id, arg, strlen(info->id))) {
elements = g_strsplit(arg, "\n", 1);
} else {
elements = g_strsplit(arg, ":", 0);
}
if (sep_first)
g_hash_table_insert(hash, g_strdup("sigrok_key"),
g_strdup(elements[i++]));
Expand Down
53 changes: 40 additions & 13 deletions show.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,26 @@ static gint sort_channels(gconstpointer a, gconstpointer b)
{
const struct sr_channel *pa = a, *pb = b;

return pa->index - pb->index;
if (pa->type == pb->type)
return pa->index - pb->index;

/*
* Sort analog channels before digital channels and
* digital channels before special FFT channels.
*/
if (pa->type == SR_CHANNEL_ANALOG)
return -1;

if (pb->type == SR_CHANNEL_ANALOG)
return 1;

if (pa->type == SR_CHANNEL_LOGIC)
return -1;

if (pb->type == SR_CHANNEL_LOGIC)
return 1;

return 0;
}

static void print_dev_line(const struct sr_dev_inst *sdi)
Expand All @@ -228,7 +247,7 @@ static void print_dev_line(const struct sr_dev_inst *sdi)

s = g_string_sized_new(128);
g_string_assign(s, driver->name);
if (maybe_config_get(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
if (maybe_config_get_and_show(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
g_string_append(s, ":conn=");
g_string_append(s, g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
Expand Down Expand Up @@ -321,7 +340,8 @@ void show_dev_detail(void)
GVariant *gvar_dict, *gvar_list, *gvar;
gsize num_elements;
double dlow, dhigh, dcur_low, dcur_high;
const uint64_t *uint64, p = 0, q = 0, low = 0, high = 0;
const uint64_t *uint64;
uint64_t p = 0, q = 0, low = 0, high = 0;
uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
GArray *opts;
const int32_t *int32;
Expand Down Expand Up @@ -504,7 +524,7 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_UINT64) {
printf(" %s: ", srci->id);
gvar = NULL;
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_uint64 = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
Expand Down Expand Up @@ -532,7 +552,7 @@ void show_dev_detail(void)

} else if (srci->datatype == SR_T_STRING) {
printf(" %s: ", srci->id);
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
Expand Down Expand Up @@ -571,7 +591,7 @@ void show_dev_detail(void)
continue;
}

if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
if (maybe_config_get_and_show(driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
g_variant_unref(gvar);
} else {
Expand All @@ -595,7 +615,7 @@ void show_dev_detail(void)

} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\n");
Expand All @@ -613,7 +633,7 @@ void show_dev_detail(void)
continue;
}

if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
if (maybe_config_get_and_show(driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
g_variant_unref(gvar);
} else {
Expand All @@ -637,17 +657,18 @@ void show_dev_detail(void)

} else if (srci->datatype == SR_T_FLOAT) {
printf(" %s: ", srci->id);
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
printf("%f\n", g_variant_get_double(gvar));
g_variant_unref(gvar);
} else
printf("\n");

} else if (srci->datatype == SR_T_RATIONAL_PERIOD
|| srci->datatype == SR_T_RATIONAL_VOLT) {
|| srci->datatype == SR_T_RATIONAL_VOLT
|| srci->datatype == SR_T_RATIONAL_VOLT_PER_DIV) {
printf(" %s", srci->id);
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_p, &cur_q);
g_variant_unref(gvar);
Expand All @@ -664,10 +685,15 @@ void show_dev_detail(void)
for (i = 0; i < num_elements; i++) {
gvar = g_variant_get_child_value(gvar_list, i);
g_variant_get(gvar, "(tt)", &p, &q);
g_variant_unref(gvar);
if (srci->datatype == SR_T_RATIONAL_PERIOD)
s = sr_period_string(p, q);
else
else if (srci->datatype == SR_T_RATIONAL_VOLT)
s = sr_voltage_string(p, q);
else if (srci->datatype == SR_T_RATIONAL_VOLT_PER_DIV)
s = sr_voltage_per_div_string(p, q);
else
s = g_strdup("Invalid datatype");
printf(" %s", s);
g_free(s);
if (p == cur_p && q == cur_q)
Expand All @@ -678,7 +704,7 @@ void show_dev_detail(void)

} else if (srci->datatype == SR_T_MQ) {
printf(" %s: ", srci->id);
if (maybe_config_get(driver, sdi, channel_group, key,
if (maybe_config_get_and_show(driver, sdi, channel_group, key,
&gvar) == SR_OK
&& g_variant_is_of_type(gvar, G_VARIANT_TYPE_TUPLE)
&& g_variant_n_children(gvar) == 2) {
Expand All @@ -698,6 +724,7 @@ void show_dev_detail(void)
printf(" ");
gvar = g_variant_get_child_value(gvar_list, i);
g_variant_get(gvar, "(ut)", &mq, &mqflags);
g_variant_unref(gvar);
if ((srmqi = sr_key_info_get(SR_KEY_MQ, mq)))
printf("%s", srmqi->id);
else
Expand Down
3 changes: 3 additions & 0 deletions sigrok-cli.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ int select_channels(struct sr_dev_inst *sdi);
int maybe_config_get(struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
uint32_t key, GVariant **gvar);
int maybe_config_get_and_show(struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
uint32_t key, GVariant **gvar);
int maybe_config_set(struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
uint32_t key, GVariant *gvar);
Expand Down