diff --git a/2HEXto1HEX.vi b/2HEXto1HEX.vi new file mode 100644 index 0000000..a9068e9 Binary files /dev/null and b/2HEXto1HEX.vi differ diff --git a/HV_Source/HV_DC.aliases b/HV_Source/HV_DC.aliases index 214350a..c735085 100644 --- a/HV_Source/HV_DC.aliases +++ b/HV_Source/HV_DC.aliases @@ -1,3 +1,3 @@ [My Computer] -My Computer = "172.20.10.10" +My Computer = "127.0.0.1" diff --git a/HV_Source/HV_DC.lvlps b/HV_Source/HV_DC.lvlps index d7f8bee..6262157 100644 --- a/HV_Source/HV_DC.lvlps +++ b/HV_Source/HV_DC.lvlps @@ -1,13 +1,5 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "25,2,1398,2558" - -[AB_Cache_{B9498801-B55B-48F5-B7A6-9BDB266E1E57}] -Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{B9498801-B" -Cache_Path[Path] Line0002 = "55B-48F5-B7A6-9BDB266E1E57}.txt" - -[AB_Cache_{553E7F42-BE62-4D4B-95CF-935C8F2C4AC0}] -Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{553E7F42-B" -Cache_Path[Path] Line0002 = "E62-4D4B-95CF-935C8F2C4AC0}.txt" +ProjectExplorer.ClassicPosition[String] = "25,2562,1038,4478" [AB_Cache_{50C7CC68-26F2-4705-8883-664DC92C7D72}] Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{50C7CC68-2" @@ -25,3 +17,19 @@ Cache_Path[Path] Line0002 = "EA1-4D33-83FB-FB3BF78D7400}.txt" Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{A3B05A66-7" Cache_Path[Path] Line0002 = "009-43E1-AD40-DB8078A57D61}.txt" +[AB_Cache_{B9498801-B55B-48F5-B7A6-9BDB266E1E57}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{B9498801-B" +Cache_Path[Path] Line0002 = "55B-48F5-B7A6-9BDB266E1E57}.txt" + +[AB_Cache_{553E7F42-BE62-4D4B-95CF-935C8F2C4AC0}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{553E7F42-B" +Cache_Path[Path] Line0002 = "E62-4D4B-95CF-935C8F2C4AC0}.txt" + +[AB_Cache_{DAC39FBA-148A-4B37-8F14-050DFFEC1091}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{DAC39FBA-1" +Cache_Path[Path] Line0002 = "48A-4B37-8F14-050DFFEC1091}.txt" + +[AB_Cache_{7AA2E22F-01BE-4067-A4F7-E7D51319D739}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{7AA2E22F-0" +Cache_Path[Path] Line0002 = "1BE-4067-A4F7-E7D51319D739}.txt" + diff --git a/HV_Source/HV_DC.lvproj b/HV_Source/HV_DC.lvproj index bc31807..3e7a314 100644 --- a/HV_Source/HV_DC.lvproj +++ b/HV_Source/HV_DC.lvproj @@ -19,6 +19,7 @@ + @@ -93,7 +94,7 @@ relativeToCommon true {553E7F42-BE62-4D4B-95CF-935C8F2C4AC0} - 1 + 7 1 HV_modbus.exe ../builds/NI_AB_PROJECTNAME/HV_modbus/HV_modbus.exe @@ -275,6 +276,56 @@ EXE 2 + + true + {768E255D-4594-41B7-88F9-208AED832645} + {898FC03E-C8A8-4379-9348-F894FE355049} + 8002 + true + {DAC39FBA-148A-4B37-8F14-050DFFEC1091} + testDCDC + true + true + true + ../builds/NI_AB_PROJECTNAME/testDCDC + relativeToCommon + true + {7AA2E22F-01BE-4067-A4F7-E7D51319D739} + 2 + 1 + Application.exe + ../builds/NI_AB_PROJECTNAME/testDCDC/Application.exe + true + App + Support Directory + ../builds/NI_AB_PROJECTNAME/testDCDC/data + 2 + {D2B5230F-5355-4100-916D-834843A38F2D} + Container + 0 + /My Computer/testDCDC.vi + TopLevel + VI + /My Computer/Chang_ID.vi + Run when opened + false + Allow debugging + false + Window run-time position + Centered + Show Abort button + false + 4 + VI + 3 + testDCDC + testDCDC + Copyright © 2025 + testDCDC + {0462912A-7C0B-42AE-9AB8-4B6CB0323EE4} + Application.exe + true + diff --git a/HV_Source/HV_ONCE_VI.vi b/HV_Source/HV_ONCE_VI.vi index 1d5de03..ebbca7a 100644 Binary files a/HV_Source/HV_ONCE_VI.vi and b/HV_Source/HV_ONCE_VI.vi differ diff --git a/HV_Source/HV_modbus.vi b/HV_Source/HV_modbus.vi index b3d2cbc..9e1ae5a 100644 Binary files a/HV_Source/HV_modbus.vi and b/HV_Source/HV_modbus.vi differ diff --git a/ID_Parse_array.vi b/ID_Parse_array.vi new file mode 100644 index 0000000..77da8b3 Binary files /dev/null and b/ID_Parse_array.vi differ diff --git a/MBslave.vi b/MBslave.vi new file mode 100644 index 0000000..7d5fcf1 Binary files /dev/null and b/MBslave.vi differ diff --git a/SLCan_whithDLL/main_project.vi b/SLCan_whithDLL/main_project.vi index 84a6b5e..a00a264 100644 Binary files a/SLCan_whithDLL/main_project.vi and b/SLCan_whithDLL/main_project.vi differ diff --git a/SLCan_whithDLL/setup.ini b/SLCan_whithDLL/setup.ini index 056b8a0..a7e50e4 100644 --- a/SLCan_whithDLL/setup.ini +++ b/SLCan_whithDLL/setup.ini @@ -1,21 +1,35 @@ -; Настройки для COM-порта (RS232) -[RS232] -Port = COM3 +[RS485] +Port = COM10 Baud Rate = 115200 Data Bits = 8 Parity = None Stop Bits = 1.0 Flow Control = None -VISA Timeout = 10000 -; Настройки для CAN интерфейса +VISA Timeout = 10000 ;ms +Pool_Period = 100 ;ms +; Настройки для COM-порта (RS232) + +[RS232] +Port = COM3 +Baud Rate = 256000 +Data Bits = 8 +Parity = None +Stop Bits = 1.0 +Flow Control = None +VISA Timeout = 10000 +Pool_Period = 100 + + + +; Настройки для CAN интерфейса [CAN] -Interface = PCIe-8512/2 -Channel = 0 -Baud Rate = 1000 +Interface = COM3 +Baud Rate = 125000 Mode = Normal -Request Timeout = 5000 +Request Timeout = 1000 +Pool_Period = 100 ; Общие настройки устройства [Device] diff --git a/SLCan_whithDLL/slcan.lvlps b/SLCan_whithDLL/slcan.lvlps index 9bf3c6f..673c945 100644 --- a/SLCan_whithDLL/slcan.lvlps +++ b/SLCan_whithDLL/slcan.lvlps @@ -1,3 +1,11 @@ [ProjectWindow_Data] ProjectExplorer.ClassicPosition[String] = "124,868,1361,1826" +[AB_Cache_{3835E405-88A3-4212-9B6E-7266CC448AFE}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{3835E405-8" +Cache_Path[Path] Line0002 = "8A3-4212-9B6E-7266CC448AFE}.txt" + +[AB_Cache_{BA397D79-160D-47FD-BE44-F3D9625C069F}] +Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{BA397D79-1" +Cache_Path[Path] Line0002 = "60D-47FD-BE44-F3D9625C069F}.txt" + diff --git a/SLCan_whithDLL/slcan.lvproj b/SLCan_whithDLL/slcan.lvproj index ef5102d..02f7bda 100644 --- a/SLCan_whithDLL/slcan.lvproj +++ b/SLCan_whithDLL/slcan.lvproj @@ -10,6 +10,7 @@ true true false + @@ -21,14 +22,104 @@ + + + + + + + + + + + + + + + true + {F2DB1C2F-CAF2-45BF-9774-4049D597BE7A} + {3B8F1204-E8D5-4632-9BED-BEC130405D7D} + 8002 + true + {3835E405-88A3-4212-9B6E-7266CC448AFE} + can_emul + true + true + true + ../builds/NI_AB_PROJECTNAME/can_emul + relativeToCommon + true + {BA397D79-160D-47FD-BE44-F3D9625C069F} + 2 + 1 + Application.exe + ../builds/NI_AB_PROJECTNAME/can_emul/Application.exe + true + App + Support Directory + ../builds/NI_AB_PROJECTNAME/can_emul/data + 2 + {2C8D615D-E4AF-45AD-90D6-9D683FD17060} + Container + 0 + /My Computer/can_emul.vi + Run when opened + false + Show Abort button + false + 2 + TopLevel + VI + 2 + can_emul + can_emul + Copyright © 2025 + can_emul + {82DA886D-3FBC-4151-BBD2-758DC241526A} + Application.exe + true + + + slcan + {3912416A-D2E5-411B-AFEE-B63654D690C0} + {720894C3-9D7A-4BAE-87CF-DD5304BF681D} + userFolder + 1 + _full_ + {40E94E09-5021-4F5B-A371-8C3442FFBF61} + NI-VISA .NET Runtime 19.0 + {33687859-DC67-437F-A652-689B14A1C74C} + _full_ + {EB028BCB-55AB-42F8-B58D-61CD49C3616B} + NI-VISA .NET Runtime 24.5 + {33687859-DC67-437F-A652-689B14A1C74C} + 2 + true + ../builds/slcan/canemul + relativeToCommon + canemul + {720894C3-9D7A-4BAE-87CF-DD5304BF681D} + install.exe + slcan + 1.0.4 + 32-bit + 19008005 + {99006B12-2A41-478B-BEE6-E9EA3D26240C} + true + 3 + {C6A267DC-B94F-4F89-90E6-1128E4D8B440} + Software + {DDFAFC8B-E728-4AC8-96DE-B920EBB97A86} + 2 + 1 + - diff --git a/builds/ds18b20/can_emul/niwebserver.conf b/builds/ds18b20/can_emul/niwebserver.conf deleted file mode 100644 index 5855364..0000000 --- a/builds/ds18b20/can_emul/niwebserver.conf +++ /dev/null @@ -1,30 +0,0 @@ -NI.AddLVRouteVars -ErrorLog "$LVSERVER_ROOT/logs/error.log" - -Listen 8000 - -NI.ServerName default -DocumentRoot "$LVSERVER_ROOT/../../www" -TypesConfig "$LVSERVER_ROOT/mime.types" -DirectoryIndex index.html -WorkerLimit 10 -InactivityTimeout 60 - -LoadModulePath "$LVSERVER_ROOT/..;$LVSERVER_ROOT/modules;$LVSERVER_ROOT/LVModules" -LoadModule LVAuth lvauthmodule -LoadModule LVSnapshot lvsnapshotmodule -LoadModule LVRFP lvrfpmodule - -# -# Pipeline definition -# - -SetConnector netConnector - -AddHandler LVAuth -AddHandler LVSnapshot snap -AddHandler LVRFP - -AddHandler fileHandler "" - -AddOutputFilter chunkFilter diff --git a/builds/ds18b20/can_emul/Сan_emul.aliases b/builds/ds18b20/can_emul/Сan_emul.aliases deleted file mode 100644 index f1f7c69..0000000 --- a/builds/ds18b20/can_emul/Сan_emul.aliases +++ /dev/null @@ -1,2 +0,0 @@ -[My Computer] -My Computer="localhost" \ No newline at end of file diff --git a/builds/ds18b20/can_emul/Сan_emul.exe b/builds/ds18b20/can_emul/Сan_emul.exe deleted file mode 100644 index 2e20ece..0000000 Binary files a/builds/ds18b20/can_emul/Сan_emul.exe and /dev/null differ diff --git a/builds/ds18b20/can_emul/Сan_emul.ini b/builds/ds18b20/can_emul/Сan_emul.ini deleted file mode 100644 index 31fd3e8..0000000 --- a/builds/ds18b20/can_emul/Сan_emul.ini +++ /dev/null @@ -1,12 +0,0 @@ -[an_emul] -server.app.propertiesEnabled=True -server.ole.enabled=True -server.tcp.paranoid=True -server.tcp.serviceName="My Computer/VI Server" -server.vi.callsEnabled=True -server.vi.propertiesEnabled=True -WebServer.TcpAccess="c+*" -WebServer.ViAccess="+*" -DebugServerEnabled=False -DebugServerWaitOnLaunch=False - diff --git a/can_emul.vi b/can_emul.vi index 03dd910..47e5df9 100644 Binary files a/can_emul.vi and b/can_emul.vi differ diff --git a/chek_TempSens.vi b/chek_TempSens.vi new file mode 100644 index 0000000..994178b Binary files /dev/null and b/chek_TempSens.vi differ diff --git a/config.vi b/config.vi new file mode 100644 index 0000000..463bdd8 Binary files /dev/null and b/config.vi differ diff --git a/modbusTempSens/ds18b20.aliases b/modbusTempSens/ds18b20.aliases index c735085..214350a 100644 --- a/modbusTempSens/ds18b20.aliases +++ b/modbusTempSens/ds18b20.aliases @@ -1,3 +1,3 @@ [My Computer] -My Computer = "127.0.0.1" +My Computer = "172.20.10.10" diff --git a/modbusTempSens/ds18b20.lvlps b/modbusTempSens/ds18b20.lvlps index bc61e98..ca4de99 100644 --- a/modbusTempSens/ds18b20.lvlps +++ b/modbusTempSens/ds18b20.lvlps @@ -1,5 +1,5 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "203,1325,1440,2283" +ProjectExplorer.ClassicPosition[String] = "37,2564,1050,4480" [AB_Cache_{08AB8A94-90CD-40E4-935C-008DDA1AE127}] Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{08AB8A94-9" diff --git a/modbusTempSens/ds18b20.lvproj b/modbusTempSens/ds18b20.lvproj index d991bf8..582cf48 100644 --- a/modbusTempSens/ds18b20.lvproj +++ b/modbusTempSens/ds18b20.lvproj @@ -10,20 +10,23 @@ true true false + + + - - + + @@ -31,6 +34,9 @@ + + + @@ -38,7 +44,10 @@ + + + 3 diff --git a/modbusTempSens/modbus_master.vi b/modbusTempSens/modbus_master.vi index 4e6a693..e8a40c5 100644 Binary files a/modbusTempSens/modbus_master.vi and b/modbusTempSens/modbus_master.vi differ diff --git a/poll_china_DI_DO.vi b/poll_china_DI_DO.vi new file mode 100644 index 0000000..965d566 Binary files /dev/null and b/poll_china_DI_DO.vi differ diff --git a/termDallas.vi b/termDallas.vi index 5a15bec..7a3e9a2 100644 Binary files a/termDallas.vi and b/termDallas.vi differ