Andrey/ds18b20-MODBUS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.arktika.cyou/Andrey/ds18b20-MODBUS

Browse Source
This commit is contained in:
andrey 2025-07-28 21:13:23 +03:00
commit 1c6642fd80
12 changed files with 49 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -45,3 +45,4 @@ JLinkLog.txt
# Other Files
/john103C6T6/MDK-ARM/john103C6T6.uvoptx

4
.gitmodules vendored
View File

@ -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

3
ds18b20.aliases
View File

@ -1,3 +0,0 @@
[My Computer]
My Computer = "127.0.0.1"

19
ds18b20.lvlps
View File

@ -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"

119
ds18b20.lvproj
View File

@ -1,119 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="19008000">
<Item Name="My Computer" Type="My Computer">
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.tcp.enabled" Type="Bool">false</Property>
<Property Name="server.tcp.port" Type="Int">0</Property>
<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
<Property Name="specify.custom.address" Type="Bool">false</Property>
<Item Name="gomno.vi" Type="VI" URL="../../gomno.vi"/>
<Item Name="modbus_master.vi" Type="VI" URL="../modbus_master.vi"/>
<Item Name="modbus_slave.vi" Type="VI" URL="../../HV_Source/modbus_slave.vi"/>
<Item Name="termDallas.vi" Type="VI" URL="../termDallas.vi"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="vi.lib" Type="Folder">
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
<Item Name="Modbus Master.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Modbus/master/Modbus Master.lvclass"/>
<Item Name="Modbus Slave.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Modbus/slave/Modbus Slave.lvclass"/>
<Item Name="SubVIs.lvlib" Type="Library" URL="/&lt;vilib&gt;/Modbus/subvis/SubVIs.lvlib"/>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build">
<Item Name="My DLL" Type="DLL">
<Property Name="App_copyErrors" Type="Bool">true</Property>
<Property Name="App_INI_aliasGUID" Type="Str">{40E93CB7-FDA1-4C19-8AE3-0F2342690D29}</Property>
<Property Name="App_INI_GUID" Type="Str">{D4D69FF4-7E4E-46F9-A918-DB8071436980}</Property>
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{B7340701-DE2A-44B0-AF07-6C66FF5DCD86}</Property>
<Property Name="Bld_buildSpecName" Type="Str">My DLL</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL</Property>
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{EE6280B4-6A30-4F73-8030-E414CD637626}</Property>
<Property Name="Bld_version.build" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">SharedLib.dll</Property>
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL/SharedLib.dll</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL/data</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Dll_compatibilityWith2011" Type="Bool">false</Property>
<Property Name="Dll_delayOSMsg" Type="Bool">true</Property>
<Property Name="Dll_headerGUID" Type="Str">{D40D4CE1-A3D4-4337-A107-D7FF181A1F6A}</Property>
<Property Name="Dll_libGUID" Type="Str">{6BF091CB-5B82-4A69-8232-D98FEA75C60C}</Property>
<Property Name="Dll_privateExecSys" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{6EC34403-A46C-4C4D-AA54-72C2544BDDF7}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/termDallas.vi</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
<Property Name="Source[1].type" Type="Str">ExportedVI</Property>
<Property Name="SourceCount" Type="Int">2</Property>
<Property Name="TgtF_fileDescription" Type="Str">My DLL</Property>
<Property Name="TgtF_internalName" Type="Str">My DLL</Property>
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2025 </Property>
<Property Name="TgtF_productName" Type="Str">My DLL</Property>
<Property Name="TgtF_targetfileGUID" Type="Str">{FA36A048-F0EF-42EE-B21D-99F1B1A89CD6}</Property>
<Property Name="TgtF_targetfileName" Type="Str">SharedLib.dll</Property>
<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
</Item>
<Item Name="termDallas" Type="EXE">
<Property Name="App_copyErrors" Type="Bool">true</Property>
<Property Name="App_INI_aliasGUID" Type="Str">{6FFBC329-834E-4724-A67C-F272BFAC2E01}</Property>
<Property Name="App_INI_GUID" Type="Str">{5F4A30D2-D400-477F-A778-24EB5FDFA319}</Property>
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{C8EBF7D6-657A-4E65-AEE3-B862EABA3F7F}</Property>
<Property Name="Bld_buildSpecName" Type="Str">termDallas</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas</Property>
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{087EE1D5-3790-4A5C-A7A3-C86684E2BE1D}</Property>
<Property Name="Bld_version.build" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">Application.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas/Application.exe</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas/data</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Source[0].itemID" Type="Str">{6EC34403-A46C-4C4D-AA54-72C2544BDDF7}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/termDallas.vi</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
<Property Name="Source[1].type" Type="Str">VI</Property>
<Property Name="Source[2].itemID" Type="Ref">/My Computer/gomno.vi</Property>
<Property Name="Source[2].properties[0].type" Type="Str">Run when opened</Property>
<Property Name="Source[2].properties[0].value" Type="Bool">false</Property>
<Property Name="Source[2].properties[1].type" Type="Str">Allow debugging</Property>
<Property Name="Source[2].properties[1].value" Type="Bool">false</Property>
<Property Name="Source[2].propertiesCount" Type="Int">2</Property>
<Property Name="Source[2].type" Type="Str">VI</Property>
<Property Name="SourceCount" Type="Int">3</Property>
<Property Name="TgtF_fileDescription" Type="Str">termDallas</Property>
<Property Name="TgtF_internalName" Type="Str">termDallas</Property>
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2025 </Property>
<Property Name="TgtF_productName" Type="Str">termDallas</Property>
<Property Name="TgtF_targetfileGUID" Type="Str">{FFC19120-369B-4C06-8250-2488CB234A4F}</Property>
<Property Name="TgtF_targetfileName" Type="Str">Application.exe</Property>
<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
</Item>
</Item>
</Item>
</Project>

7
john103C6T6/Core/Src/main.c
View File

@ -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;i<hdallas.onewire->RomCnt;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);
}

4
john103C6T6/MDK-ARM/john103C6T6.uvprojx
View File

@ -17,8 +17,8 @@
<TargetCommonOption>
<Device>STM32F103C6</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<PackID>Keil.STM32F1xx_DFP.2.4.1</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x200027FF) IROM(0x8000000-0x8007FFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>

1
labview_proj Submodule

@ -0,0 +1 @@
Subproject commit fcba827e91c02c153b61966611c08c5265bf62be

BIN
modbus_master.vi
View File

Binary file not shown.

BIN
schem.pdsprj Normal file
View File

Binary file not shown.

37
schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace Normal file
View File

@ -0,0 +1,37 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<WORKSPACE>
<FRAME activewindow="0">
<PLACEMENT>2c0000000200000003000000ffffffffffffffffffffffffffffffff70f6ffffb1000000bcfeffff07060000</PLACEMENT>
<WINDOW type="default" module="ISIS">
<editor metric="0" gridmajor="2540000" mode="00000001" zoom="0" scale="126" flipped="0" gridminor="254000" gridmode="32" snapidx="1" snap="127000" xcursor="0" orgmode="0" snaprange="100793">
<world y1="-8890000" x1="-12700000" y2="8890000" x2="12700000"/>
<centre x="0" y="0"/>
<origin x="0" y="0"/>
</editor>
</WINDOW>
<WINDOW type="default" module="ARES">
<editor metric="1" gridmajor="10000000" mode="00000000" zoom="-1" scale="82" flipped="0" gridminor="250000" gridmode="32" snapidx="3" snap="250000" xcursor="0" orgmode="0" snaprange="154878">
<world y1="-12700000" x1="-15240000" y2="12700000" x2="15240000"/>
<centre x="0" y="0"/>
<origin x="0" y="0"/>
</editor>
</WINDOW>
</FRAME>
<MODULE name="ARES">
<editor metric="1" gridmajor="10000000" mode="00000000" zoom="-1" scale="82" flipped="0" gridminor="250000" gridmode="32" snapidx="3" snap="250000" xcursor="0" orgmode="0" snaprange="154878">
<world y1="-12700000" x1="-15240000" y2="12700000" x2="15240000"/>
<centre x="0" y="0"/>
<origin x="0" y="0"/>
</editor>
</MODULE>
<MODULE name="ISIS">
<editor metric="0" gridmajor="2540000" mode="00000001" zoom="0" scale="126" flipped="0" gridminor="254000" gridmode="32" snapidx="1" snap="127000" xcursor="0" orgmode="0" snaprange="100793">
<world y1="-8890000" x1="-12700000" y2="8890000" x2="12700000"/>
<centre x="0" y="0"/>
<origin x="0" y="0"/>
</editor>
</MODULE>
<MODULE name="VSMDEBUG">
<PWI/>
</MODULE>
</WORKSPACE>

BIN
termDallas.vi
View File

Binary file not shown.