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

hameg-hmo: Use 1-based (not 0-based) POD numbers. 

The current starting index for the POD name is currently wrong as it is zero.

The official POD numbering starts instead at 1 (see device panel, buttons
and manual), so the current index used for message printing and groups
naming in the driver needs to be incremented by one.
This commit is contained in:
Guido Trentalancia 2018-11-16 21:51:49 +01:00 committed by Uwe Hermann
parent 830e24b68f
commit 262061ff3d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/hameg-hmo/protocol.c
View File

@ -404,11 +404,11 @@ static void scope_state_dump(const struct scope_config *config,
for (i = 0; i < config->digital_pods; i++) {
if (strncmp("USER", (*config->logic_threshold)[state->digital_pods[i].threshold], 4))
sr_info("State of digital POD %d -> %s : %s (threshold)", i,
sr_info("State of digital POD %d -> %s : %s (threshold)", i + 1,
state->digital_pods[i].state ? "On" : "Off",
(*config->logic_threshold)[state->digital_pods[i].threshold]);
else // user-defined or custom logic threshold
sr_info("State of digital POD %d -> %s : %E (threshold)", i,
sr_info("State of digital POD %d -> %s : %E (threshold)", i + 1,
state->digital_pods[i].state ? "On" : "Off",
state->digital_pods[i].user_threshold);
}
@ -882,7 +882,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
ret = SR_ERR_MALLOC;
break;
}
devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
devc->digital_groups[i]->name = g_strdup_printf("POD%d", i + 1);
sdi->channel_groups = g_slist_append(sdi->channel_groups,
devc->digital_groups[i]);
}