From aeb3d90aec7f214f14bdcef94905bb0c0ba80dfc Mon Sep 17 00:00:00 2001
From: Theodor Chikin <feda012045@gmail.com>
Date: Wed, 22 Oct 2025 18:11:34 +0300
Subject: [PATCH] completely working!

---
 __pycache__/device_commands.cpython-312.pyc   | Bin 16840 -> 16929 bytes
 __pycache__/device_conversion.cpython-312.pyc | Bin 3853 -> 3849 bytes
 .../device_interaction.cpython-312.pyc        | Bin 6710 -> 6717 bytes
 __pycache__/gui.cpython-312.pyc               | Bin 14651 -> 14672 bytes
 _device_main.py                               |  16 +++++------
 device_commands.py                            |  25 +++++++++---------
 device_conversion.py                          |   2 +-
 device_interaction.py                         |  18 ++++++++++++-
 gui.py                                        |   4 ++-
 9 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/__pycache__/device_commands.cpython-312.pyc b/__pycache__/device_commands.cpython-312.pyc
index 160d46cad2ed9b07f6650f45d22ef264fbe4bc3f..32f04092652726e254056899b0c24dd2ce433830 100644
GIT binary patch
delta 202
zcmX@n%($?Hk?%AwFBbz47`^|Ik!!G#k6D`O7sKRKiK5A^(){9TC5#|R5J+KO4P`Sj
zOujE+!c@sRd9AcQGh3D8<cX4olLch#MXH2~Qj=3N%Tn_cQW8rN6>?JZtS0-*1T!X0
zUMyoHc!z`c0-w?X=jFZ&eHZ&*;V{{JU&e-!ao1)Uxi}`q1DmTAVz?NuZ@!^r#KFk9
vncLWgg;8U(hxtAhMu*AlHrE-QHs80Iz{qI7xxmhlnU$MS^pn!$WsXV!JOw)X

delta 152
zcmZ43!g!*Yk?%AwFBbz4Tzvf_qey=vAG0*mF^0*h5=E0+rTHa!N*F<sAdtem8p>v5
zsAQS^P+Fgnb+VvL(d6ke!Hj{EU(48Rwve@9WZb#AR4$H*asTEk3Nc)a*ESn!8*wml
wY)&z@VPRC?ywH3f3#0wy1e@!Oj+-rPConSFZ9Zvd$jr*cDEdiZ@_$Dq04y~stN;K2

diff --git a/__pycache__/device_conversion.cpython-312.pyc b/__pycache__/device_conversion.cpython-312.pyc
index 045b8734f355842e90bcd2651247234ed4bb9c11..0780389f816b29ea1c6ef935d38646073bddcf88 100644
GIT binary patch
delta 834
zcmZva&ubG=5XbkeyXM!vRBbo1R@c=2psU5SsjWpDLkKD6V1-Z%dfB3u7-+IGn~3z1
zA|ggqkoOPRV~(XBMRHT|CL*%vO%Oql;z3aaXLcKf;yZla%-ipGXWnBTm@SjP;yfzh
zN`L)v?b###T>VVx#)q?PLc^df0mltugisgzF>oonEq#-j+8<~_A{8|@9eGLCN$&A0
zPVI)hVCU_+W6#5g_^3Q(d~;oGGS(*sLdj+?%B(OLxWOU9LBauoN$4j~F>lw3Q*J9T
zOb0`RLBbJ)t00oN{2u=nou{IC7{iaGcON3wq<7)S{h`+GyN#B%mU}Ncp(f*ET{XnT
z@Ye7sN-B@<FbOP-%GTJz^)KJkS)c;ow;BRNI1zoET7sj5V~8Cc><O-2xLLQin@Ec%
zkyR{|ioU$uhlbVO0)PWa5-vl%QY$Bm8PMr}352D<Vca~WR4U9tl8y)HSoT=ae*ss<
zw0q&WU#@6ZbHOuDi%YR3ELP)&coRE0x|ggh@G<fQ@6@&VEmm_dBPO*$-!>`kY5R1t
zwV9_j>`JZfZX3mhmS7q2LNf#9)TdwVt=H#%XW<mefjn>;(bZ$<_4xf=m|6^8V-d3A
zJP-V{iT~R~hwCgS-g2`^!)GP@8TdCQo?J=?v$11dPEZ3AgmFTOaGc;z?g&LR5RfKJ
p6J`h*LY9yt_}2)gz6bN4;n}KlwXw2%2J+%oJi{WQ6E7+x_yaz_w5b39

delta 890
zcmaizF-#Lt7{~7&S6X_#S}C9vX-|<zEefSxD%zG-Qe#6PrlC!ojs!_lgw}j5#xRJ3
zA?aYEc?*dlVR7h&>EOcPW{e9s=}m4fF2un^W8(L{lS){8$@{(6cmMDIeedpTBls++
zeb6+wgyYrDNa^hh?Oj(XMx&KTzy5riMOA#%l)!@vkPbQzaSAszC*rB}U1pAcThqxS
z?m+9lJTLc>+|m}Rm51h>Ic3(X<}3{HFUl_Sw6+}UjQRP1Q(x#tS=a@qae=dhenNmS
zKsZC_Ls%Wl)lyS|3v@6@I8Qi-s3`~?hp4fgbe57%L4<ERUosEhas+t6b+B|1#pUe{
zCc!Z7O5u^Y2j6~-PXd{MD90(vu{!e6F-y)*;Jk)2F3Nx~$u1#|W%b!t%|5D|e-lUf
zPS+YHj=0~?_%UG3p9QFbPQpc~mn$VbmxLbj>qUeW2;yQX`F!>kgy>kOW7%RkaqF6l
zKk1S@qxLX^7u9)mf1}<R_K}X+B1R(nMR-L?IlG>f48-}UXAnb{v>4y;bWc-QlUa^c
zvs|gyjs)6wDa48~JGKZ3l-|HuJBfHAeNuhTjYe|Q*jM#EMF-(&eErot_&D=>5++at
z<PO&<=7{qNQBuJu9vY|kv=$UKCD#8N7H@~8(Kkch|LVEgNNf)6tD!w5B$_eYXMeDE
zYvDH>xBKZ>kHydk#-zK*QQBT1TqcNiAEI4^5G5FdIDuXYqzGw(xN!Tg^3#=Asoq;%
TUQEGF{@9yjD&O_y6ng##<6^>h

diff --git a/__pycache__/device_interaction.cpython-312.pyc b/__pycache__/device_interaction.cpython-312.pyc
index f77ecace7f8ef9b5aa48eebd4cee5932089829b0..b45b308766f13c73ef1f08778d2639853ca5ed8d 100644
GIT binary patch
delta 119
zcmV--0Eqv#G`%zq%MA?*00000GVl0k>=2O-7y(w1CnW+20I^J%0|6bg<pT}_0Y$U)
z1~LKxPqQZpt^xsBv(^jA0s&>SpbiHD0dcda5IO__eY4{fAp!w>vjrDi0s)VcVi}47
ZMw9Is8Vv9V4FLr59324<@=%iw8Yn<MBIy7C

delta 111
zcmV-#0FeK^G`2Jj%MA?*00000$?N!NdJmBf7y(p~Cnd2?m;(V2v*!a20|7O&_69Nn
z0Y9@T39bSGNwe4s$pQgYv!V_M0s&#Ost`H^0d2G86d?iuY_kU!Tmk`qlVll+0YQ`R
R85#%j3LOCt@=B8x8YpjOAz%Oi

diff --git a/__pycache__/gui.cpython-312.pyc b/__pycache__/gui.cpython-312.pyc
index 358baf799e16532bb9316d96036c91bb55fc3342..e8e9f4bca26699c49025b66b98c8ce034c46eb19 100644
GIT binary patch
delta 107
zcmV-x0F?i`a?o-O%MA?*000001Mv80;js-B1_4u(UjrqRNCprWGB7PMFfbs{ywJMQ
zfh-`=h|sXmvmi0ETn3Z^0X(zu2%Q`OMYE431rGtdvz0WU0}lTH008g<0RaK?2mk>a
NlR-F$0cexTIC0d`B$ogH

delta 86
zcmcamw7ZD+G%qg~0}yCF{gKhPkyn(B(P45tv+86IHUSnxT|<M-`D{~|7_Bz5aL$!s
pbl$v3m6e}y*X9)_3z&KS0=0c$W@Kc1%pf&6%%X!abn<<RLI6!j8J7S6

diff --git a/_device_main.py b/_device_main.py
index 5e12a07..a1e5f47 100644
--- a/_device_main.py
+++ b/_device_main.py
@@ -1,4 +1,4 @@
-from FreeSimpleGUI import TIMEOUT_KEY, WIN_CLOSED
+from FreeSimpleGUI  import TIMEOUT_KEY, WIN_CLOSED
 import json
 import math
 import socket
@@ -18,10 +18,10 @@ GUI_TIMEOUT_INTERVAL = 5#505 - dev.WAIT_AFTER_SEND*1000 # GUI refresh time in mi
 
 SAVE_POINTS_NUMBER = 1000 # Number of most recent data points kept in memory
 
-INITIAL_TEMPERATURE_1 = 22.40 # Set initial temperature for Laser 1 in Celsius: from -1 to 45 C ??
-INITIAL_TEMPERATURE_2 = 16.70 # Set initial temperature for Laser 2 in Celsius: from -1 to 45 C ??
-INITIAL_CURRENT_1 = 32.0 # 64.0879 max # Set initial current for Laser 1, in mA
-INITIAL_CURRENT_2 = 32.0 # 64.0879 max # Set initial current for Laser 2, in mA
+INITIAL_TEMPERATURE_1 = 28 # Set initial temperature for Laser 1 in Celsius: from -1 to 45 C ??
+INITIAL_TEMPERATURE_2 = 28.9 # Set initial temperature for Laser 2 in Celsius: from -1 to 45 C ??
+INITIAL_CURRENT_1 = 33 # 64.0879 max # Set initial current for Laser 1, in mA
+INITIAL_CURRENT_2 = 35 # 64.0879 max # Set initial current for Laser 2, in mA
 
 #### ---- Functions
 
@@ -62,17 +62,17 @@ def set_initial_params():
     params['Min_Temp_1'] = INITIAL_TEMPERATURE_1
     params['Max_Temp_1'] = 28
     params['Min_Current_1'] = INITIAL_CURRENT_1
-    params['Max_Current_1'] = 50.0
+    params['Max_Current_1'] = 70.0 #50
     params['Delta_Temp_1'] = 0.05
     params['Delta_Current_1'] = 0.05
     params['Min_Temp_2'] = INITIAL_TEMPERATURE_2
     params['Max_Temp_2'] = 28
     params['Min_Current_2'] = INITIAL_CURRENT_2
-    params['Max_Current_2'] = 50.0
+    params['Max_Current_2'] = 60 # 50
     params['Delta_Temp_2'] = 0.05
     params['Delta_Current_2'] = 0.05
     params['Delta_Time'] = 50
-    params['Tau'] = 3
+    params['Tau'] = 10
     return params
 
 def update_data_lists():
diff --git a/device_commands.py b/device_commands.py
index e839576..741743a 100644
--- a/device_commands.py
+++ b/device_commands.py
@@ -173,6 +173,7 @@ def get_DATA(prt):
     print("Received "+str(prt.inWaiting())+" bytes.\n")
     if prt.inWaiting()!=GET_DATA_TOTAL_LENGTH:
         print("Error. Couldn't get DATA data.")
+        print("receiven data len:", prt.inWaiting())
         return None
 
     out_bytes = prt.read(GET_DATA_TOTAL_LENGTH)
@@ -324,18 +325,18 @@ def decode_DATA(dh):
     data = {}
     data['datetime']   = datetime.now()
     data['Header']     = get_word(dh, 0)
-    data['I1']         = cnv.conv_I_N_to_mA(get_int_word(dh, 1))
-    data['I2']         = cnv.conv_I_N_to_mA(get_int_word(dh, 2))
-    data['TO_LSB']     = get_int_word(dh, 3)
-    data['TO_MSB']     = get_int_word(dh, 4)
-    data['Temp_1']     = cnv.conv_T_N_to_C(get_int_word(dh, 5))
-    data['Temp_2']     = cnv.conv_T_N_to_C(get_int_word(dh, 6))
-    data['Temp_Ext_1'] = cnv.conv_TExt_N_to_C(get_int_word(dh, 7))
-    data['Temp_Ext_2'] = cnv.conv_TExt_N_to_C(get_int_word(dh, 8))
-    data['MON_3V3']    = cnv.conv_U3V3_N_to_V(get_int_word(dh, 9))
-    data['MON_5V1']    = cnv.conv_U5V_N_to_V(get_int_word(dh, 10))
-    data['MON_5V2']    = cnv.conv_U5V_N_to_V(get_int_word(dh, 11))
-    data['MON_7V0']    = cnv.conv_U7V_N_to_V(get_int_word(dh, 12))
+    data['I1']         = cnv.conv_I_N_to_mA(get_int_word(dh, 1)) #LD1_param.POWER
+    data['I2']         = cnv.conv_I_N_to_mA(get_int_word(dh, 2)) #LD2_param.POWER
+    data['TO_LSB']     = get_int_word(dh, 3) #TO6_counter_LSB
+    data['TO_MSB']     = get_int_word(dh, 4) #TO6_counter_MSB
+    data['Temp_1']     = cnv.conv_T_N_to_C(get_int_word(dh, 5)) #LD1_param.LD_CURR_TEMP
+    data['Temp_2']     = cnv.conv_T_N_to_C(get_int_word(dh, 6)) #LD2_param.LD_CURR_TEMP
+    data['Temp_Ext_1'] = cnv.conv_TExt_N_to_C(get_int_word(dh, 7)) #U_Rt1_ext_Gain
+    data['Temp_Ext_2'] = cnv.conv_TExt_N_to_C(get_int_word(dh, 8)) #U_Rt2_ext_Gain
+    data['MON_3V3']    = cnv.conv_U3V3_N_to_V(get_int_word(dh, 9)) #3V_monitor
+    data['MON_5V1']    = cnv.conv_U5V_N_to_V(get_int_word(dh, 10)) #5V1_monitor
+    data['MON_5V2']    = cnv.conv_U5V_N_to_V(get_int_word(dh, 11)) #5V2_monitor
+    data['MON_7V0']    = cnv.conv_U7V_N_to_V(get_int_word(dh, 12)) #7V_monitor
     data['Message_ID'] = get_word(dh, 13) # Last received command
     data['CRC']        = get_word(dh, 14)
 
diff --git a/device_conversion.py b/device_conversion.py
index 25e582b..947b5a9 100644
--- a/device_conversion.py
+++ b/device_conversion.py
@@ -13,7 +13,7 @@ R4 = 30000 # Ohm
 R5 = 27000 # Ohm
 R6 = 56000 # Ohm
 
-RREF = 28.7 # Ohm (current-setting resistor) @1550 nm - 28.7 Ohm; @840 nm - 10 Ohm
+RREF = 10 # Ohm (current-setting resistor) @1550 nm - 28.7 Ohm; @840 nm - 10 Ohm
 
 R7 = 22000 # Ohm
 R8 = 22000 # Ohm
diff --git a/device_interaction.py b/device_interaction.py
index 92084c6..6e2cb78 100644
--- a/device_interaction.py
+++ b/device_interaction.py
@@ -12,7 +12,20 @@ WAIT_AFTER_SEND = 0.15 # Wait after sending command, before requesting input (in
 
 
 #### ---- High-level port commands
-
+'''
+def create_port_connection():
+    prt = None
+    for port, _, _ in sorted(cmd.list_ports.comports()):
+        try:
+            prt = cmd.setup_port_connection(port=port, baudrate=115200, timeout_sec=1)
+            cmd.open_port(prt)
+            reset_port_settings(prt)
+        except:
+            prt.close()
+            continue
+        break
+    return prt
+'''
 def create_port_connection():
     prt = None
     print()
@@ -44,6 +57,9 @@ def create_port_connection():
         break
     return prt
 
+
+
+
 # def setup_connection():
 #     prt = cmd.setup_port_connection()
 #     cmd.open_port(prt)
diff --git a/gui.py b/gui.py
index df3084c..119ba16 100644
--- a/gui.py
+++ b/gui.py
@@ -1,4 +1,6 @@
+#from Tools.scripts.highlight import default_html
 
+#default_html
 import FreeSimpleGUI as sg
 
 #### ---- GUI Constants
@@ -28,7 +30,7 @@ SET_DELTA_TEMPERATURE_TEXT_2 = 'Шаг дискретизации темпера
 SET_MIN_CURRENT_TEXT_2 = 'Мнимальный ток лазера 2 (мА):'
 SET_MAX_CURRENT_TEXT_2 = 'Максимальный ток лазера 2 (мА):'
 SET_DELTA_CURRENT_TEXT_2 = 'Шаг дискретизации тока лазера 2 (0.002-0.5 мА):'
-SET_DELTA_T_TEXT = 'Шаг дискретизации времени (1-100 мкс):'
+SET_DELTA_T_TEXT = 'Шаг дискретизации времени (20-100 мкс, шаг 10 мкс):'
 SET_TAU_T_TEXT = 'Время задержки (3-10мс):'
 SET_TEXT_WIDTH_NEW = 40