From 4490dd803ae906c2d2b636ec346294072033af2d Mon Sep 17 00:00:00 2001
From: david rice <david.rice@arrive.com>
Date: Mon, 19 Jan 2026 16:00:19 +0000
Subject: [PATCH] Updates

---
 __pycache__/ui_connerror.cpython-312.pyc  | Bin 3892 -> 3898 bytes
 __pycache__/ui_mainwindow.cpython-312.pyc | Bin 6099 -> 11273 bytes
 main.py                                   |  96 ++++++++++++++++----
 ui_connerror.py                           |   2 +-
 ui_mainwindow.py                          | 105 +++++++++++-----------
 5 files changed, 136 insertions(+), 67 deletions(-)

diff --git a/__pycache__/ui_connerror.cpython-312.pyc b/__pycache__/ui_connerror.cpython-312.pyc
index 98d6b606529a70a60d9b10f7c62f9aa69e91a667..3536310f2ffa7a7c790ac5e8829f103f37e99443 100644
GIT binary patch
delta 100
zcmdlYw@Z%qG%qg~0}z~2%gem9kvEQ4McLUu)W^k7Jw(CT-_Ot0IYc4EUm?Ih+%+iJ
z(^tX8HO$l5b#f<f3s>5OjGW8TxmP*zCX4eWGUiXN<Xgj^&p1QuD}xPVK4Xy?&{zP;
C1s!kz

delta 94
zcmdlbw?&TkG%qg~0}xEfh|4^)kvEQ4PS)8!)W^k7Jw(CT-_Ot0IYc4EU%@5V-@?Gi
wz{F{CKW__H!iA)?%hKsrIWi{8@+C56POj%$!=K4GL+mSq4Pz!_kr~iH00`Y18~^|S

diff --git a/__pycache__/ui_mainwindow.cpython-312.pyc b/__pycache__/ui_mainwindow.cpython-312.pyc
index f7461d59a95397ceff9885e4a96362b2474c8456..8c89b6fec13d00c61ec57f87441689d72904778c 100644
GIT binary patch
delta 2943
zcmd6pUrbw79LIYvrT1J~+F4p!O8*xal<{vckU@yx%KnJ3wS_Xb5x2FQL+qAY=Cs-9
zgFZlF;^KXQNTfs})je3#7amMR<HHio(wlp=rccK3f=}~bOnma3d&=p>powM=HsR*}
zKIixQeb4Xw`CY`0rD^?F)zwuh`1?8>zj4F<iT*Q+zHj6`CR=WoGH4h})Ec!sQ1d@&
zYWOc16aNx0@yCIVt-HrWZTG;uk3Y|}RJ%|H^t-E?9pXO+HGH<hWT<~YVM>+xYZ@nO
zk2+vhC(cS?|4%Ci)Fc>+R5Rt^l8758lSQ5(BCfI@jK>^{D5g$fUJ}6u5&`All88qk
zGD1Y$Wj`o_ITG>gs|53s2sRF`#H$cFK}5X!L@>u9%1SUViC_bYXcd+45vH}uM<n>O
zteO9~!mRTt^2@Nmc$fyo{s!3^{yH$j{ngT?<!B&jRI{hZOdA!M_BfttlVW4Be`%)J
zICwc46(VPd$l-k=m}3#eoGHvpBG@>1W1AErV??BRp9tni#2!^vf_X^<8wXc%SRpb_
zL|XQVV2(wUm0(^H!Ny-IiTe2oFhHH-&sEm&?}1(_#IM7vW@mMLRAVYz)THb&$m+C_
zy$Q`umzY-lx~io$cbmOM=YG_FOI<HA*Y1p6z7m_e@jk6m?N-8wT?2d+>1%h2Od>uf
zk9`5Ja*<BNi`rW^@5H!~+w=1`<GarxKQ<AYe^vI{?L)R2*+us9)e<eL(JQ}Q{XNx|
zTi2hUj&o?oxn|@H1!Qr~k5DT@ay|?@WE+KJyDRsD;TT0PXmWK=ougCU%$2M!%ZUxg
zB{1+E(7kO~G890g02<SC66k)cX6(8=us$|27Tu!uSEI`6T#l~ASK^|jZBhM}4u$BJ
zbOqoQfHw`3v=ibMfP2H7PGp8NiR_5z>65_IWY8l3&xUt1)xO>?fi8kkmb|Z90zErM
z>#}Lhx#AR!%}|IzF3b{B01g2-mSYlVAf#RZ^{aujFU@7Tv$SYO;bhP*0Q+iiZDwUg
z0!Ijyle{c}lz+$Kc#;ME%X(5zx*-2feN%dVb76f!tnXb^OTY?iE&!_ltOd{{fTr|<
z1bPYUEr13AG;B;}j%K)Q_ZBTS4oF~-jF)2Wq7A8YrPZ7Ib-h^E!9OxKrD{q?$G3NM
z^h^2z@Cm@TF|s+nJ`Rr$T5p*mk$mGZD7|B{E%&Sqtqh4KKipRqxv)!Y0k{O<N;48@
zCIoHLYApS1#+V6Zy`mF^lR>9n0M1ozZD9o#Bp<qR7A@TB|J!uoZTP3@K34PZ*1SpI
zQs+FTLlpXs>*VIQXzHn~jH(_~pno4IJz*Nc4iUx>W+bfaXCe#`zgogr!mNZ<5oRMy
zOPGC+QB}OdY+-fdTpjE+Nf$q3w($|OKbT}gf#B)kG57dHvZAf6Ey;{_MBKr^RFXYA
z5eWp{6QiTaLsJuD;o*}3cPJ1(J8^nEoYZu7ws&?;l}DZr42LFzffFqT{ta{YNiKl;
zoZRe46O`K?H;M*O!{bh(M;Cmw(A*e$M^j6{=B#qNxk&`h@OiVFSwr{(ivQglPf6ec
zI$d%%LtR61v=tnEf}?Lsw>_5+Pm7N85_kc*z&?cfq-1R_SdR+UquIgj+J`353XlB6
z-=>(&2d6|wL;}+Xr%3I~v3F%r6O}w&1<!!s8Q2<ocqBi4QS@ArzzoVF-z_IRS(2-x
z;OZA#{aZ)!r!M3#T^3zeBybh^$k(Dy0CkehU$FHEww~<8?f!>R(H4?GxSVC^Kd1Qy
zgt-VmTie<{C9f=ee5m5kcM~tQ1-+pMfPV?}VSH2dGaaHUyMLKeS65C_F#1vLN46K?
kNIC2eF!;*N=<T`K5EtX$v9#AjX=;+XKl+<Wevuvj1dfYY-T(jq

delta 407
zcmeB-xUA22nwOW00SL@1;xYrIH}dUgWLm_&`8=a08>>W$WQxS(hkT-wkFbkO&f^rB
zY{19OlOk2io+4e#ks?#eIXRI{94wI~%*SXyIgnL&a*wbXqvPc7!t#?-*hC;KM(4?n
zB62(>t{{6rAj=IXpvWk@Ia#EDi8V8hk%3|JWwC3FlLaInFsf|+DCxquxk%cGk?AGV
z=4CR0OoqxUiZ&SUV7jbgeTBp31_w_+e<%NS4%Lessta<ia2S7JVVB{#z#;KLj$NFm
zgZo1U<K(?cEldK8lg~3sO^#Lm##70l$?8`m3ADRPe)0o#smV9hwU{*7CWmSmOKCC{
z*#ITLvc*h5mV!bN$f-qElh11?u+IiEi}M*Kf78fgy~+_?<UV<UmbQ=^SOJh&$x!4D
zV!KYht0l$j&%|o{IfaFVHHHzWkVSiyQ~*d4q5{bJ#bJ}1pHiBWYF89G`GmHfa5xiV
O4C4g1uMA)YSRnx9<80^v

diff --git a/main.py b/main.py
index a5e0d64..6db4737 100644
--- a/main.py
+++ b/main.py
@@ -12,7 +12,7 @@ AUTHOR: D. RICE 06/01/2026
 # Imports
 import sys
 from PySide6.QtWidgets import (QApplication, QDialog, QMainWindow)
-from PySide6.QtCore import (QIODevice, QByteArray)
+from PySide6.QtCore import (QIODevice, QByteArray, QTimer)
 from PySide6.QtSerialPort import (QSerialPort, QSerialPortInfo)
 
 import time
@@ -65,14 +65,16 @@ class MainWindow(QMainWindow):
         # Hold process reference.
         self.p = None
 
-        # Thread and Worker initialisation
-        self.worker_thread = None
-        self.worker = None
-
         # Add start button action
         self.ui.connButton.setCheckable(True)
         self.ui.connButton.clicked.connect(self.conn_button_press)
 
+        # Hide other controls
+        self.ui.sn.setHidden(True)
+        self.ui.snLabel.setHidden(True)
+        self.ui.fw.setHidden(True)
+        self.ui.fwLabel.setHidden(True)
+
         # Set initial size
         initial_width = 1000
         initial_height = 600
@@ -95,6 +97,20 @@ class MainWindow(QMainWindow):
         # Create serial rx buffer
         self.receive_buffer = bytearray()
 
+        #  Create store buffer
+        self.store_buffer = bytearray()
+
+        # Create a timeout counter flag
+        self.timeoutflag = False
+
+        # Create a window response variable
+        self.windowresponse = False
+
+        # Setup QT timers
+        self.timeouttimer = QTimer()
+        self.timeouttimer.setInterval(5000)
+        self.timeouttimer.timeout.connect(self.time_out_timer)
+
         self.show()
 
     def conn_button_press (self):
@@ -122,12 +138,40 @@ class MainWindow(QMainWindow):
 
             self.serial.write(QByteArray(byte_data))
 
-            while (self.serial_rx_flag == False):
-                QApplication.processEvents()   
+            self.timeouttimer.start()
+
+            while ((self.serial_rx_flag == False) and (self.timeoutflag == False)):
+                QApplication.processEvents()
+
+            w.close()       
+
+            if self.timeoutflag == True:
+                self.windowresponse = NoDeviceWindow.get_response(self)
+                self.serial.close()
+                self.ui.connButton.setText("CONNECT")
+                self.ui.sn.setHidden(True)
+                self.ui.snLabel.setHidden(True)
+                self.ui.fw.setHidden(True)
+                self.ui.fwLabel.setHidden(True)
+                self.ui.sn.setText("---")
+                self.ui.fw.setText("---")
+
+            else:
+                self.process_serial_number()
+
+
+            self.serial_rx_flag = False
+            self.timeoutflag = False
                  
         else:
             self.serial.close()
-            self.ui.connButton.setText("CONNECT")   
+            self.ui.connButton.setText("CONNECT")  
+            self.ui.sn.setHidden(True)
+            self.ui.snLabel.setHidden(True)
+            self.ui.fw.setHidden(True)
+            self.ui.fwLabel.setHidden(True)
+            self.ui.sn.setText("---")
+            self.ui.fw.setText("---") 
 
             QApplication.processEvents()
 
@@ -167,21 +211,42 @@ class MainWindow(QMainWindow):
     def handle_valid_packet(self, packet):
         # Checksum validity check
         try:
-            print (packet)
             data_bytes = list(packet[3 : -2])
             received_checksum = (packet[-2] << 8) | packet[-1]
 
             if((~sum(data_bytes)) & 0xFFFF) == received_checksum:
-                print(f"RX DATA: {data_bytes}")
+                self.serial_rx_flag = True
+                self.store_buffer = data_bytes
 
             else:
                 pass    
 
         except Exception as e:
-            pass                   
+            pass   
 
+    def process_serial_number(self):
+        # Get and update serial number
+        sub_sn = self.store_buffer[0:19]
+        sn_chars = [chr(c) for c in sub_sn if 0 <= c <= 127]
+        sn_str = "".join(sn_chars)      
+        self.ui.sn.setText(sn_str)
 
+        # Get and update FW Rev
+        sub_fw = self.store_buffer[19:22]
 
+        major = sub_fw[1:2]
+        sep = sub_fw[0:1]
+        minor = sub_fw[2:3]
+        full = major + sep + minor
+        fw_chars = [chr(c) for c in full if 0 <= c <= 127]
+        fw_str = "".join(fw_chars)      
+        self.ui.fw.setText(fw_str)
+
+        self.ui.sn.setHidden(False)
+        self.ui.snLabel.setHidden(False)
+        self.ui.fw.setHidden(False)
+        self.ui.fwLabel.setHidden(False)
+          
 
     def pack_integers_to_bytes(self, *integers: int) -> bytes:
         # Setup header 
@@ -211,11 +276,10 @@ class MainWindow(QMainWindow):
         # We need as many 'B's as there are elements in the full packet
         format_string = f"!{len(full_packet)}B"        
 
-        return struct.pack(format_string, *full_packet)
-
-    def run_scope_setup (self):
-        self.worker.run_setup()        
-  
+        return struct.pack(format_string, *full_packet)   
+    
+    def time_out_timer(self):
+        self.timeoutflag = True  
 
 # Run main
 if __name__ == '__main__':
diff --git a/ui_connerror.py b/ui_connerror.py
index 4f24d3a..fbb8cd5 100644
--- a/ui_connerror.py
+++ b/ui_connerror.py
@@ -62,5 +62,5 @@ class Ui_connerrorDialog(object):
     # setupUi
 
     def retranslateUi(self, Dialog):
-        self.label.setText(QCoreApplication.translate("Dialog", u"COULDN'T CONNECT TO DSO80204B", None))
+        self.label.setText(QCoreApplication.translate("Dialog", u"COULDN'T CONNECT TO POWERSIM DEVICE", None))
     # retranslateUi
\ No newline at end of file
diff --git a/ui_mainwindow.py b/ui_mainwindow.py
index b4ef0dc..7997ef0 100644
--- a/ui_mainwindow.py
+++ b/ui_mainwindow.py
@@ -63,7 +63,7 @@ class Ui_MainWindow(object):
 
         self.connButton = QPushButton(self.test_area)
         self.connButton.setObjectName(u"connButton")
-        self.connButton.setGeometry(QRect(350, 25, 200, 25))
+        self.connButton.setGeometry(QRect(25, 25, 200, 25))
         self.connButton.setStyleSheet(button_style)
 
         text_label_style = """
@@ -75,12 +75,6 @@ class Ui_MainWindow(object):
             }
         """
 
-        #self.manuLabel = QLabel(self.test_area)
-        #self.manuLabel.setObjectName(u"manuLabel")
-        #self.manuLabel.setGeometry(QRect(200, 5, 250, 15))
-        #self.manuLabel.setAlignment(Qt.AlignCenter)
-        #self.manuLabel.setStyleSheet(text_label_style)
-
         label_style = """
             QLabel {
                 background-image: url("");
@@ -90,49 +84,59 @@ class Ui_MainWindow(object):
             }
         """
 
-        #self.manu = QLabel(self.test_area)
-        #self.manu.setObjectName(u"manu")
-        #self.manu.setGeometry(QRect(200, 25, 250, 25))
-        #self.manu.setAlignment(Qt.AlignCenter)
-        #self.manu.setStyleSheet(label_style)   
+        self.fwLabel = QLabel(self.test_area)
+        self.fwLabel.setObjectName(u"fwLabel")
+        self.fwLabel.setGeometry(QRect(675, 5, 200, 15))
+        self.fwLabel.setAlignment(Qt.AlignCenter)
+        self.fwLabel.setStyleSheet(text_label_style)
 
-        #self.modelLabel = QLabel(self.test_area)
-        #self.modelLabel.setObjectName(u"modelLabel")
-        #self.modelLabel.setGeometry(QRect(475, 5, 125, 15))
-        #self.modelLabel.setAlignment(Qt.AlignCenter)
-        #self.modelLabel.setStyleSheet(text_label_style)
+        self.fw = QLabel(self.test_area)
+        self.fw.setObjectName(u"fw")
+        self.fw.setGeometry(QRect(675, 25, 200, 25))
+        self.fw.setAlignment(Qt.AlignCenter)
+        self.fw.setStyleSheet(label_style)
 
-        #self.model = QLabel(self.test_area)
-        #self.model.setObjectName(u"model")
-        #self.model.setGeometry(QRect(475, 25, 125, 25))
-        #self.model.setAlignment(Qt.AlignCenter)
-        #self.model.setStyleSheet(label_style)
+        self.snLabel = QLabel(self.test_area)
+        self.snLabel.setObjectName(u"snlabel")
+        self.snLabel.setGeometry(QRect(450, 5, 200, 15))
+        self.snLabel.setAlignment(Qt.AlignCenter)
+        self.snLabel.setStyleSheet(text_label_style)
 
-        #self.snLabel = QLabel(self.test_area)
-        #self.snLabel.setObjectName(u"snlabel")
-        #self.snLabel.setGeometry(QRect(625, 5, 125, 15))
-        #self.snLabel.setAlignment(Qt.AlignCenter)
-        #self.snLabel.setStyleSheet(text_label_style)
+        self.sn = QLabel(self.test_area)
+        self.sn.setObjectName(u"sn")
+        self.sn.setGeometry(QRect(450, 25, 200, 25))
+        self.sn.setAlignment(Qt.AlignCenter)
+        self.sn.setStyleSheet(label_style)  
 
-        #self.sn = QLabel(self.test_area)
-        #self.sn.setObjectName(u"sn")
-        #self.sn.setGeometry(QRect(625, 25, 125, 25))
-        #self.sn.setAlignment(Qt.AlignCenter)
-        #self.sn.setStyleSheet(label_style)   
+        self.powerButton = QPushButton(self.test_area)
+        self.powerButton.setObjectName(u"powerButton")
+        self.powerButton.setGeometry(QRect(25, 75, 200, 25))
+        self.powerButton.setStyleSheet(button_style) 
 
-        #self.fwLabel = QLabel(self.test_area)
-        #self.fwLabel.setObjectName(u"fwLabel")
-        #self.fwLabel.setGeometry(QRect(775, 5, 125, 15))
-        #self.fwLabel.setAlignment(Qt.AlignCenter)
-        #self.fwLabel.setStyleSheet(text_label_style)
+        self.setvLabel = QLabel(self.test_area)
+        self.setvLabel.setObjectName(u"setvlabel")
+        self.setvLabel.setGeometry(QRect(450, 55, 200, 15))
+        self.setvLabel.setAlignment(Qt.AlignCenter)
+        self.setvLabel.setStyleSheet(text_label_style)
 
-        #self.fw = QLabel(self.test_area)
-        #self.fw.setObjectName(u"fw")
-        #self.fw.setGeometry(QRect(775, 25, 125, 25))
-        #self.fw.setAlignment(Qt.AlignCenter)
-        #self.fw.setStyleSheet(label_style)               
+        self.setv = QLabel(self.test_area)
+        self.setv.setObjectName(u"setv")
+        self.setv.setGeometry(QRect(450, 75, 200, 25))
+        self.setv.setAlignment(Qt.AlignCenter)
+        self.setv.setStyleSheet(label_style)
 
+        self.actvLabel = QLabel(self.test_area)
+        self.actvLabel.setObjectName(u"actvlabel")
+        self.actvLabel.setGeometry(QRect(675, 55, 200, 15))
+        self.actvLabel.setAlignment(Qt.AlignCenter)
+        self.actvLabel.setStyleSheet(text_label_style)
 
+        self.actv = QLabel(self.test_area)
+        self.actv.setObjectName(u"actv")
+        self.actv.setGeometry(QRect(675, 75, 200, 25))
+        self.actv.setAlignment(Qt.AlignCenter)
+        self.actv.setStyleSheet(label_style)  
+             
         frame_style = """
             QFrame {
                 background-image: url("");
@@ -157,14 +161,15 @@ class Ui_MainWindow(object):
                                                              None))
         self.header.setText(QCoreApplication.translate("MainWindow", u"AUTOMOTIVE POWER SIMULATOR", None))
         self.connButton.setText(QCoreApplication.translate("MainWindow", u"CONNECT", None))
-        #self.manuLabel.setText(QCoreApplication.translate("MainWindow", u"MANUFACTURER", None))
-        #self.manu.setText(QCoreApplication.translate("MainWindow", u"---", None))
-        #self.modelLabel.setText(QCoreApplication.translate("MainWindow", u"MODEL", None))
-        #self.model.setText(QCoreApplication.translate("MainWindow", u"---", None))
-        #self.snLabel.setText(QCoreApplication.translate("MainWindow", u"SERIAL NO", None))
-        #self.sn.setText(QCoreApplication.translate("MainWindow", u"---", None))
-        #self.fwLabel.setText(QCoreApplication.translate("MainWindow", u"F/W REV", None))
-        #self.fw.setText(QCoreApplication.translate("MainWindow", u"---", None))
+        self.snLabel.setText(QCoreApplication.translate("MainWindow", u"SERIAL NO", None))
+        self.sn.setText(QCoreApplication.translate("MainWindow", u"---", None))
+        self.fwLabel.setText(QCoreApplication.translate("MainWindow", u"F/W REV", None))
+        self.fw.setText(QCoreApplication.translate("MainWindow", u"---", None))
+        self.powerButton.setText(QCoreApplication.translate("MainWindow", u"POWER OFF", None))
+        self.setvLabel.setText(QCoreApplication.translate("MainWindow", u"VOLTAGE SETPOINT", None))
+        self.setv.setText(QCoreApplication.translate("MainWindow", u"00.00V", None))
+        self.actvLabel.setText(QCoreApplication.translate("MainWindow", u"VOLTAGE MEASURED", None))
+        self.actv.setText(QCoreApplication.translate("MainWindow", u"00.00V", None))
     # retranslateUi