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

up

Browse Source
This commit is contained in:
andrey 2025-11-07 16:43:19 +03:00
parent 46068a5ffe
commit e1bb35e6b6
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File 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; Flags_TypeDef flag;
//extern uint8_t devices_found ; //extern uint8_t devices_found ;
uint8_t _debug_init=0; uint8_t _debug_init=0;
//TEMP_TypeDef temp_sense[30]; TEMP_TypeDef temp_sense[30];
float set_temp_old[30]; float set_temp_old[30];
char rx_buffer[64]; char rx_buffer[64];
uint8_t rx_index = 0; uint8_t rx_index = 0;
@ -162,12 +162,10 @@ int main(void)
/* USER CODE BEGIN WHILE */ /* USER CODE BEGIN WHILE */
while (1) while (1)
{ {
Field_modbus(&MB_DATA,&flag); Field_modbus(&MB_DATA,&flag);
if( hmodbus1.pMessagePtr->FuncCode&FC_ERR_VALUES_START) if( hmodbus1.pMessagePtr->FuncCode&FC_ERR_VALUES_START)
{ {
static int pause_Alarm_led; static int pause_Alarm_led;
while (1) while (1)
{ {
@ -178,12 +176,12 @@ int main(void)
} }
pause_Alarm_led++; pause_Alarm_led++;
} }
} }
Check_Tconnect(&MB_DATA,&flag,&hdallas, 0); Check_Tconnect(&MB_DATA,&flag,&hdallas, 0);
value_control();
handle_valves(temp_sense[]);
if (_debug_init||MB_DATA.Coils.init_param) if (_debug_init||MB_DATA.Coils.init_param)
{ {
@ -225,7 +223,7 @@ int main(void)
{ {
GPIOA->ODR&=~(1<<10); GPIOA->ODR&=~(1<<10);
} }
value_control(); //value_control();
} }

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

@ -148,7 +148,40 @@
<Name>(105=-1,-1,-1,-1,0)</Name> <Name>(105=-1,-1,-1,-1,0)</Name>
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint/> <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>
<WatchWindow1> <WatchWindow1>
<Ww> <Ww>
<count>0</count> <count>0</count>
@ -175,6 +208,11 @@
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>sens[sens_num]</ItemText> <ItemText>sens[sens_num]</ItemText>
</Ww> </Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>sens</ItemText>
</Ww>
</WatchWindow1> </WatchWindow1>
<WatchWindow2> <WatchWindow2>
<Ww> <Ww>