From 367082436354d07964203de1b0880f3665a3f0cc Mon Sep 17 00:00:00 2001
From: Teuniz <teuniz@gmail.com>
Date: Mon, 5 Dec 2016 18:00:34 +0100
Subject: [PATCH]  Work in progress.

---
 decode_dialog.cpp        | 27 ++++++++++++++++++++++++---
 global.h                 |  2 +-
 read_settings_thread.cpp |  2 +-
 serial_decoder.cpp       | 30 +++++++++++++++++++++++-------
 signalcurve.cpp          |  9 ++++++++-
 5 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/decode_dialog.cpp b/decode_dialog.cpp
index c4d985e..bd9c01f 100644
--- a/decode_dialog.cpp
+++ b/decode_dialog.cpp
@@ -259,7 +259,14 @@ UI_decoder_window::UI_decoder_window(QWidget *w_parent)
 
   trace_pos_spinbox = new QSpinBox(this);
   trace_pos_spinbox->setGeometry(370, 392, 100, 25);
-  trace_pos_spinbox->setRange(50, 350);
+  if(devparms->modelserie == 6)
+  {
+    trace_pos_spinbox->setRange(-163, 143);
+  }
+  else
+  {
+    trace_pos_spinbox->setRange(50, 350);
+  }
   trace_pos_spinbox->setValue(devparms->math_decode_pos);
 
   uart_tx_src_label = new QLabel(tab_uart);
@@ -644,8 +651,22 @@ void UI_decoder_window::trace_pos_spinbox_changed()
 
   if(devparms->modelserie == 6)
   {
-    sprintf(str, "FIXME!!");
-//     sprintf(str, ":BUS1:SPI:OFFS %i", devparms->math_decode_pos);  :FIXME
+    if(devparms->math_decode_mode == DECODE_MODE_SPI)
+    {
+      sprintf(str, ":BUS1:SPI:OFFS %i", devparms->math_decode_pos);
+    }
+    else if(devparms->math_decode_mode == DECODE_MODE_UART)
+      {
+        sprintf(str, ":BUS1:RS232:OFFS %i", devparms->math_decode_pos);
+      }
+      else if(devparms->math_decode_mode == DECODE_MODE_I2C)
+        {
+          sprintf(str, ":BUS1:IIC:OFFS %i", devparms->math_decode_pos);
+        }
+        else if(devparms->math_decode_mode == DECODE_MODE_PAR)
+          {
+            sprintf(str, ":BUS1:PARA:OFFS %i", devparms->math_decode_pos);
+          }
   }
   else
   {
diff --git a/global.h b/global.h
index 1b2d367..9b3547d 100644
--- a/global.h
+++ b/global.h
@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.33_1612041759"
+#define PROGRAM_VERSION       "0.33_1612051800"
 
 #define MAX_PATHLEN            4096
 
diff --git a/read_settings_thread.cpp b/read_settings_thread.cpp
index ead58ac..a73a068 100644
--- a/read_settings_thread.cpp
+++ b/read_settings_thread.cpp
@@ -1633,7 +1633,7 @@ void read_settings_thread::run()
 
   if(devparms->modelserie == 6)
   {
-    if(tmc_write(":BUS1:IIC:OFFS?") != 15)
+    if(tmc_write(":BUS1:SPI:OFFS?") != 15)
     {
       line = __LINE__;
       goto GDS_OUT_ERROR;
diff --git a/serial_decoder.cpp b/serial_decoder.cpp
index 4426728..02ef684 100644
--- a/serial_decoder.cpp
+++ b/serial_decoder.cpp
@@ -44,7 +44,8 @@ void UI_Mainwindow::serial_decoder(void)
 
   double uart_sample_per_bit,
          uart_tx_x_pos,
-         uart_rx_x_pos;
+         uart_rx_x_pos,
+         bit_per_volt;
 
   devparms.math_decode_uart_tx_nval = 0;
 
@@ -74,14 +75,29 @@ void UI_Mainwindow::serial_decoder(void)
   {
     for(j=0; j<MAX_CHNS; j++)
     {
-      if(devparms.modelserie == 6)
+      threshold[j] = devparms.math_decode_threshold[j];
+    }
+
+    if(devparms.modelserie == 6)
+    {
+      if(devparms.math_decode_mode == DECODE_MODE_UART)
       {
-        // FIXME
-      }
-      else
-      {
-        threshold[j] = devparms.math_decode_threshold[j];
+        if(devparms.math_decode_uart_tx)
+        {
+          bit_per_volt = -32.0 / devparms.chanscale[devparms.math_decode_uart_tx - 1];
+
+          threshold[devparms.math_decode_uart_tx - 1] = (devparms.math_decode_threshold_uart_tx + devparms.chanoffset[devparms.math_decode_uart_tx - 1]) * bit_per_volt;
+        }
+
+        if(devparms.math_decode_uart_rx)
+        {
+          threshold[devparms.math_decode_uart_rx - 1] = devparms.math_decode_threshold_uart_rx;
+        }
       }
+      else if(devparms.math_decode_mode == DECODE_MODE_SPI)
+        {
+            // :FIXME
+        }
     }
   }
 
diff --git a/signalcurve.cpp b/signalcurve.cpp
index 140c51b..597f296 100644
--- a/signalcurve.cpp
+++ b/signalcurve.cpp
@@ -2266,7 +2266,14 @@ void SignalCurve::draw_decoder(QPainter *painter, int dw, int dh)
   char str[256];
 
 
-  base_line = ((double)dh / 400.0) * devparms->math_decode_pos;
+  if(devparms->modelserie == 6)
+  {
+    base_line = (dh / 2) - (((double)dh / 400.0) * devparms->math_decode_pos);
+  }
+  else
+  {
+    base_line = ((double)dh / 400.0) * devparms->math_decode_pos;
+  }
 
   pix_per_smpl = (double)dw / (devparms->hordivisions * 100.0);