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

hameg-hmo: Handle floating point numbers while ignoring the locale.

This commit is contained in:
poljar (Damir Jelić) 2014-01-16 15:28:50 +01:00 committed by Bert Vermeulen
parent 13dbd151fe
commit 965b463d98
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/hameg-hmo/api.c
View File

@ -474,7 +474,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
{ {
int ret, pg_type; int ret, pg_type;
unsigned int i, j; unsigned int i, j;
char command[MAX_COMMAND_SIZE]; char command[MAX_COMMAND_SIZE], float_str[30];
struct dev_context *devc; struct dev_context *devc;
struct scope_config *model; struct scope_config *model;
struct scope_state *state; struct scope_state *state;
@ -528,9 +528,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
if (probe_group != &devc->analog_groups[j - 1]) if (probe_group != &devc->analog_groups[j - 1])
continue; continue;
state->analog_channels[j - 1].vdiv = (float) p / q; state->analog_channels[j - 1].vdiv = (float) p / q;
g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV], (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
j, state->analog_channels[j-1].vdiv); j, float_str);
if (sr_scpi_send(sdi->conn, command) != SR_OK || if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK) sr_scpi_get_opc(sdi->conn) != SR_OK)
@ -551,9 +552,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
q != (*model->timebases)[i][1]) q != (*model->timebases)[i][1])
continue; continue;
state->timebase = (float) p / q; state->timebase = (float) p / q;
g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
g_snprintf(command, sizeof(command), g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE], (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE],
state->timebase); float_str);
ret = sr_scpi_send(sdi->conn, command); ret = sr_scpi_send(sdi->conn, command);
break; break;

4
hardware/hameg-hmo/protocol.c
View File

@ -22,12 +22,12 @@
static const char *hameg_scpi_dialect[] = { static const char *hameg_scpi_dialect[] = {
[SCPI_CMD_GET_DIG_DATA] = ":POD%d:DATA?", [SCPI_CMD_GET_DIG_DATA] = ":POD%d:DATA?",
[SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?", [SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?",
[SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %E", [SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s",
[SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?", [SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?",
[SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s", [SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s",
[SCPI_CMD_GET_ANALOG_DATA] = ":CHAN%d:DATA?", [SCPI_CMD_GET_ANALOG_DATA] = ":CHAN%d:DATA?",
[SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?", [SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?",
[SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %E", [SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %s",
[SCPI_CMD_GET_DIG_POD_STATE] = ":POD%d:STAT?", [SCPI_CMD_GET_DIG_POD_STATE] = ":POD%d:STAT?",
[SCPI_CMD_SET_DIG_POD_STATE] = ":POD%d:STAT %d", [SCPI_CMD_SET_DIG_POD_STATE] = ":POD%d:STAT %d",
[SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?", [SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?",