From f1d844f6a3dc188031272ea8afad9d57de4c1b53 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 17 Mar 2026 20:54:00 +0300 Subject: [PATCH] config vals changed --- __pycache__/device_conversion.cpython-310.pyc | Bin 2516 -> 2472 bytes __pycache__/device_conversion.cpython-312.pyc | Bin 3828 -> 0 bytes _device_main.py | 6 +- waveform.json | 652 ++++++++++++++++++ 4 files changed, 655 insertions(+), 3 deletions(-) delete mode 100644 __pycache__/device_conversion.cpython-312.pyc diff --git a/__pycache__/device_conversion.cpython-310.pyc b/__pycache__/device_conversion.cpython-310.pyc index 0d5dd2d7c3353bfd49c02886b47435172e41691a..c3e7df1e1772f4b99660d6254516264a2f091e78 100644 GIT binary patch delta 228 zcmca2yh4~apO=@50SL0DcV_OJ$a|Ibr5unq@pW}T6lY0dadv!3WkISY<1Lor)SR@H z3`Oif*7}b@Evb s8wl5QGC!xACP;gc0*Fur5n3QZ7ewfR2qO?-0wPQ&+cSwzp2}$t0HcmOS^xk5 delta 261 zcmZ1>d_|ZypO=@50SK0E&`Ccqk@qTRx-kfBwsDyFyt@7tXGvmlc6>=?L8>O>EtcZc zoV1k;MeIQJzY6p-@^e%5(^69s^?f}9LiB?YQ!?`dGV)9E^D>j;gG-Z&Q;X6PlT+i1 z5>pb3^xaeQQi~Ex@{8gFoSpQ6Vww2`P{qZ%xrv#1`T>=}kib diff --git a/__pycache__/device_conversion.cpython-312.pyc b/__pycache__/device_conversion.cpython-312.pyc deleted file mode 100644 index c00a69fa83d4e88e4e058f77f1b8cf29e6d5d516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3828 zcmbtXYiL}@6~3?Cy{mobVac)O*GjhBY^+N1>Xo+E+p6n?E=HC_x~08Hn)Pb+T4nBC zTM{d>1XFe!x5yxnR0NfXpi*txnCeGMO&fzLgr-EdHq^cNM?wQekROiqBjC2U=gi%^ zyK-$z-GTY;+?g{oXU=@*oO}Q5@f2`SKKae%=pXDH_YZurij-;WB%!gu5svU{?&%ErEKx2Umb8sFG&cnk_;uW zK<(+UI;zDcYkLMrGqaJur7lOlrSD>Nd+huM?;B5y?8SL0)BjAr|qeVC{@P*g1797dk zJV;~<5fU5`XW)GXwj6!D~ra^AddCs<}~|m0cq@A9X`r^PjLnc3h3~)?}kjM5~AA65@HzUl62d*6681 zaFt@PcVzzE&p)|V{aX9>lP9n*-qg&VZc1a+XYx*qPDFgYEsyO!E#?chJg%+r1%2vp zEIvkjgJIvLs5Ts(@O{6o+Ska*>TSyr;6WIQv-9hA4l%Xo-OauwW0Nj_b=$)>h&qz z+kErrZwG#VT=%wbb!oa+yDP`r@VUD4({)0dWo<-n3H{mx49T41$wjb5)@jjtZm z3%{;AYd)yh?7VR-!`SNErMCxfz4CF%t#Uo^=Evmj`M!@Lcl+P^XhaXZr8~cu?1T+c zeRKWG0k^Mn8kb0+&nckm9ou2rnYR;)<1UX88n9giKn4Pezv3PG}%! z7Vuz)VdRGeb`-r-GafNWnQe}39Y2#W%qPe8SgN&P7{pPK~>KKBst6pZ!DMU z?n5iQ?yk5aSH4_QC~&3t=eQnf!|npV_R#ep7ce(taZNq~ zWuuMaCyAdoPlgdMlTEFIG4_pj(AQz88LEml0{Xe!sq^W^Ilt~YxOh=_Rc%RC|DCn6 zx|tu=dAfmypp_VmJp9F<-fT|qv_1IO#+QHn?%+97p$*=!#o?n?Ge4Eh1aJC8UwwbQ z=@b351$6lqDustYrHbYn(=CgQy34mE`Cdw&2meGp{@q5u2}?5LP_{#!X$sk$_ciug zYP5l9>uxog(yfc#x~pPKs(2|iKAS21)tS%A+h43kb5@NGPyuV6H5$^V7OQmEkuB*6 zQ^UX43_IDp1(7IVCab3sSOY9XPa+_lX)Qtx0{S5PxMCTKVpyWcdd3iTBNXjHQ4`aC z*&m3<@+tFIqm_2SD4JA7&wVKJJilY-c=tn@lU+&aQ(Hk&xMy=Bu+}d4)ZxsEWaaGc rr1+I2@CUx+03H?CdC#LF3Bb+31}!hoAAcnCe8nR>&sXjMm=yUBlO_%v diff --git a/_device_main.py b/_device_main.py index 88c5892..86575c5 100644 --- a/_device_main.py +++ b/_device_main.py @@ -23,18 +23,18 @@ SAVE_POINTS_NUMBER = 1000 # Number of most recent data points kept in memory INITIAL_TEMPERATURE_1 = 28 # Set initial temperature for Laser 1 in Celsius: from -1 to 45 C ?? INITIAL_TEMPERATURE_2 = 29.2 # 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 = 60 # 64.0879 max # Set initial current for Laser 2, in mA +INITIAL_CURRENT_2 = 30 # 64.0879 max # Set initial current for Laser 2, in mA AD9833_FREQ_DEFAULT_KHZ = 1000 AD9833_MCLK_DEFAULT_MHZ = 20.0 DS1809_MAX_STEP = 63 -DS1809_DEFAULT_STEP = 39 +DS1809_DEFAULT_STEP = 43 DS1809_INIT_HOME_PULSES = 64 DS1809_INIT_PULSE_MS = 2 DS1809_INIT_STARTUP_DELAY_S = 0.35 STM32_DAC_VREF = 2.5 STM32_DAC_MAX_CODE = 4095 -PA4_DAC_DEFAULT_VOLT = 0.52 +PA4_DAC_DEFAULT_VOLT = 0.15 AD9102_WAVEFORM_FILE_NAME = "waveform.json" AD9102_WAVEFORM_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), AD9102_WAVEFORM_FILE_NAME) diff --git a/waveform.json b/waveform.json index 45bdf9f..c7dc4f9 100644 --- a/waveform.json +++ b/waveform.json @@ -1,4 +1,656 @@ [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 0, 0, 0,