Compare commits

..

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

2 changed files with 26 additions and 26 deletions

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);
////
//// } }
} }

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>0</UpdateFlashBeforeDebugging> <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
<Capability>1</Capability> <Capability>1</Capability>
<DriverSelection>4101</DriverSelection> <DriverSelection>4101</DriverSelection>
</Flash1> </Flash1>