diff --git a/.gitignore b/.gitignore
index 75ee371..ffed19e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ JLinkLog.txt
# Other Files
+/john103C6T6/MDK-ARM/john103C6T6.uvoptx
diff --git a/.gitmodules b/.gitmodules
index 52a54f2..56184dd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
[submodule "external_flash_eeprom"]
path = external_flash_eeprom
url = https://git.arktika.cyou/set506/external_flash_eeprom.git
+[submodule "labview_proj"]
+ path = labview_proj
+ url = https://git.arktika.cyou/Andrey/labview_proj.git
+ branch = master
diff --git a/ds18b20.aliases b/ds18b20.aliases
deleted file mode 100644
index c735085..0000000
--- a/ds18b20.aliases
+++ /dev/null
@@ -1,3 +0,0 @@
-[My Computer]
-My Computer = "127.0.0.1"
-
diff --git a/ds18b20.lvlps b/ds18b20.lvlps
deleted file mode 100644
index dd02f3a..0000000
--- a/ds18b20.lvlps
+++ /dev/null
@@ -1,19 +0,0 @@
-[ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "124,868,1361,1826"
-
-[AB_Cache_{C8EBF7D6-657A-4E65-AEE3-B862EABA3F7F}]
-Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{C8EBF7D6-6"
-Cache_Path[Path] Line0002 = "57A-4E65-AEE3-B862EABA3F7F}.txt"
-
-[AB_Cache_{087EE1D5-3790-4A5C-A7A3-C86684E2BE1D}]
-Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{087EE1D5-3"
-Cache_Path[Path] Line0002 = "790-4A5C-A7A3-C86684E2BE1D}.txt"
-
-[AB_Cache_{B7340701-DE2A-44B0-AF07-6C66FF5DCD86}]
-Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{B7340701-D"
-Cache_Path[Path] Line0002 = "E2A-44B0-AF07-6C66FF5DCD86}.txt"
-
-[AB_Cache_{EE6280B4-6A30-4F73-8030-E414CD637626}]
-Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{EE6280B4-6"
-Cache_Path[Path] Line0002 = "A30-4F73-8030-E414CD637626}.txt"
-
diff --git a/ds18b20.lvproj b/ds18b20.lvproj
deleted file mode 100644
index b41ac26..0000000
--- a/ds18b20.lvproj
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
- -
- true
- true
- false
- 0
- My Computer/VI Server
- My Computer/VI Server
- true
- true
- false
-
-
-
-
-
-
- -
-
-
- true
- {40E93CB7-FDA1-4C19-8AE3-0F2342690D29}
- {D4D69FF4-7E4E-46F9-A918-DB8071436980}
- 8002
- true
- {B7340701-DE2A-44B0-AF07-6C66FF5DCD86}
- My DLL
- true
- true
- true
- ../builds/NI_AB_PROJECTNAME/My DLL
- relativeToCommon
- true
- {EE6280B4-6A30-4F73-8030-E414CD637626}
- 1
- 1
- SharedLib.dll
- ../builds/NI_AB_PROJECTNAME/My DLL/SharedLib.dll
- true
- App
- Support Directory
- ../builds/NI_AB_PROJECTNAME/My DLL/data
- 2
- false
- true
- {D40D4CE1-A3D4-4337-A107-D7FF181A1F6A}
- {6BF091CB-5B82-4A69-8232-D98FEA75C60C}
- true
- {6EC34403-A46C-4C4D-AA54-72C2544BDDF7}
- Container
- 0
- /My Computer/termDallas.vi
- TopLevel
- ExportedVI
- 2
- My DLL
- My DLL
- Copyright © 2025
- My DLL
- {FA36A048-F0EF-42EE-B21D-99F1B1A89CD6}
- SharedLib.dll
- true
-
- -
- true
- {6FFBC329-834E-4724-A67C-F272BFAC2E01}
- {5F4A30D2-D400-477F-A778-24EB5FDFA319}
- 8002
- true
- {C8EBF7D6-657A-4E65-AEE3-B862EABA3F7F}
- termDallas
- true
- true
- true
- ../builds/NI_AB_PROJECTNAME/termDallas
- relativeToCommon
- true
- {087EE1D5-3790-4A5C-A7A3-C86684E2BE1D}
- 1
- 1
- Application.exe
- ../builds/NI_AB_PROJECTNAME/termDallas/Application.exe
- true
- App
- Support Directory
- ../builds/NI_AB_PROJECTNAME/termDallas/data
- 2
- {6EC34403-A46C-4C4D-AA54-72C2544BDDF7}
- Container
- 0
- /My Computer/termDallas.vi
- TopLevel
- VI
- /My Computer/gomno.vi
- Run when opened
- false
- Allow debugging
- false
- 2
- VI
- 3
- termDallas
- termDallas
- Copyright © 2025
- termDallas
- {FFC19120-369B-4C06-8250-2488CB234A4F}
- Application.exe
- true
-
-
-
-
diff --git a/john103C6T6/Core/Src/main.c b/john103C6T6/Core/Src/main.c
index 694330d..fa7c706 100644
--- a/john103C6T6/Core/Src/main.c
+++ b/john103C6T6/Core/Src/main.c
@@ -159,20 +159,21 @@ int main(void)
/* USER CODE BEGIN WHILE */
while (1)
{
+
+
if (_debug_init||MB_DATA.Coils.init_param)
{
_debug_init=0;
+
MB_DATA.Coils.init_param=0;
for(int i=0;iRomCnt;i++)
{
sens[i].set_temp=MB_DATA.HoldRegs.set_Temp[i];
sens[i].hyst=MB_DATA.HoldRegs.set_hyst[i];
}
-
- // init_all_T_sense();
- //DS18B20_Search(&DS, &OW);
+
}
diff --git a/john103C6T6/MDK-ARM/john103C6T6.uvprojx b/john103C6T6/MDK-ARM/john103C6T6.uvprojx
index 18165b7..e55070d 100644
--- a/john103C6T6/MDK-ARM/john103C6T6.uvprojx
+++ b/john103C6T6/MDK-ARM/john103C6T6.uvprojx
@@ -17,8 +17,8 @@
STM32F103C6
STMicroelectronics
- Keil.STM32F1xx_DFP.2.4.0
- http://www.keil.com/pack/
+ Keil.STM32F1xx_DFP.2.4.1
+ https://www.keil.com/pack/
IRAM(0x20000000-0x200027FF) IROM(0x8000000-0x8007FFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ
diff --git a/labview_proj b/labview_proj
new file mode 160000
index 0000000..fcba827
--- /dev/null
+++ b/labview_proj
@@ -0,0 +1 @@
+Subproject commit fcba827e91c02c153b61966611c08c5265bf62be
diff --git a/modbus_master.vi b/modbus_master.vi
deleted file mode 100644
index bf731f1..0000000
Binary files a/modbus_master.vi and /dev/null differ
diff --git a/schem.pdsprj b/schem.pdsprj
new file mode 100644
index 0000000..8f72c3a
Binary files /dev/null and b/schem.pdsprj differ
diff --git a/schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace b/schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace
new file mode 100644
index 0000000..90241d0
--- /dev/null
+++ b/schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace
@@ -0,0 +1,37 @@
+
+
+
+ 2c0000000200000003000000ffffffffffffffffffffffffffffffff70f6ffffb1000000bcfeffff07060000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/termDallas.vi b/termDallas.vi
deleted file mode 100644
index 5a15bec..0000000
Binary files a/termDallas.vi and /dev/null differ