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

Compare commits

base: Andrey:4b81c71275e484cc0618e4f48f5bd6c8e3dc82af
Branches Tags
Andrey:main
...
compare: Andrey:a59091bfbd918f68301f773fcaec29d1d451346c
Branches Tags
Andrey:main

2 Commits
4b81c71275 ... a59091bfbd

Author SHA1 Message Date
andrey
a59091bfbd merge 2025-06-26 18:41:55 +03:00
andrey
becb211c76 add var LOST_SENS_CNT 2025-06-26 18:35:54 +03:00
10 changed files with 168 additions and 16 deletions
Show Stats Expand all files Collapse all files

3
ds18b20.aliases Normal file
View File

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

19
ds18b20.lvlps Normal file
View File

@ -0,0 +1,19 @@
[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 Normal file
View File

@ -0,0 +1,119 @@
<?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>

2
john103C6T6/Core/Inc/dallas_tools.h
View File

@ -107,8 +107,10 @@ struct _SensorHandleStruct
unsigned isConnected:1; ///< Флаг соединения
unsigned isInitialized:1; ///< Флаг инициализации
unsigned isLost:1; ///< Флаг потери связи
uint16_t lost_cnt;
DALLAS_FlagsTypeDef f; ///< Флаги
float set_temp;
int hyst;

4
john103C6T6/Core/Inc/ow_port.h
View File

@ -23,14 +23,14 @@
* @brief Порт вывода для шины 1-Wire.
* @details Указывает порт GPIO, к которому подключена линия данных 1-Wire (например, для DS18B20).
*/
#define OW_GPIO_Port GPIOA
#define OW_GPIO_Port GPIOB
/**
* @def OW_Pin_Numb
* @brief Номер пина в порту OW_GPIO_Port.
* @details Используется для формирования маски пина и настройки ввода/вывода.
*/
#define OW_Pin_Numb 1
#define OW_Pin_Numb 9
/**
* @def OW_Pin

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

@ -121,7 +121,7 @@ int main(void)
/* USER CODE BEGIN 2 */
led_blink(GPIOC,GPIO_PIN_13,rest_iter,reset_blink_delay);
MODBUS_FirstInit();
MODBUS_FirstInit();
uint8_t uart_byte = 0;
RS_Receive_IT(&hmodbus1, &MODBUS_MSG);
Dallas_BusFirstInit(&htim1);
@ -131,16 +131,16 @@ int main(void)
for ( int i=0; i<hdallas.onewire->RomCnt;i++)
{
// Èíèöèàëèçàöèÿ ïî ROM-àäðåñó
//sens[i].Init.init_func = &Dallas_SensorInitByROM;
// sens[i].Init.InitParam.ROM = rom_address;
sens[i].Init.InitParam.Ind = i;
sens[i].Init.init_func = &Dallas_SensorInitByInd;
sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS;
//sens[i].Init.init_func = &Dallas_SensorInitByROM;
// sens[i].Init.InitParam.ROM = rom_address;
sens[i].Init.InitParam.Ind = i;
sens[i].Init.init_func = &Dallas_SensorInitByInd;
sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS;
MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
sens[i].hyst =3;
Dallas_AddNewSensors(&hdallas, &sens[i]);
Dallas_AddNewSensors(&hdallas, &sens[i]);
}
}
/* USER CODE END 2 */
/* Infinite loop */
@ -161,11 +161,16 @@ int main(void)
}
init=MB_DATA.Coils.init_param;
Dallas_StartConvertTAll(&hdallas,DALLAS_WAIT_BUS,0);
for(int i=0;i<hdallas.onewire->RomCnt;i++)
{
if(sens[i].isLost)
{
sens[i].lost_cnt ++;
}
Dallas_ReadTemperature(&sens[i]);
sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i];
MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
@ -173,7 +178,7 @@ int main(void)
if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
{
GPIOC->ODR|=1<<13;
MB_DATA.Coils.coils.all|=1<<i;
}
@ -182,9 +187,10 @@ int main(void)
if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
{
GPIOC->ODR&=~(1<<13);
MB_DATA.Coils.coils.all&=~(1<<i);
}
}

10
john103C6T6/MDK-ARM/john103C6T6.uvoptx
View File

@ -153,7 +153,7 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>sens</ItemText>
<ItemText>sens,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
@ -260,6 +260,10 @@
<Name>System Viewer\GPIOA</Name>
<WinId>35904</WinId>
</Entry>
<Entry>
<Name>System Viewer\GPIOB</Name>
<WinId>35900</WinId>
</Entry>
<Entry>
<Name>System Viewer\IWDG</Name>
<WinId>35905</WinId>
@ -365,7 +369,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Core\Src\ow_port.c</PathWithFileName>
@ -389,7 +393,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Modbus\modbus.c</PathWithFileName>

1
labview_john/labview_proj

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

BIN
modbus_master.vi Normal file
View File

Binary file not shown.

BIN
termDallas.vi Normal file
View File

Binary file not shown.