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

Fix typo in the Hameg HMO driver and add some error message for when the float comparison breaks

This commit is contained in:
Soeren Apel 2014-08-06 16:06:09 +02:00 committed by Uwe Hermann
parent 375340a724
commit b4e31d2aac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,8 +355,10 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
break; break;
} }
} }
if (i == config->num_vdivs) if (j == config->num_vdivs) {
sr_err("Could not determine array index for vertical div scale.");
return SR_ERR; return SR_ERR;
}
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_OFFSET], (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_OFFSET],
@ -502,8 +504,10 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
break; break;
} }
} }
if (i == config->num_timebases) if (i == config->num_timebases) {
sr_err("Could not determine array index for time base.");
return SR_ERR; return SR_ERR;
}
if (sr_scpi_get_float(sdi->conn, if (sr_scpi_get_float(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS], (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],