BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

srzip: Store total number of analog channels.

This commit is contained in:
Martin Ling 2015-12-28 19:04:28 +00:00 committed by Uwe Hermann
parent 828832194f
commit eab052996c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/output/srzip.c
View File

@ -65,7 +65,7 @@ static int zip_create(const struct sr_output *o)
const char *devgroup; const char *devgroup;
char *s, *metabuf; char *s, *metabuf;
gsize metalen; gsize metalen;
guint logic_channels = 0; guint logic_channels = 0, analog_channels = 0;
outc = o->priv; outc = o->priv;
@ -106,20 +106,33 @@ static int zip_create(const struct sr_output *o)
for (l = o->sdi->channels; l; l = l->next) { for (l = o->sdi->channels; l; l = l->next) {
ch = l->data; ch = l->data;
if (ch->type == SR_CHANNEL_LOGIC) switch (ch->type) {
case SR_CHANNEL_LOGIC:
logic_channels++; logic_channels++;
break;
case SR_CHANNEL_ANALOG:
analog_channels++;
break;
}
} }
g_key_file_set_integer(meta, devgroup, "total probes", logic_channels); g_key_file_set_integer(meta, devgroup, "total probes", logic_channels);
g_key_file_set_integer(meta, devgroup, "total analog", analog_channels);
for (l = o->sdi->channels; l; l = l->next) { for (l = o->sdi->channels; l; l = l->next) {
ch = l->data; ch = l->data;
if (ch->enabled && ch->type == SR_CHANNEL_LOGIC) { switch (ch->type) {
case SR_CHANNEL_LOGIC:
s = g_strdup_printf("probe%d", ch->index + 1); s = g_strdup_printf("probe%d", ch->index + 1);
break;
case SR_CHANNEL_ANALOG:
s = g_strdup_printf("analog%d", ch->index + 1);
break;
}
if (ch->enabled)
g_key_file_set_string(meta, devgroup, s, ch->name); g_key_file_set_string(meta, devgroup, s, ch->name);
g_free(s); g_free(s);
} }
}
metabuf = g_key_file_to_data(meta, &metalen, NULL); metabuf = g_key_file_to_data(meta, &metalen, NULL);
g_key_file_free(meta); g_key_file_free(meta);