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 4714997a9cd6156becf622706d4e04ac4087b29b..b28e9be4ca8e4d4c81826fda93604e4d4dbdc9d5 100644 (file)
--- 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 20487f087da177fd339c0302510d769578f121ae..ee3c333c2558533cd73ec0832e434d478fcd0e78 100644 (file)
--- 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 b4f199369fe1d3914e03d8f71afb1751e1d28169..4eab15acb7e4b959174c97fbbaa9014e23ccbbf9 100644 (file)
--- 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,
 };