Index: trunk/fw_g473rct/fw_g473rct.ioc
===================================================================
--- trunk/fw_g473rct/fw_g473rct.ioc	(revision 55)
+++ trunk/fw_g473rct/fw_g473rct.ioc	(revision 65)
@@ -350,26 +350,27 @@
 Mcu.Pin40=PD2
 Mcu.Pin41=PB4
-Mcu.Pin42=PB6
-Mcu.Pin43=PB7
-Mcu.Pin44=PB9
-Mcu.Pin45=VP_ADC5_TempSens_Input
-Mcu.Pin46=VP_ADC5_Vbat_Input
-Mcu.Pin47=VP_CRC_VS_CRC
-Mcu.Pin48=VP_IWDG_VS_IWDG
-Mcu.Pin49=VP_RTC_VS_RTC_Activate
+Mcu.Pin42=PB5
+Mcu.Pin43=PB6
+Mcu.Pin44=PB7
+Mcu.Pin45=PB9
+Mcu.Pin46=VP_ADC5_TempSens_Input
+Mcu.Pin47=VP_ADC5_Vbat_Input
+Mcu.Pin48=VP_CRC_VS_CRC
+Mcu.Pin49=VP_IWDG_VS_IWDG
 Mcu.Pin5=PC0
-Mcu.Pin50=VP_SYS_V_VREFBUF
-Mcu.Pin51=VP_SYS_VS_Systick
-Mcu.Pin52=VP_SYS_VS_DBSignals
-Mcu.Pin53=VP_TIM3_VS_ClockSourceINT
-Mcu.Pin54=VP_USBPD_VS_USBPD1
-Mcu.Pin55=VP_USBPD_VS_PD3FULL
-Mcu.Pin56=VP_USBPD_VS_usbpd_tim1
-Mcu.Pin57=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS
+Mcu.Pin50=VP_RTC_VS_RTC_Activate
+Mcu.Pin51=VP_SYS_V_VREFBUF
+Mcu.Pin52=VP_SYS_VS_Systick
+Mcu.Pin53=VP_SYS_VS_DBSignals
+Mcu.Pin54=VP_TIM3_VS_ClockSourceINT
+Mcu.Pin55=VP_USBPD_VS_USBPD1
+Mcu.Pin56=VP_USBPD_VS_PD3FULL
+Mcu.Pin57=VP_USBPD_VS_usbpd_tim1
+Mcu.Pin58=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS
 Mcu.Pin6=PC1
 Mcu.Pin7=PA0
 Mcu.Pin8=PA1
 Mcu.Pin9=PA2
-Mcu.PinsNb=58
+Mcu.PinsNb=59
 Mcu.ThirdParty0=STMicroelectronics.X-CUBE-EEPRMA1.5.2.0
 Mcu.ThirdPartyNb=1
@@ -489,8 +490,12 @@
 PB2.Signal=GPIO_Output
 PB4.Locked=true
-PB4.Mode=Sink_AllSignals
+PB4.Mode=Source_AllSignals
 PB4.Signal=UCPD1_CC2
+PB5.GPIOParameters=GPIO_Label
+PB5.GPIO_Label=UCPD1_VBUS
+PB5.Locked=true
+PB5.Signal=GPIO_Output
 PB6.Locked=true
-PB6.Mode=Sink_AllSignals
+PB6.Mode=Source_AllSignals
 PB6.Signal=UCPD1_CC1
 PB7.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
@@ -666,8 +671,10 @@
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 USART2.WordLength=WORDLENGTH_9B
-USBPD.IPParameters=USBPD_PORT0_PDO_SRC_FIXED_SET_MAX_CURRENT_0,USBPD_PORT0_PDO_SRC_FIXED_PEAKCURRENT_0,PE_DataSwap_P0,PE_DR_Swap_To_DFP_P0,USBPD_PORT0_PDO_SNK_FIXED_SET_OP_CURRENT_0,PE_DR_Swap_To_UFP_P0
-USBPD.PE_DR_Swap_To_DFP_P0=USBPD_FALSE
-USBPD.PE_DR_Swap_To_UFP_P0=USBPD_FALSE
-USBPD.PE_DataSwap_P0=USBPD_FALSE
+USBPD.CAD_DefaultResistor_P0=0x02u
+USBPD.IPParameters=USBPD_PORT0_PDO_SRC_FIXED_SET_MAX_CURRENT_0,USBPD_PORT0_PDO_SRC_FIXED_PEAKCURRENT_0,PE_DataSwap_P0,PE_DR_Swap_To_DFP_P0,USBPD_PORT0_PDO_SNK_FIXED_SET_OP_CURRENT_0,PE_DR_Swap_To_UFP_P0,USBPD_PDO_FIXED_USBCOMM_P0,CAD_DefaultResistor_P0
+USBPD.PE_DR_Swap_To_DFP_P0=USBPD_TRUE
+USBPD.PE_DR_Swap_To_UFP_P0=USBPD_TRUE
+USBPD.PE_DataSwap_P0=USBPD_TRUE
+USBPD.USBPD_PDO_FIXED_USBCOMM_P0=USBPD_PDO_FIXED_USBCOMM_SUPPORTED
 USBPD.USBPD_PORT0_PDO_SNK_FIXED_SET_OP_CURRENT_0=500
 USBPD.USBPD_PORT0_PDO_SRC_FIXED_PEAKCURRENT_0=USBPD_PDO_SRC_FIXED_PEAKCURRENT_EQUAL