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

Compare commits

base: Andrey:e1bb35e6b68179a40fe4e45e807e67c98f2333b9
Branches Tags
Andrey:main
Andrey:new_plate
Andrey:notJob
Andrey:modbus_tcp
..
compare: Andrey:81d95635f938d60c6dabc2dab75208824d8fd0c0
Branches Tags
Andrey:new_plate
Andrey:notJob
Andrey:main
Andrey:modbus_tcp

No commits in common. "e1bb35e6b68179a40fe4e45e807e67c98f2333b9" and "81d95635f938d60c6dabc2dab75208824d8fd0c0" have entirely different histories.
e1bb35e6b6 ... 81d95635f9

3 changed files with 11 additions and 47 deletions
Show Stats Expand all files Collapse all files

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

@ -72,7 +72,7 @@ uint8_t ralay_5v_on_var=0;
Flags_TypeDef flag;
//extern uint8_t devices_found ;
uint8_t _debug_init=0;
TEMP_TypeDef temp_sense[30];
//TEMP_TypeDef temp_sense[30];
float set_temp_old[30];
char rx_buffer[64];
uint8_t rx_index = 0;
@ -162,10 +162,12 @@ int main(void)
/* USER CODE BEGIN WHILE */
while (1)
{
Field_modbus(&MB_DATA,&flag);
Field_modbus(&MB_DATA,&flag);
if( hmodbus1.pMessagePtr->FuncCode&FC_ERR_VALUES_START)
{
{
static int pause_Alarm_led;
while (1)
{
@ -176,12 +178,12 @@ int main(void)
}
pause_Alarm_led++;
}
}
}
Check_Tconnect(&MB_DATA,&flag,&hdallas, 0);
value_control();
handle_valves(temp_sense[]);
if (_debug_init||MB_DATA.Coils.init_param)
{
@ -223,7 +225,7 @@ int main(void)
{
GPIOA->ODR&=~(1<<10);
}
//value_control();
value_control();
}

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

@ -148,40 +148,7 @@
<Name>(105=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>193</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134249696</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Core/Src/main.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\john103C6T6\../Core/Src/main.c\193</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>193</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134249792</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Core/Src/main.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\john103C6T6\../Core/Src/main.c\193</Expression>
</Bp>
</Breakpoint>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@ -208,11 +175,6 @@
<WinNumber>1</WinNumber>
<ItemText>sens[sens_num]</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>sens</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>

2
labview_proj

@ -1 +1 @@
Subproject commit 640e360565bf87d9a26dc4ec240150d191716b57
Subproject commit 72f58f19abb9da02b27e64d864ce1df8c5423a58