commit
This commit is contained in:
@@ -51,6 +51,8 @@ int fputc(int ch, FILE *f)
|
||||
/* Private define ------------------------------------------------------------*/
|
||||
/* USER CODE BEGIN PD */
|
||||
uint16_t iter,cnt=5;
|
||||
|
||||
uint8_t ralay_5v_on_var=0;
|
||||
/* USER CODE END PD */
|
||||
|
||||
/* Private macro -------------------------------------------------------------*/
|
||||
@@ -93,6 +95,7 @@ void SystemClock_Config(void);
|
||||
* @retval int
|
||||
*/
|
||||
int main(void)
|
||||
|
||||
{
|
||||
|
||||
/* USER CODE BEGIN 1 */
|
||||
@@ -118,6 +121,7 @@ int main(void)
|
||||
|
||||
/* Initialize all configured peripherals */
|
||||
MX_GPIO_Init();
|
||||
|
||||
MX_TIM1_Init();
|
||||
MX_USART1_UART_Init();
|
||||
MX_TIM2_Init();
|
||||
@@ -183,6 +187,18 @@ int main(void)
|
||||
Dallas_ReadTemperature(&sens[i]);
|
||||
sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i];
|
||||
MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
|
||||
|
||||
|
||||
|
||||
ralay_5v_on_var=MB_DATA.Coils.coils[1].state_val_bit.state_val_05;
|
||||
if (ralay_5v_on_var)
|
||||
{
|
||||
GPIOA->ODR|=1<<10;
|
||||
}
|
||||
else
|
||||
{
|
||||
GPIOA->ODR&=~(1<<10);
|
||||
}
|
||||
|
||||
//// if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
|
||||
////
|
||||
|
||||
Reference in New Issue
Block a user