Merge pull request EmbeddedRPC#124 from VERO-Biotech/GDS4-1764-adaptive-sensor-ioc

[GDS4-1764]ioc changes to switch USART6 to RS-485

Author: BriceAaron

Core/Src/usart.c

@@ -273,7 +273,7 @@ void MX_USART6_UART_Init(void)
   huart6.Init.OverSampling = UART_OVERSAMPLING_16;
   huart6.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
   huart6.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
-  if (HAL_UART_Init(&huart6) != HAL_OK)
+  if (HAL_RS485Ex_Init(&huart6, UART_DE_POLARITY_HIGH, 0, 0) != HAL_OK)
   {
     Error_Handler();
   }
@@ -664,11 +664,20 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     /* USART6 clock enable */
     __HAL_RCC_USART6_CLK_ENABLE();
 
+    __HAL_RCC_GPIOG_CLK_ENABLE();
     __HAL_RCC_GPIOC_CLK_ENABLE();
     /**USART6 GPIO Configuration
+    PG8     ------> USART6_DE
     PC6     ------> USART6_TX
     PC7     ------> USART6_RX
     */
+    GPIO_InitStruct.Pin = GPIO_PIN_8;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF8_USART6;
+    HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
+
     GPIO_InitStruct.Pin = ADS_UART6_TX_Pin|ADS_UART6_RX_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -849,9 +858,12 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     __HAL_RCC_USART6_CLK_DISABLE();
 
     /**USART6 GPIO Configuration
+    PG8     ------> USART6_DE
     PC6     ------> USART6_TX
     PC7     ------> USART6_RX
     */
+    HAL_GPIO_DeInit(GPIOG, GPIO_PIN_8);
+
     HAL_GPIO_DeInit(GPIOC, ADS_UART6_TX_Pin|ADS_UART6_RX_Pin);
 
     /* USART6 interrupt Deinit */

VeroDevKit.ioc

@@ -172,48 +172,49 @@ Mcu.Pin58=PG4
 Mcu.Pin59=PG6
 Mcu.Pin6=PF1
 Mcu.Pin60=PG7
-Mcu.Pin61=PC6
-Mcu.Pin62=PC7
-Mcu.Pin63=PC8
-Mcu.Pin64=PC9
-Mcu.Pin65=PA8
-Mcu.Pin66=PA9
-Mcu.Pin67=PA10
-Mcu.Pin68=PA11
-Mcu.Pin69=PA12
+Mcu.Pin61=PG8
+Mcu.Pin62=PC6
+Mcu.Pin63=PC7
+Mcu.Pin64=PC8
+Mcu.Pin65=PC9
+Mcu.Pin66=PA8
+Mcu.Pin67=PA9
+Mcu.Pin68=PA10
+Mcu.Pin69=PA11
 Mcu.Pin7=PF2
-Mcu.Pin70=PA13
-Mcu.Pin71=PA14
-Mcu.Pin72=PC10
-Mcu.Pin73=PC11
-Mcu.Pin74=PC12
-Mcu.Pin75=PD0
-Mcu.Pin76=PD1
-Mcu.Pin77=PD2
-Mcu.Pin78=PD3
-Mcu.Pin79=PD4
+Mcu.Pin70=PA12
+Mcu.Pin71=PA13
+Mcu.Pin72=PA14
+Mcu.Pin73=PC10
+Mcu.Pin74=PC11
+Mcu.Pin75=PC12
+Mcu.Pin76=PD0
+Mcu.Pin77=PD1
+Mcu.Pin78=PD2
+Mcu.Pin79=PD3
 Mcu.Pin8=PF3
-Mcu.Pin80=PD5
-Mcu.Pin81=PD6
-Mcu.Pin82=PD7
-Mcu.Pin83=PG10
-Mcu.Pin84=PG11
-Mcu.Pin85=PG13
-Mcu.Pin86=PG15
-Mcu.Pin87=PB3
-Mcu.Pin88=PB4
-Mcu.Pin89=PB5
+Mcu.Pin80=PD4
+Mcu.Pin81=PD5
+Mcu.Pin82=PD6
+Mcu.Pin83=PD7
+Mcu.Pin84=PG10
+Mcu.Pin85=PG11
+Mcu.Pin86=PG13
+Mcu.Pin87=PG15
+Mcu.Pin88=PB3
+Mcu.Pin89=PB4
 Mcu.Pin9=PF4
-Mcu.Pin90=PB6
-Mcu.Pin91=PB7
-Mcu.Pin92=PB8
-Mcu.Pin93=PB9
-Mcu.Pin94=PE0
-Mcu.Pin95=PE1
-Mcu.Pin96=VP_SYS_VS_Systick
-Mcu.Pin97=VP_TIM2_VS_ClockSourceINT
-Mcu.Pin98=VP_TIM3_VS_ClockSourceINT
-Mcu.PinsNb=99
+Mcu.Pin90=PB5
+Mcu.Pin91=PB6
+Mcu.Pin92=PB7
+Mcu.Pin93=PB8
+Mcu.Pin94=PB9
+Mcu.Pin95=PE0
+Mcu.Pin96=PE1
+Mcu.Pin97=VP_SYS_VS_Systick
+Mcu.Pin98=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin99=VP_TIM3_VS_ClockSourceINT
+Mcu.PinsNb=100
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F756ZGTx
@@ -681,6 +682,8 @@ PG7.GPIOParameters=GPIO_Label
 PG7.GPIO_Label=USB_OverCurrent [STMPS2151STR_FAULT]
 PG7.Locked=true
 PG7.Signal=GPIO_Input
+PG8.Mode=Hardware Flow Control (RS485)
+PG8.Signal=USART6_DE
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
@@ -867,8 +870,9 @@ USART2.VirtualMode-Asynchronous=VM_ASYNC
 USART2.VirtualMode-Hardware\ Flow\ Control\ (RS485)=VM_ASYNC
 USART3.IPParameters=VirtualMode-Asynchronous
 USART3.VirtualMode-Asynchronous=VM_ASYNC
-USART6.IPParameters=VirtualMode-Asynchronous
+USART6.IPParameters=VirtualMode-Asynchronous,VirtualMode-Hardware Flow Control (RS485)
 USART6.VirtualMode-Asynchronous=VM_ASYNC
+USART6.VirtualMode-Hardware\ Flow\ Control\ (RS485)=VM_ASYNC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM2_VS_ClockSourceINT.Mode=Internal