From 9fb5ac33782f9db1169c9ee2ec74301b544e487a Mon Sep 17 00:00:00 2001
From: Teuniz <teuniz@gmail.com>
Date: Fri, 7 Aug 2020 13:31:23 +0200
Subject: [PATCH]  Added support for the DS1202Z-E.

---
 global.h                 |  2 +-
 mainwindow.cpp           |  9 ++++
 read_settings_thread.cpp | 89 +++++++++++++++++++++-------------------
 3 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/global.h b/global.h
index ed1c7e1..f911d7b 100644
--- a/global.h
+++ b/global.h
@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.37_2006141810"
+#define PROGRAM_VERSION       "0.37_2008071327"
 
 #define MAX_PATHLEN            1024
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6d515ab..dfd7e39 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1214,6 +1214,15 @@ void UI_Mainwindow::get_device_model(const char *str)
     devparms.modelserie = 1;
   }
 
+  if(!strcmp(str, "DS1202Z-E"))
+  {
+    devparms.channel_cnt = 2;
+
+    devparms.bandwidth = 200;
+
+    devparms.modelserie = 1;
+  }
+
   if(devparms.modelserie == 1)
   {
     if(devparms.use_extra_vertdivisions)  devparms.vertdivisions = 10;
diff --git a/read_settings_thread.cpp b/read_settings_thread.cpp
index c6699e4..efa61dd 100644
--- a/read_settings_thread.cpp
+++ b/read_settings_thread.cpp
@@ -1760,60 +1760,63 @@ void read_settings_thread::run()
 
   devparms->math_decode_threshold[1] = atof(device->buf);
 
-  usleep(TMC_GDS_DELAY);
-
-  if(devparms->modelserie != 1)
+  if(devparms->channel_cnt == 4)
   {
-    if(tmc_write(":BUS1:SPI:SCLK:THR?") != 19)
+    usleep(TMC_GDS_DELAY);
+
+    if(devparms->modelserie != 1)
+    {
+      if(tmc_write(":BUS1:SPI:SCLK:THR?") != 19)
+      {
+        line = __LINE__;
+        goto GDS_OUT_ERROR;
+      }
+    }
+    else
+    {
+      if(tmc_write(":DEC1:THRE:CHAN3?") != 17)
+      {
+        line = __LINE__;
+        goto GDS_OUT_ERROR;
+      }
+    }
+
+    if(tmc_read() < 1)
     {
       line = __LINE__;
       goto GDS_OUT_ERROR;
     }
-  }
-  else
-  {
-    if(tmc_write(":DEC1:THRE:CHAN3?") != 17)
+
+    devparms->math_decode_threshold[2] = atof(device->buf);
+
+    usleep(TMC_GDS_DELAY);
+
+    if(devparms->modelserie != 1)
+    {
+      if(tmc_write(":BUS1:SPI:SS:THR?") != 17)
+      {
+        line = __LINE__;
+        goto GDS_OUT_ERROR;
+      }
+    }
+    else
+    {
+      if(tmc_write(":DEC1:THRE:CHAN4?") != 17)
+      {
+        line = __LINE__;
+        goto GDS_OUT_ERROR;
+      }
+    }
+
+    if(tmc_read() < 1)
     {
       line = __LINE__;
       goto GDS_OUT_ERROR;
     }
+
+    devparms->math_decode_threshold[3] = atof(device->buf);
   }
 
-  if(tmc_read() < 1)
-  {
-    line = __LINE__;
-    goto GDS_OUT_ERROR;
-  }
-
-  devparms->math_decode_threshold[2] = atof(device->buf);
-
-  usleep(TMC_GDS_DELAY);
-
-  if(devparms->modelserie != 1)
-  {
-    if(tmc_write(":BUS1:SPI:SS:THR?") != 17)
-    {
-      line = __LINE__;
-      goto GDS_OUT_ERROR;
-    }
-  }
-  else
-  {
-    if(tmc_write(":DEC1:THRE:CHAN4?") != 17)
-    {
-      line = __LINE__;
-      goto GDS_OUT_ERROR;
-    }
-  }
-
-  if(tmc_read() < 1)
-  {
-    line = __LINE__;
-    goto GDS_OUT_ERROR;
-  }
-
-  devparms->math_decode_threshold[3] = atof(device->buf);
-
   if(devparms->modelserie != 1)
   {
     usleep(TMC_GDS_DELAY);