comment1

2025-06-27 16:40:42 +03:00
parent a27b6bcb50
commit 62906c6685
13 changed files with 150 additions and 106 deletions
--- a/john103C6T6/Core/Inc/dallas_tools.h
+++ b/john103C6T6/Core/Inc/dallas_tools.h
@@ -112,7 +112,7 @@ struct  _SensorHandleStruct
 	
 	
 	float 										set_temp;	
-	int 											hyst;
+	uint16_t 									hyst;
  
  DALLAS_HandleTypeDef      *hdallas;
  uint64_t                  sensROM;                  ///< ROM-код датчика
--- a/john103C6T6/Core/Inc/main.h
+++ b/john103C6T6/Core/Inc/main.h
@@ -63,7 +63,7 @@ typedef struct
 /* USER CODE BEGIN ET */
 #define reset_blink_delay 	50
 #define rest_iter 				  10
-#define GPIOB11_valve MB_DATA.Coils.coils.state_val_bit.state_val_01
+#define GPIOB11_valve MB_DATA.Coils.coils[0].state_val_bit.state_val_01



@@ -96,6 +96,8 @@ void Error_Handler(void);
 /* USER CODE END EFP */

 /* Private defines -----------------------------------------------------------*/
+#define One_wire_Pin GPIO_PIN_15
+#define One_wire_GPIO_Port GPIOA

 /* USER CODE BEGIN Private defines */

--- a/john103C6T6/Core/Inc/stm32f1xx_it.h
+++ b/john103C6T6/Core/Inc/stm32f1xx_it.h
@@ -55,6 +55,7 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void RTC_IRQHandler(void);
 void TIM1_BRK_IRQHandler(void);
 void TIM1_UP_IRQHandler(void);
 void TIM1_TRG_COM_IRQHandler(void);
--- a/john103C6T6/Core/Src/gpio.c
+++ b/john103C6T6/Core/Src/gpio.c
@@ -53,7 +53,7 @@ void MX_GPIO_Init(void)
  /*Configure GPIO pin Output Level */
  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
                          |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
-                          |GPIO_PIN_9|GPIO_PIN_10, GPIO_PIN_RESET);
+                          |GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin, GPIO_PIN_RESET);

  /*Configure GPIO pin Output Level */
  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_10
@@ -68,10 +68,10 @@ void MX_GPIO_Init(void)

  /*Configure GPIO pins : PA1 PA2 PA3 PA4
                           PA5 PA6 PA7 PA8
-                           PA9 PA10 */
+                           PA9 PA10 PAPin */
  GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
                          |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
-                          |GPIO_PIN_9|GPIO_PIN_10;
+                          |GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin;
  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
--- a/john103C6T6/Core/Src/main.c
+++ b/john103C6T6/Core/Src/main.c
@@ -58,7 +58,7 @@ uint16_t iter,cnt=5;
  float temperature;
 	extern uint8_t roms[MAX_DEVICES][8];
 	//extern uint8_t devices_found ;
-	uint8_t init=1;
+	uint8_t _debug_init=1;
 	//TEMP temp_sense[30];
 float set_temp_old[30];
 	char rx_buffer[64];
@@ -144,8 +144,8 @@ int main(void)
  sens[i].Init.InitParam.Ind = i; 
  sens[i].Init.init_func = &Dallas_SensorInitByInd;  
  sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS;  
-				MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
-				sens[i].hyst =3;
+	MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
+	MB_DATA.HoldRegs.set_hyst[i]=sens[i].hyst =1;
  Dallas_AddNewSensors(&hdallas, &sens[i]);

 }	
@@ -155,22 +155,23 @@ int main(void)
  /* USER CODE BEGIN WHILE */
  while (1)
  {
-		if (init)
+		if (_debug_init||MB_DATA.Coils.init_param)
 		{
-			init=0;
+			_debug_init=0;
 			MB_DATA.Coils.init_param=0;
 			for(int i=0;i<hdallas.onewire->RomCnt;i++)
 			{
-				MB_DATA.HoldRegs.set_Temp[i]=21;
-				
+				sens[i].set_temp=MB_DATA.HoldRegs.set_Temp[i];
+				sens[i].hyst=MB_DATA.HoldRegs.set_hyst[i];
 			}
+			
 	//		init_all_T_sense();
 		//DS18B20_Search(&DS, &OW);
 		
 			
 		}
 		
-			init=MB_DATA.Coils.init_param;
+			
 			Dallas_StartConvertTAll(&hdallas,DALLAS_WAIT_BUS,0);

 			for(int i=0;i<hdallas.onewire->RomCnt;i++)
@@ -187,7 +188,7 @@ int main(void)
 				
 			{
 					
-					MB_DATA.Coils.coils.all|=1<<i;
+					MB_DATA.Coils.coils[0].all|=1<<i;
 				
 			}
 				
@@ -196,7 +197,7 @@ int main(void)
 			if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)				
 			{
 							
-					MB_DATA.Coils.coils.all&=~(1<<i);			
+					MB_DATA.Coils.coils[0].all&=~(1<<i);			
 				
 			}		
 			if(GPIOB11_valve)
--- a/john103C6T6/Core/Src/rtc.c
+++ b/john103C6T6/Core/Src/rtc.c
@@ -36,7 +36,6 @@ void MX_RTC_Init(void)

  RTC_TimeTypeDef sTime = {0};
  RTC_DateTypeDef DateToUpdate = {0};
-  RTC_TamperTypeDef sTamper = {0};

  /* USER CODE BEGIN RTC_Init 1 */

@@ -46,7 +45,7 @@ void MX_RTC_Init(void)
  */
  hrtc.Instance = RTC;
  hrtc.Init.AsynchPrediv = RTC_AUTO_1_SECOND;
-  hrtc.Init.OutPut = RTC_OUTPUTSOURCE_NONE;
+  hrtc.Init.OutPut = RTC_OUTPUTSOURCE_SECOND;
  if (HAL_RTC_Init(&hrtc) != HAL_OK)
  {
    Error_Handler();
@@ -58,32 +57,24 @@ void MX_RTC_Init(void)

  /** Initialize RTC and set the Time and Date
  */
-  sTime.Hours = 0x0;
-  sTime.Minutes = 0x0;
-  sTime.Seconds = 0x0;
+	
+//  sTime.Hours = 0x0;
+//  sTime.Minutes = 0x0;
+//  sTime.Seconds = 0x0;

-  if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
-  DateToUpdate.Month = RTC_MONTH_JANUARY;
-  DateToUpdate.Date = 0x1;
-  DateToUpdate.Year = 0x0;
+// // if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+//  DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
+//  DateToUpdate.Month = RTC_MONTH_JANUARY;
+//  DateToUpdate.Date = 0x1;
+//  DateToUpdate.Year = 0x0;

-  if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Enable the RTC Tamper
-  */
-  sTamper.Tamper = RTC_TAMPER_1;
-  sTamper.Trigger = RTC_TAMPERTRIGGER_LOWLEVEL;
-  if (HAL_RTCEx_SetTamper(&hrtc, &sTamper) != HAL_OK)
-  {
-    Error_Handler();
-  }
+//  if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
  /* USER CODE BEGIN RTC_Init 2 */

  /* USER CODE END RTC_Init 2 */
@@ -103,6 +94,10 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
    __HAL_RCC_BKP_CLK_ENABLE();
    /* RTC clock enable */
    __HAL_RCC_RTC_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(RTC_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_IRQn);
  /* USER CODE BEGIN RTC_MspInit 1 */

  /* USER CODE END RTC_MspInit 1 */
@@ -119,6 +114,9 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
  /* USER CODE END RTC_MspDeInit 0 */
    /* Peripheral clock disable */
    __HAL_RCC_RTC_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(RTC_IRQn);
  /* USER CODE BEGIN RTC_MspDeInit 1 */

  /* USER CODE END RTC_MspDeInit 1 */
--- a/john103C6T6/Core/Src/stm32f1xx_it.c
+++ b/john103C6T6/Core/Src/stm32f1xx_it.c
@@ -56,6 +56,7 @@
 /* USER CODE END 0 */

 /* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef hrtc;
 extern TIM_HandleTypeDef htim1;
 extern TIM_HandleTypeDef htim2;
 extern UART_HandleTypeDef huart1;
@@ -203,6 +204,20 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/

+/**
+  * @brief This function handles RTC global interrupt.
+  */
+void RTC_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_IRQn 0 */
+
+  /* USER CODE END RTC_IRQn 0 */
+  HAL_RTCEx_RTCIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_IRQn 1 */
+
+  /* USER CODE END RTC_IRQn 1 */
+}
+
 /**
  * @brief This function handles TIM1 break interrupt.
  */