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

Compare commits

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

No commits in common. "e96ca9d3f58f5a461dc19a749bcea686d7b2dee6" and "d1a2b032ecbf9c0a0ff5d343b544f84bb93792c8" have entirely different histories.
e96ca9d3f5 ... d1a2b032ec

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];
MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
//// if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
////
//// {
////
//// MB_DATA.Coils.coils[0].all|=1<<i;
////
//// }
////
//// else
////
//// if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
//// {
////
//// MB_DATA.Coils.coils[0].all&=~(1<<i);
////
//// }
//// if(GPIOB11_valve)
//// {
//// GPIOB->ODR|=1<<11;
//// }
//// else
//// {
//// GPIOB->ODR&=~(1<<11);
////
//// }
if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
{
MB_DATA.Coils.coils[0].all|=1<<i;
}
else
if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
{
MB_DATA.Coils.coils[0].all&=~(1<<i);
}
if(GPIOB11_valve)
{
GPIOB->ODR|=1<<11;
}
else
{
GPIOB->ODR&=~(1<<11);
}
}

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

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