Merge remote-tracking branch 'origin/master'

2024-06-25 00:02:27 +03:00 · 2024-06-25 00:02:27 +03:00 · 7e90f3d56e
commit 7e90f3d56e
parent 398d0df983 dfd38497fd
4 changed files with 3 additions and 3 deletions
--- a/2812.ini
+++ b/2812.ini
@ -39,7 +39,7 @@ AdrFlash2812_Text=$110000
 TimeWait_Value=10
 ESizeBlock_Text=$1000
 AdrFlashXilinx_Text=$130000
-cbPort_Text=
+cbPort_Text=COM1
 cbXilinxTMS3_Checked=True
 cbDisableAutoScan_Checked=False
 lbAddCaption_Caption=Invertor
--- a/setterminal.ini
+++ b/setterminal.ini
@ -6,7 +6,7 @@ PixelsPerInch=96
 MinMaxPos(2560x1440)=-1,-1,-1,-1
 MinMaxPos=-1,-1,-1,-1
 NormPos(2560x1440)=1046,328,1934,974
-NormPos=2302,193,3190,839
+NormPos=1046,328,1934,974
 Visible=0
 MinMaxPos(1536x864)=-1,-1,-1,-1
 NormPos(1536x864)=2302,193,3190,839
--- a/setterminal_test_15.exe
+++ b/setterminal_test_15.exe
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-2024.5.13.183
+2024.6.10.188