From: Gerhard Sittig <redacted>
Date: Sun, 19 Mar 2023 10:44:34 +0000 (+0100)
Subject: fluke-dmm: sort models by numbers, no behaviour change
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0d68d6ba2cdd2f1d1341a14c05f79a54af1390d0;p=libsigrok.git

fluke-dmm: sort models by numbers, no behaviour change

As the list of supported models grows, let's keep their declaration and
processing in numerical order of their model name. This is a mechanical
adjustment, no change in behaviour.
---

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 4714997a..b28e9be4 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -57,8 +57,8 @@ static const struct flukedmm_profile supported_flukedmm[] = {
 	{ FLUKE_89, "89", 100, 1000 },
 	{ FLUKE_187, "187", 100, 1000 },
 	{ FLUKE_189, "189", 100, 1000 },
-	{ FLUKE_287, "287", 100, 1000 },
 	{ FLUKE_190, "199B", 1000, 3500 },
+	{ FLUKE_287, "287", 100, 1000 },
 	{ FLUKE_289, "289", 100, 1000 },
 };
 
diff --git a/src/hardware/fluke-dmm/protocol.c b/src/hardware/fluke-dmm/protocol.c
index 20487f08..ee3c333c 100644
--- a/src/hardware/fluke-dmm/protocol.c
+++ b/src/hardware/fluke-dmm/protocol.c
@@ -475,11 +475,6 @@ static void handle_line(const struct sr_dev_inst *sdi)
 			devc->expect_response = FALSE;
 			handle_qm_18x(sdi, tokens);
 			break;
-		case FLUKE_287:
-		case FLUKE_289:
-			devc->expect_response = FALSE;
-			handle_qm_28x(sdi, tokens);
-			break;
 		case FLUKE_190:
 			devc->expect_response = FALSE;
 			num_tokens = g_strv_length(tokens);
@@ -509,6 +504,11 @@ static void handle_line(const struct sr_dev_inst *sdi)
 					sr_err("Cannot send QM (measurement).");
 			}
 			break;
+		case FLUKE_287:
+		case FLUKE_289:
+			devc->expect_response = FALSE;
+			handle_qm_28x(sdi, tokens);
+			break;
 		}
 	}
 	g_strfreev(tokens);
diff --git a/src/hardware/fluke-dmm/protocol.h b/src/hardware/fluke-dmm/protocol.h
index b4f19936..4eab15ac 100644
--- a/src/hardware/fluke-dmm/protocol.h
+++ b/src/hardware/fluke-dmm/protocol.h
@@ -33,8 +33,8 @@ enum {
 	FLUKE_89,
 	FLUKE_187,
 	FLUKE_189,
-	FLUKE_287,
 	FLUKE_190,
+	FLUKE_287,
 	FLUKE_289,
 };