X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=de93e74a7438c0919b2ddc4f84f6912a83d96efe;hb=9cfc695ffe5f04622f61acb98ea4ac91c3f4ffc3;hp=bc81b810946d04d74ef2f556048499e5b247970b;hpb=650847e7d3caf097042397bd4522a7a393cb89ab;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index bc81b810..de93e74a 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -170,6 +170,8 @@ static const uint64_t hmo_vdivs[][2] = {
 	{ 2, 1 },
 	{ 5, 1 },
 	{ 10, 1 },
+	{ 20, 1 },
+	{ 50, 1 },
 };
 
 static const char *scope_analog_channel_names[] = {
@@ -200,7 +202,9 @@ static const char *scope_digital_channel_names[] = {
 
 static const struct scope_config scope_models[] = {
 	{
-		.name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL},
+		/* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */
+		.name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
+				"HMO3032", "HMO3042", "HMO3052", NULL},
 		.analog_channels = 2,
 		.digital_channels = 8,
 		.digital_pods = 1,
@@ -230,7 +234,9 @@ static const struct scope_config scope_models[] = {
 		.scpi_dialect = &hameg_scpi_dialect,
 	},
 	{
-		.name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL},
+		/* HMO2524/3034/3044/3054 support 16 digital channels but they're not supported yet. */
+		.name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", "HMO2524",
+				"HMO3034", "HMO3044", "HMO3054", NULL},
 		.analog_channels = 4,
 		.digital_channels = 8,
 		.digital_pods = 1,
@@ -349,7 +355,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 static int array_float_get(gchar *value, const uint64_t array[][2],
 		int array_len, unsigned int *result)
 {
-	int i;
+	int i, e;
+	size_t pos;
 	uint64_t f;
 	float s;
 	unsigned int s_int;
@@ -358,16 +365,19 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
 	memset(ss, 0, sizeof(ss));
 	memset(es, 0, sizeof(es));
 
-	strncpy(ss, value, 5);
-	strncpy(es, &(value[6]), 3);
+	/* Get index of the separating 'E' character and break up the string. */
+	pos = strcspn(value, "E");
+
+	strncpy(ss, value, pos);
+	strncpy(es, &(value[pos+1]), 3);
 
 	if (sr_atof_ascii(ss, &s) != SR_OK)
 		return SR_ERR;
-	if (sr_atoi(es, &i) != SR_OK)
+	if (sr_atoi(es, &e) != SR_OK)
 		return SR_ERR;
 
 	/* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
-	f = pow(10, abs(i));
+	f = pow(10, abs(e));
 
 	/*
 	 * Adjust the significand/factor pair to make sure
@@ -375,7 +385,11 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
 	 */
 	while ((int)fmod(log10(f), 3) > 0) {
 		s *= 10;
-		f *= 10;
+
+		if (e < 0)
+			f *= 10;
+		else
+			f /= 10;
 	}
 
 	/* Truncate s to circumvent rounding errors. */
@@ -544,6 +558,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 	const struct scope_config *config;
 	float tmp_float;
 	unsigned int i;
+	char *tmp_str;
 
 	devc = sdi->priv;
 	config = devc->model_config;
@@ -562,18 +577,20 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 			&tmp_float) != SR_OK)
 		return SR_ERR;
 
-	for (i = 0; i < config->num_timebases; i++) {
-		if (tmp_float == ((float) (*config->timebases)[i][0] /
-				  (*config->timebases)[i][1])) {
-			state->timebase = i;
-			break;
-		}
-	}
-	if (i == config->num_timebases) {
+	if (sr_scpi_get_string(sdi->conn,
+			(*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
+			&tmp_str) != SR_OK)
+		return SR_ERR;
+
+	if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases),
+			&i) != SR_OK) {
+		g_free(tmp_str);
 		sr_err("Could not determine array index for time base.");
 		return SR_ERR;
 	}
 
+	state->timebase = i;
+
 	if (sr_scpi_get_float(sdi->conn,
 			(*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
 			&tmp_float) != SR_OK)