scpi/usbtmc: Implement Rigol DS1000 workaround on any firmware version.

[libsigrok.git] / src / hardware / rigol-ds / api.c

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index ba4b0206ca861113796a5c43d107d77fae99df78..762154a75592d50fbb8ed336af3b1856c9427e91 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -340,12 +340,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                        }
                        if (i != 3)
                                break;
-                       if (n[0] != 0 || n[1] > 2)
-                               break;
-                       if (n[1] == 2 && n[2] > 3)
-                               break;
-                       sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format.");
-                       devc->format = FORMAT_RAW;
+                       scpi->firmware_version = n[0] * 100 + n[1] * 10 + n[2];
+                       if (scpi->firmware_version < 24) {
+                               sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format.");
+                               devc->format = FORMAT_RAW;
+                       }
+                       break;
                } while (0);
                g_strfreev(version);
        }