diff --git a/john103C6T6/Core/Src/main.c b/john103C6T6/Core/Src/main.c index 2c6580b..a552124 100644 --- a/john103C6T6/Core/Src/main.c +++ b/john103C6T6/Core/Src/main.c @@ -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,12 +162,10 @@ 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) { @@ -178,12 +176,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) { @@ -225,7 +223,7 @@ int main(void) { GPIOA->ODR&=~(1<<10); } - value_control(); + //value_control(); } diff --git a/john103C6T6/MDK-ARM/john103C6T6.uvoptx b/john103C6T6/MDK-ARM/john103C6T6.uvoptx index 456aea0..fa79953 100644 --- a/john103C6T6/MDK-ARM/john103C6T6.uvoptx +++ b/john103C6T6/MDK-ARM/john103C6T6.uvoptx @@ -148,7 +148,40 @@ (105=-1,-1,-1,-1,0) - + + + 0 + 0 + 193 + 1 +
134249696
+ 0 + 0 + 0 + 0 + 0 + 1 + ../Core/Src/main.c + + \\john103C6T6\../Core/Src/main.c\193 +
+ + 1 + 0 + 193 + 1 +
134249792
+ 0 + 0 + 0 + 0 + 0 + 1 + ../Core/Src/main.c + + \\john103C6T6\../Core/Src/main.c\193 +
+
0 @@ -175,6 +208,11 @@ 1 sens[sens_num] + + 5 + 1 + sens +