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

Compare commits

base: Andrey:d1a2b032ecbf9c0a0ff5d343b544f84bb93792c8
Branches Tags
Andrey:main
..
compare: Andrey:e96ca9d3f58f5a461dc19a749bcea686d7b2dee6
Branches Tags
Andrey:main

2 Commits
d1a2b032ec ... e96ca9d3f5

Author SHA1 Message Date
andrey
e96ca9d3f5 Merge branch 'main' of https://git.arktika.cyou/Andrey/ds18b20-MODBUS 2025-07-07 15:14:47 +03:00
andrey
7f8361ae5b comment 2025-07-05 19:32:37 +03:00
2 changed files with 26 additions and 26 deletions
Show Stats Expand all files Collapse all files

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

@ -184,31 +184,31 @@ int main(void)
sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i]; sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i];
MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10; MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
if (sens[i].temperature<sens[i].set_temp-sens[i].hyst) //// if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
////
{ //// {
////
MB_DATA.Coils.coils[0].all|=1<<i; //// MB_DATA.Coils.coils[0].all|=1<<i;
////
} //// }
////
else //// else
////
if (sens[i].temperature>sens[i].set_temp+sens[i].hyst) //// if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
{ //// {
////
MB_DATA.Coils.coils[0].all&=~(1<<i); //// MB_DATA.Coils.coils[0].all&=~(1<<i);
////
} //// }
if(GPIOB11_valve) //// if(GPIOB11_valve)
{ //// {
GPIOB->ODR|=1<<11; //// GPIOB->ODR|=1<<11;
} //// }
else //// else
{ //// {
GPIOB->ODR&=~(1<<11); //// GPIOB->ODR&=~(1<<11);
////
} //// }
} }

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

@ -133,7 +133,7 @@
<UseTargetDll>1</UseTargetDll> <UseTargetDll>1</UseTargetDll>
<UseExternalTool>0</UseExternalTool> <UseExternalTool>0</UseExternalTool>
<RunIndependent>0</RunIndependent> <RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging> <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
<Capability>1</Capability> <Capability>1</Capability>
<DriverSelection>4101</DriverSelection> <DriverSelection>4101</DriverSelection>
</Flash1> </Flash1>