From 783e2566d28021f5c1b905e4001402f761e27024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Tue, 27 Apr 2021 09:52:45 +0200
Subject: [PATCH] Fix modbus data bits parsing and pop page after removing
 modbus RTU master

---
 libnymea-app/types/serialport.cpp             |  2 +-
 nymea-app/ui/system/ModbusRtuSettingsPage.qml | 36 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/libnymea-app/types/serialport.cpp b/libnymea-app/types/serialport.cpp
index 26ee7b2d..843ee804 100644
--- a/libnymea-app/types/serialport.cpp
+++ b/libnymea-app/types/serialport.cpp
@@ -94,7 +94,7 @@ SerialPort::SerialPortDataBits SerialPort::stringToSerialPortDataBits(const QStr
     } else if (dataBitsString == "SerialPortDataBitsData7") {
         return SerialPort::SerialPortDataBitsData7;
     } else if (dataBitsString == "SerialPortDataBitsData8") {
-        return SerialPort::SerialPortDataBitsData7;
+        return SerialPort::SerialPortDataBitsData8;
     }
 
     return SerialPort::SerialPortDataBitsUnknownDataBits;
diff --git a/nymea-app/ui/system/ModbusRtuSettingsPage.qml b/nymea-app/ui/system/ModbusRtuSettingsPage.qml
index eaf8d310..a9e76a18 100644
--- a/nymea-app/ui/system/ModbusRtuSettingsPage.qml
+++ b/nymea-app/ui/system/ModbusRtuSettingsPage.qml
@@ -51,8 +51,7 @@ SettingsPageBase {
                                           serialPortBaudrateModel: serialPortBaudrateModel,
                                           serialPortParityModel: serialPortParityModel,
                                           serialPortDataBitsModel: serialPortDataBitsModel,
-                                          serialPortStopBitsModel: serialPortStopBitsModel
-                                      })
+                                          serialPortStopBitsModel: serialPortStopBitsModel })
             enabled: modbusRtuManager.supported
         }
     }
@@ -285,7 +284,7 @@ SettingsPageBase {
                         d.pendingCommandId = -1
                         if (modbusRtuManager.handleModbusError(error)) {
                             // FIXME: the page does not work if I pop the page here
-                            //pageStack.pop()
+                            pageStack.pop()
                         }
                     }
                 }
@@ -295,6 +294,29 @@ SettingsPageBase {
                 text: qsTr("Information")
             }
 
+//            RowLayout {
+//                Layout.fillWidth: true
+
+//                Led {
+//                    Layout.preferredHeight: Style.iconSize
+//                    Layout.preferredWidth: Style.iconSize
+//                    state: modbusRtuMaster ? (modbusRtuMaster.connected ? "on" : "red") : "red"
+//                }
+
+//                Label {
+//                    Layout.fillWidth: true
+//                    text: modbusRtuMaster ? (modbusRtuMaster.connected ? qsTr("Connected") : qsTr("Disconnected")) : qsTr("Disconnected")
+//                }
+//            }
+
+            NymeaSwipeDelegate {
+                Layout.fillWidth: true
+                text: qsTr("Connection status")
+                subText: modbusRtuMaster && modbusRtuMaster.connected ? qsTr("Connected") : qsTr("Disconnected")
+                progressive: false
+                prominentSubText: false
+            }
+
             NymeaSwipeDelegate {
                 Layout.fillWidth: true
                 text: qsTr("UUID")
@@ -311,14 +333,6 @@ SettingsPageBase {
                 prominentSubText: false
             }
 
-            NymeaSwipeDelegate {
-                Layout.fillWidth: true
-                text: qsTr("Connection status")
-                subText: modbusRtuMaster && modbusRtuMaster.connected ? qsTr("Connected") : qsTr("Disconnected")
-                progressive: false
-                prominentSubText: false
-            }
-
             NymeaSwipeDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Baud rate")