commit

john103C6T6/Core/Inc/main.h

@@ -64,7 +64,7 @@ typedef struct
 #define reset_blink_delay 	50
 #define rest_iter 				  10
 #define GPIOB11_valve MB_DATA.Coils.coils[0].state_val_bit.state_val_01
-
+#define ralay_5v_on GPIOA->ODR&(1<<10); 
 
 
 

john103C6T6/Core/Src/gpio.c

@@ -53,12 +53,12 @@ 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|One_wire_Pin, GPIO_PIN_RESET);
+                          |GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_10
                           |GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-                          |GPIO_PIN_15, GPIO_PIN_RESET);
+                          |GPIO_PIN_15, GPIO_PIN_SET);
 
   /*Configure GPIO pin : PA0 */
   GPIO_InitStruct.Pin = GPIO_PIN_0;

john103C6T6/Core/Src/main.c

@@ -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)
 ////				

john103C6T6/MDK-ARM/john103C6T6.uvoptx

@@ -215,6 +215,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>sTime</ItemText>
         </Ww>
+        <Ww>
+          <count>13</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>ralay_5v_on_var</ItemText>
+        </Ww>
+        <Ww>
+          <count>14</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>MB_DATA.Coils.coils[1].state_val_bit.state_val_01,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>

john103C6T6/john103C6T6.ioc

@@ -107,6 +107,8 @@ PA0-WKUP.Locked=true
 PA0-WKUP.Signal=GPIO_Input
 PA1.Locked=true
 PA1.Signal=GPIO_Output
+PA10.GPIOParameters=GPIO_Label
+PA10.GPIO_Label=Relay_dc5v
 PA10.Locked=true
 PA10.Signal=GPIO_Output
 PA11.Mode=CAN_Activate
@@ -236,8 +238,8 @@ RCC.USBPrescaler=RCC_USBCLKSOURCE_PLL_DIV1_5
 RCC.VCOOutput2Freq_Value=8000000
 RTC.IPParameters=OutPut
 RTC.OutPut=RTC_OUTPUTSOURCE_SECOND
-SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_2
+SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_4
-SPI1.CalculateBaudRate=36.0 MBits/s
+SPI1.CalculateBaudRate=18.0 MBits/s
 SPI1.Direction=SPI_DIRECTION_2LINES
 SPI1.IPParameters=VirtualType,Mode,Direction,BaudRatePrescaler,CalculateBaudRate
 SPI1.Mode=SPI_MODE_MASTER