last working thing before I started playing with the Wi-Fi interface

pyqt/mainwindow.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './qt/mainwindow.ui'
+# Form implementation generated from reading ui file 'qt/mainwindow.ui'
 #
 # Created by: PyQt5 UI code generator 5.6
 #
@@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(525, 753)
+        MainWindow.resize(525, 789)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -60,7 +60,7 @@ class Ui_MainWindow(object):
         self.scrollEncoder.setWidgetResizable(True)
         self.scrollEncoder.setObjectName("scrollEncoder")
         self.contentEncoder = QtWidgets.QWidget()
-        self.contentEncoder.setGeometry(QtCore.QRect(0, 0, 456, 658))
+        self.contentEncoder.setGeometry(QtCore.QRect(0, 0, 456, 694))
         self.contentEncoder.setObjectName("contentEncoder")
         self.scrollEncoder.setWidget(self.contentEncoder)
         self.gridLayout.addWidget(self.scrollEncoder, 0, 0, 1, 3)
@@ -140,39 +140,30 @@ class Ui_MainWindow(object):
         self.groupDeviceSettings.setObjectName("groupDeviceSettings")
         self.formLayout_2 = QtWidgets.QFormLayout(self.groupDeviceSettings)
         self.formLayout_2.setObjectName("formLayout_2")
-        self.labelAPSelector = QtWidgets.QLabel(self.groupDeviceSettings)
-        self.labelAPSelector.setObjectName("labelAPSelector")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.labelAPSelector)
-        self.selectAP = QtWidgets.QSpinBox(self.groupDeviceSettings)
-        self.selectAP.setSuffix("")
-        self.selectAP.setMinimum(1)
-        self.selectAP.setMaximum(5)
-        self.selectAP.setObjectName("selectAP")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.selectAP)
         self.labelSSID = QtWidgets.QLabel(self.groupDeviceSettings)
         self.labelSSID.setObjectName("labelSSID")
-        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.labelSSID)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.labelSSID)
         self.wifiSSID = QtWidgets.QLineEdit(self.groupDeviceSettings)
         self.wifiSSID.setClearButtonEnabled(True)
         self.wifiSSID.setObjectName("wifiSSID")
-        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.wifiSSID)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.wifiSSID)
         self.labelPassword = QtWidgets.QLabel(self.groupDeviceSettings)
         self.labelPassword.setObjectName("labelPassword")
-        self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.labelPassword)
+        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.labelPassword)
         self.wifiPassword = QtWidgets.QLineEdit(self.groupDeviceSettings)
         self.wifiPassword.setClearButtonEnabled(True)
         self.wifiPassword.setObjectName("wifiPassword")
-        self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.wifiPassword)
+        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.wifiPassword)
         self.labelPort = QtWidgets.QLabel(self.groupDeviceSettings)
         self.labelPort.setObjectName("labelPort")
-        self.formLayout_2.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.labelPort)
+        self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.labelPort)
         self.selectPort = QtWidgets.QComboBox(self.groupDeviceSettings)
         self.selectPort.setObjectName("selectPort")
-        self.formLayout_2.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.selectPort)
+        self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.selectPort)
         self.buttonRefreshPorts = QtWidgets.QToolButton(self.groupDeviceSettings)
         self.buttonRefreshPorts.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.buttonRefreshPorts.setObjectName("buttonRefreshPorts")
-        self.formLayout_2.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.buttonRefreshPorts)
+        self.formLayout_2.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.buttonRefreshPorts)
         self.verticalLayout_2.addWidget(self.groupDeviceSettings)
         self.buttonBoxDevice = QtWidgets.QDialogButtonBox(self.tabSetting)
         self.buttonBoxDevice.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Save)
@@ -241,9 +232,7 @@ class Ui_MainWindow(object):
         self.labelOTA.setText(_translate("MainWindow", "OTA Server:"))
         self.otaServer.setPlaceholderText(_translate("MainWindow", "URL or IP"))
         self.lineEdit_2.setPlaceholderText(_translate("MainWindow", "Port"))
-        self.groupDeviceSettings.setTitle(_translate("MainWindow", "Device Settings"))
-        self.labelAPSelector.setText(_translate("MainWindow", "Wi-Fi Access Point:"))
-        self.selectAP.setPrefix(_translate("MainWindow", "Access Point "))
+        self.groupDeviceSettings.setTitle(_translate("MainWindow", "Device Wi-Fi Settings"))
         self.labelSSID.setText(_translate("MainWindow", "SSID:"))
         self.labelPassword.setText(_translate("MainWindow", "Password:"))
         self.labelPort.setText(_translate("MainWindow", "Port:"))
@@ -257,13 +246,3 @@ class Ui_MainWindow(object):
         self.pushButton_2.setText(_translate("MainWindow", "Send Command"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabSetting), _translate("MainWindow", "Settings"))
 
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    MainWindow = QtWidgets.QMainWindow()
-    ui = Ui_MainWindow()
-    ui.setupUi(MainWindow)
-    MainWindow.show()
-    sys.exit(app.exec_())
-

qt/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>525</width>
-    <height>753</height>
+    <height>789</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -137,7 +137,7 @@
              <x>0</x>
              <y>0</y>
              <width>456</width>
-             <height>658</height>
+             <height>694</height>
             </rect>
            </property>
           </widget>
@@ -335,71 +335,48 @@
         <item>
          <widget class="QGroupBox" name="groupDeviceSettings">
           <property name="title">
-           <string>Device Settings</string>
+           <string>Device Wi-Fi Settings</string>
           </property>
           <layout class="QFormLayout" name="formLayout_2">
            <item row="1" column="0">
-            <widget class="QLabel" name="labelAPSelector">
-             <property name="text">
-              <string>Wi-Fi Access Point:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QSpinBox" name="selectAP">
-             <property name="suffix">
-              <string/>
-             </property>
-             <property name="prefix">
-              <string>Access Point </string>
-             </property>
-             <property name="minimum">
-              <number>1</number>
-             </property>
-             <property name="maximum">
-              <number>5</number>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
             <widget class="QLabel" name="labelSSID">
              <property name="text">
               <string>SSID:</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
+           <item row="1" column="1">
             <widget class="QLineEdit" name="wifiSSID">
              <property name="clearButtonEnabled">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="3" column="0">
+           <item row="2" column="0">
             <widget class="QLabel" name="labelPassword">
              <property name="text">
               <string>Password:</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
+           <item row="2" column="1">
             <widget class="QLineEdit" name="wifiPassword">
              <property name="clearButtonEnabled">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="5" column="0">
+           <item row="4" column="0">
             <widget class="QLabel" name="labelPort">
              <property name="text">
               <string>Port:</string>
              </property>
             </widget>
            </item>
-           <item row="5" column="1">
+           <item row="4" column="1">
             <widget class="QComboBox" name="selectPort"/>
            </item>
-           <item row="6" column="1">
+           <item row="5" column="1">
             <widget class="QToolButton" name="buttonRefreshPorts">
              <property name="layoutDirection">
               <enum>Qt::LeftToRight</enum>

wsc_device_encoder.py

@@ -32,6 +32,7 @@ class Encoder():
 
     def __init__(self, device_id, mqttc):
         self.__device_id  = device_id
+        self.__label_default = b""
         self.__hw_version_default =   b"0,0"
         self.__fw_version_default =   b"0,0"
         self.__alive_default  =    b"0"
@@ -48,6 +49,7 @@ class Encoder():
         self.__auth_default    =   b"0"
         self.__time_default    =   time.time()
         self.__fields = {"device_id":   self.__device_id,
+                         "label":       self.__label_default,
                          "hw_ver":      self.__hw_version_default,
                          "fw_ver":      self.__fw_version_default,
                          "alive":       self.__alive_default,

wsc_tools.py

@@ -60,10 +60,6 @@ class EncoderConfig():
         time.sleep(0.5)
         self.__ser.write(clear_str)
         time.sleep(0.5)
-        factory_reset_str = "\n\rAT+FRST\n\r"
-        factory_reset_str = factory_reset_str.encode('utf-8')
-        self.__ser.write(factory_reset_str)
-        time.sleep(0.5)
         for creds in aps: 
             self.setWifiAP(creds[0], creds[1])
             time.sleep(1)