From 0210e963d560d4f4dcb46555de5ac693773b9c5b Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Tue, 29 Mar 2016 10:36:53 -0400
Subject: [PATCH] Changes to utilize new functionality of GVRET - ability to
 set listen only mode

---
 config.h             |  4 +--
 connectionwindow.cpp |  8 ++---
 serialworker.cpp     | 76 +++++++++++++++++++++++++++++++++++++++-----
 serialworker.h       |  1 +
 4 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/config.h b/config.h
index 08e40d0..92a2526 100644
--- a/config.h
+++ b/config.h
@@ -1,12 +1,12 @@
 #ifndef CONFIG
 #define CONFIG
 
-#define VERSION             152
+#define VERSION             153
 
 //try to keep this in sync.
 //SavvyCAN will complain if you connect a GVRET board with a revision
 //less than this number.
-#define CURRENT_GVRET_VER   331
+#define CURRENT_GVRET_VER   334
 
 #endif // CONFIG
 
diff --git a/connectionwindow.cpp b/connectionwindow.cpp
index 3cff915..fe757f6 100644
--- a/connectionwindow.cpp
+++ b/connectionwindow.cpp
@@ -92,7 +92,7 @@ void ConnectionWindow::handleOKButton()
     QString conn;
     int connType = 0;
     int whichRow = ui->tableConnections->selectionModel()->currentIndex().row();
-    qDebug() << whichRow;
+    qDebug() << "OK pressed. Row " << whichRow;
 
     if (whichRow > -1)
     {
@@ -193,7 +193,7 @@ void ConnectionWindow::receiveBusStatus(int bus, int speed, int status)
 void ConnectionWindow::handleConnSelectionChanged()
 {
     int selIdx = ui->tableConnections->selectionModel()->currentIndex().row();
-    qDebug() << selIdx;
+    qDebug() << "Selection: " << selIdx;
     if (selIdx == -1)
     {
         ui->btnOK->setText(tr("Create New Connection"));
@@ -220,7 +220,7 @@ void ConnectionWindow::handleConnSelectionChanged()
         ui->ckSingleWire->setChecked(bus->isSingleWire());
         int speed = bus->getSpeed();
         setSpeed(speed);
-        connModel->refreshView();
+        //connModel->refreshView();
     }
 }
 
@@ -265,7 +265,7 @@ void ConnectionWindow::setSpeed(int speed0)
 {
     bool found = false;
 
-    qDebug() << speed0;
+    qDebug() << "Set Speed " << speed0;
 
     for (int i = 0; i < ui->cbSpeed->count(); i++)
     {
diff --git a/serialworker.cpp b/serialworker.cpp
index b35d672..31a6734 100644
--- a/serialworker.cpp
+++ b/serialworker.cpp
@@ -378,7 +378,8 @@ void SerialWorker::procRXChar(unsigned char c)
         switch (rx_step)
         {
         case 0:
-            can0Enabled = c;
+            can0Enabled = (c & 0xF);
+            can0ListenOnly = (c >> 4);
             break;
         case 1:
             can0Baud = c;
@@ -393,7 +394,9 @@ void SerialWorker::procRXChar(unsigned char c)
             can0Baud |= c << 24;
             break;
         case 5:
-            can1Enabled = c;
+            can1Enabled = (c & 0xF);
+            can1ListenOnly = (c >> 4);
+            deviceSingleWireMode = (c >> 6);
             break;
         case 6:
             can1Baud = c;
@@ -409,12 +412,27 @@ void SerialWorker::procRXChar(unsigned char c)
             rx_state = IDLE;
             qDebug() << "Baud 0 = " << can0Baud;
             qDebug() << "Baud 1 = " << can1Baud;
-            if (!can1Enabled) can1Baud = 0;
-            if (!can0Enabled) can0Baud = 0;
+
+            can0Baud &= 0x80000000;
+            if (can0Enabled) can0Baud &= 0x40000000;
+            if (can0ListenOnly) can0Baud &= 0x20000000;
+
+            can1Baud &= 0x80000000;
+            if (can1Enabled) can1Baud &= 0x40000000;
+            if (can1ListenOnly) can1Baud &= 0x20000000;
+            if (deviceSingleWireMode > 0) can1Baud &= 0x10000000;
+
             isConnected = true;
             emit connectionSuccess();
-            emit busStatus(busBase, can0Baud, can0Enabled?0x49:0x48); //say that we're updating baud rate and set enabled status
-            emit busStatus(busBase + 1, can1Baud, can1Enabled?0x49:0x48);
+            int can0Status = 0x78; //updating everything we can update
+            int can1Status = 0x78;
+            if (can0Enabled) can0Status +=1;
+            if (can0ListenOnly) can0Status += 4;
+            if (can1Enabled) can1Status += 1;
+            if (deviceSingleWireMode > 0) can1Status += 2;
+            if (can1ListenOnly) can1Status += 4;
+            emit busStatus(busBase, can0Baud, can0Status);
+            emit busStatus(busBase + 1, can1Baud, can1Status);
             break;
         }
         rx_step++;
@@ -564,7 +582,49 @@ void SerialWorker::updateBusSettings(CAN_Bus *bus)
     if (busNum < 0) return;
     if (busNum >= numBuses) return;
     qDebug() << "About to update bus " << busNum << " on GVRET";
-    if (busNum == 0) can0Baud = bus->getSpeed();
-    if (busNum == 1) can1Baud = bus->getSpeed();
+    if (busNum == 0)
+    {
+        can0Baud = bus->getSpeed();
+        can0Baud &= 0x80000000;
+        if (bus->isActive())
+        {
+            can0Baud &= 0x40000000;
+            can0Enabled = true;
+        }
+        else can0Enabled = false;
+
+        if (bus->isListenOnly())
+        {
+            can0Baud &= 0x20000000;
+            can0ListenOnly = true;
+        }
+        else can0ListenOnly = false;
+    }
+    if (busNum == 1)
+    {
+        can1Baud = bus->getSpeed();
+        can1Baud &= 0x80000000;
+        if (bus->isActive())
+        {
+            can1Baud &= 0x40000000;
+            can1Enabled = true;
+        }
+        else can1Enabled = false;
+
+        if (bus->isListenOnly())
+        {
+            can1Baud &= 0x20000000;
+            can1ListenOnly = true;
+        }
+        else can1ListenOnly = false;
+
+        if (bus->isSingleWire())
+        {
+            can1Baud &= 0x10000000;
+            deviceSingleWireMode = 1;
+        }
+        else deviceSingleWireMode = 0;
+    }
+
     updateBaudRates(can0Baud,can1Baud);
 }
diff --git a/serialworker.h b/serialworker.h
index a83a637..41a8691 100644
--- a/serialworker.h
+++ b/serialworker.h
@@ -74,6 +74,7 @@ private:
     CANFrame *buildFrame;
     int can0Baud, can1Baud;
     bool can0Enabled, can1Enabled;
+    bool can0ListenOnly, can1ListenOnly;
     int deviceBuildNum;
     int deviceSingleWireMode;
     uint64_t txTimestampBasis;