Release v1.6.0

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_devices_conf_template.h

@@ -52,10 +52,10 @@ extern "C" {
       usbpd_hw.c
 -------------------------------------------------------------------------------*/
 
-/* defined used to configure function : USBPD_HW_GetUSPDInstance */
+/* Define used to configure function : USBPD_HW_GetUSPDInstance */
 #define UCPD_INSTANCE0 UCPD1
 
-/* defined used to configure function : USBPD_HW_Init_DMARxInstance,USBPD_HW_DeInit_DMARxInstance */
+/* Define used to configure function : USBPD_HW_Init_DMARxInstance,USBPD_HW_DeInit_DMARxInstance */
 #define UCPDDMA_INSTANCE0_CLOCKENABLE_RX                   \
   do                                                       \
   {                                                        \
@@ -71,7 +71,7 @@ extern "C" {
 
 #define UCPDDMA_INSTANCE0_CHANNEL_RX   DMA1_Channel5
 
-/* defined used to configure function : USBPD_HW_Init_DMATxInstance, USBPD_HW_DeInit_DMATxInstance */
+/* Define used to configure function : USBPD_HW_Init_DMATxInstance, USBPD_HW_DeInit_DMATxInstance */
 #define UCPDDMA_INSTANCE0_CLOCKENABLE_TX                   \
   do                                                       \
   {                                                        \

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_hw.h

@@ -16,8 +16,13 @@
   ******************************************************************************
   */
 
-#ifndef USBPD_HW_H
-#define USBPD_HW_H
+#ifndef __USBPD_HW_H_
+#define __USBPD_HW_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Includes ------------------------------------------------------------------*/
 /* Private typedef -----------------------------------------------------------*/
 /* Variable containing ADC conversions results */
@@ -30,5 +35,9 @@ DMA_Channel_TypeDef *USBPD_HW_Init_DMATxInstance(uint8_t PortNum);
 void USBPD_HW_DeInit_DMATxInstance(uint8_t PortNum);
 uint32_t USBPD_HW_GetRpResistorValue(uint8_t Portnum);
 void USBPD_HW_SetFRSSignalling(uint8_t Portnum, uint8_t cc);
-#endif /* USBPD_BSP_HW_H */
 
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBPD_HW_H_ */

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_hw.c

@@ -31,6 +31,7 @@ UCPD_TypeDef *USBPD_HW_GetUSPDInstance(uint8_t PortNum)
   return UCPD_INSTANCE0;
 }
 
+#if !defined(USBPDCORE_LIB_NO_PD)
 DMA_Channel_TypeDef *USBPD_HW_Init_DMARxInstance(uint8_t PortNum)
 {
   LL_DMA_InitTypeDef DMA_InitStruct;
@@ -92,6 +93,7 @@ void USBPD_HW_DeInit_DMATxInstance(uint8_t PortNum)
 {
   (void)PortNum;
 }
+#endif /* !USBPDCORE_LIB_NO_PD */
 
 uint32_t USBPD_HW_GetRpResistorValue(uint8_t PortNum)
 {

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy.c

@@ -117,7 +117,7 @@ USBPD_StatusTypeDef USBPD_PHY_Init(uint8_t PortNum, const USBPD_PHY_Callbacks *p
 {
   (void)PowerRole;
 
-  /* set all callbacks */
+  /* Set all callbacks */
   Ports[PortNum].cbs.USBPD_HW_IF_TxCompleted            = pCallbacks->USBPD_PHY_TxCompleted;
   Ports[PortNum].cbs.USBPD_HW_IF_BistCompleted          = pCallbacks->USBPD_PHY_BistCompleted;
   Ports[PortNum].cbs.USBPD_HW_IF_RX_ResetIndication     = pCallbacks->USBPD_PHY_ResetIndication;
@@ -165,8 +165,8 @@ uint16_t USBPD_PHY_GetMinGOODCRCTimerValue(uint8_t PortNum)
 void USBPD_PHY_Reset(uint8_t PortNum)
 {
   (void)PortNum;
-  /* reset PHY layer   */
-  /* reset HW_IF layer */
+  /* Reset PHY layer   */
+  /* Reset HW_IF layer */
 }
 
 /**
@@ -322,13 +322,13 @@ void PHY_Rx_Completed(uint8_t PortNum, uint32_t MsgType)
 
   _msgtype = tab_sop_value[MsgType];
 
-  /* check if the message must be forwarded to usbpd stack */
+  /* Check if the message must be forwarded to usbpd stack */
   switch (_msgtype)
   {
     case USBPD_SOPTYPE_CABLE_RESET :
       if (0x1Eu == (PHY_Ports[PortNum].SupportedSOP & 0x1Eu))
       {
-        /* nothing to do the message will be discarded and the port partner retry the send */
+        /* Nothing to do the message will be discarded and the port partner retry the send */
         Ports[PortNum].cbs.USBPD_HW_IF_RX_ResetIndication(PortNum, USBPD_SOPTYPE_CABLE_RESET);
       }
       break;

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy_hw_if.c

@@ -49,6 +49,7 @@ void USBPD_HW_IF_GlobalHwInit(void)
   /* PWR register access (for disabling dead battery feature) */
   LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_PWR);
   LL_AHB1_GRP1_EnableClock(LL_AHB1_GRP1_PERIPH_CRC);
+
 }
 
 #if !defined(USBPDCORE_LIB_NO_PD)
@@ -146,6 +147,11 @@ void USBPD_HW_IF_Send_BIST_Pattern(uint8_t PortNum)
 }
 #endif /* !USBPDCORE_LIB_NO_PD */
 
+/**
+  * @brief  Assert Rp resistors
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPDM1_AssertRp(uint8_t PortNum)
 {
   switch (Ports[PortNum].params->RpResistor)
@@ -178,13 +184,22 @@ void USBPDM1_AssertRp(uint8_t PortNum)
   BSP_USBPD_PWR_SetRole(PortNum, POWER_ROLE_SOURCE);
 #endif /* TCPP0203_SUPPORT */
 }
-
+/**
+  * @brief  De-assert Rp resistors
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPDM1_DeAssertRp(uint8_t PortNum)
 {
-  /* not needed on STM32G4xx, so nothing to do, keep only for compatibility */
+  /* Not needed on STM32G4xx, so nothing to do, keep only for compatibility */
   UNUSED(PortNum);
 }
 
+/**
+  * @brief  Assert Rd resistors
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPDM1_AssertRd(uint8_t PortNum)
 {
   LL_UCPD_TypeCDetectionCC2Disable(Ports[PortNum].husbpd);
@@ -214,34 +229,55 @@ void USBPDM1_AssertRd(uint8_t PortNum)
 #endif /* TCPP0203_SUPPORT */
 }
 
+/**
+  * @brief  Assert Rd resistors
+  * @param  PortNum Port
+  * @retval none
+  */
 void USBPDM1_DeAssertRd(uint8_t PortNum)
 {
-  /* not needed on STM32G4xx, so nothing to do, keep only for compatibility */
+  /* Not needed on STM32G4xx, so nothing to do, keep only for compatibility */
   UNUSED(PortNum);
 }
 
+/**
+  * @brief  Enter error recovery
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPDM1_EnterErrorRecovery(uint8_t PortNum)
 {
   LL_UCPD_SetSRCRole(Ports[PortNum].husbpd);
   LL_UCPD_SetRpResistor(Ports[PortNum].husbpd, LL_UCPD_RESISTOR_NONE);
   LL_UCPD_RxDisable(Ports[PortNum].husbpd);
 
-#if defined(USBPD_REV30_SUPPORT)
+#if !defined(USBPDCORE_LIB_NO_PD)
   if (Ports[PortNum].settings->PE_PD3_Support.d.PE_FastRoleSwapSupport == USBPD_TRUE)
   {
-    /* Set GPIO to disallow the FRSTX handling */
+    /* Set GPIO to disallow the FRS RX handling */
     LL_UCPD_FRSDetectionDisable(Ports[PortNum].husbpd);
   }
-#endif /* USBPD_REV30_SUPPORT */
+#endif /* USBPDCORE_LIB_NO_PD */
 }
 
+/**
+  * @brief  Set the correct CC pin on the comparator
+  * @param  PortNum Port
+  * @param  cc CC pin based on @ref CCxPin_TypeDef
+  * @retval None
+  */
 void USBPDM1_Set_CC(uint8_t PortNum, CCxPin_TypeDef cc)
 {
-  /* Set the correct pin on the comparator*/
+  /* Set the correct pin on the comparator */
   Ports[PortNum].CCx = cc;
   LL_UCPD_SetCCPin(Ports[PortNum].husbpd, (cc == CC1) ? LL_UCPD_CCPIN_CC1 : LL_UCPD_CCPIN_CC2);
 }
 
+/**
+  * @brief  Enable RX interrupt
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPDM1_RX_EnableInterrupt(uint8_t PortNum)
 {
   /* Enable the RX interrupt process */
@@ -251,11 +287,21 @@ void USBPDM1_RX_EnableInterrupt(uint8_t PortNum)
   LL_UCPD_RxDMAEnable(Ports[PortNum].husbpd);
 }
 
+/**
+  * @brief  Enable RX
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPD_HW_IF_EnableRX(uint8_t PortNum)
 {
   LL_UCPD_RxEnable(Ports[PortNum].husbpd);
 }
 
+/**
+  * @brief  Disable RX
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPD_HW_IF_DisableRX(uint8_t PortNum)
 {
   LL_UCPD_RxDisable(Ports[PortNum].husbpd);
@@ -287,7 +333,7 @@ void HW_SignalAttachement(uint8_t PortNum, CCxPin_TypeDef cc)
   _temp = (uint32_t)&Ports[PortNum].husbpd->TXDR;
   Ports[PortNum].hdmatx->CPAR = _temp;
 
-  /* disabled non Rd line set CC line enable */
+  /* Disabled non Rd line set CC line enable */
 #define INTERRUPT_MASK  UCPD_IMR_TXMSGDISCIE | UCPD_IMR_TXMSGSENTIE | UCPD_IMR_HRSTDISCIE  | UCPD_IMR_HRSTSENTIE |  \
   UCPD_IMR_TXMSGABTIE  | UCPD_IMR_TXUNDIE     | UCPD_IMR_RXORDDETIE  | UCPD_IMR_RXHRSTDETIE | \
   UCPD_IMR_RXOVRIE     | UCPD_IMR_RXMSGENDIE
@@ -308,15 +354,14 @@ void HW_SignalAttachement(uint8_t PortNum, CCxPin_TypeDef cc)
   (void)BSP_USBPD_PWR_VCONNInit(PortNum, (Ports[PortNum].CCx == CC1) ? 1u : 2u);
 #endif /* _VCONN_SUPPORT */
 
-#if defined(USBPD_REV30_SUPPORT)
   if (Ports[PortNum].settings->PE_PD3_Support.d.PE_FastRoleSwapSupport == USBPD_TRUE)
   {
-    /* Set GPIO to allow the FRSTX handling */
+    /* Set GPIO to allow the FRS TX handling */
     USBPD_HW_SetFRSSignalling(PortNum, (Ports[PortNum].CCx == CC1) ? 1u : 2u);
+    /* Enable FRS RX */
     LL_UCPD_FRSDetectionEnable(Ports[PortNum].husbpd);
     Ports[PortNum].husbpd->IMR |= UCPD_IMR_FRSEVTIE;
   }
-#endif /* USBPD_REV30_SUPPORT */
 
   /* Disable the Resistor on Vconn PIN */
   if (Ports[PortNum].CCx == CC1)
@@ -339,7 +384,7 @@ void HW_SignalAttachement(uint8_t PortNum, CCxPin_TypeDef cc)
 void HW_SignalDetachment(uint8_t PortNum)
 {
 #if !defined(USBPDCORE_LIB_NO_PD)
-  /* stop DMA RX/TX */
+  /* Stop DMA RX/TX */
   LL_UCPD_RxDMADisable(Ports[PortNum].husbpd);
   LL_UCPD_TxDMADisable(Ports[PortNum].husbpd);
   LL_UCPD_RxDisable(Ports[PortNum].husbpd);
@@ -348,11 +393,13 @@ void HW_SignalDetachment(uint8_t PortNum)
   /* Enable only detection interrupt */
   WRITE_REG(Ports[PortNum].husbpd->IMR, UCPD_IMR_TYPECEVT1IE | UCPD_IMR_TYPECEVT2IE);
 #elif defined(_LOW_POWER)
+#if !defined(_DRP)
   if (USBPD_PORTPOWERROLE_SRC == Ports[PortNum].params->PE_PowerRole)
   {
     /* Enable detection interrupt */
     WRITE_REG(Ports[PortNum].husbpd->IMR, UCPD_IMR_TYPECEVT1IE | UCPD_IMR_TYPECEVT2IE);
   }
+#endif /* !_DRP */
 #endif /* !_LOW_POWER && !USBPDM1_VCC_FEATURE_ENABLED */
 
   USBPD_HW_DeInit_DMATxInstance(PortNum);
@@ -370,13 +417,11 @@ void HW_SignalDetachment(uint8_t PortNum)
     (void)BSP_USBPD_PWR_VBUSDeInit(PortNum);
   }
 
-#if defined(USBPD_REV30_SUPPORT)
   if (Ports[PortNum].settings->PE_PD3_Support.d.PE_FastRoleSwapSupport == USBPD_TRUE)
   {
-    /* Set GPIO to disallow the FRSTX handling */
+    /* Set GPIO to disallow the FRS RX handling */
     LL_UCPD_FRSDetectionDisable(Ports[PortNum].husbpd);
   }
-#endif /* USBPD_REV30_SUPPORT */
 
 #endif /* !USBPDCORE_LIB_NO_PD */
   Ports[PortNum].CCx = CCNONE;
@@ -386,18 +431,33 @@ void HW_SignalDetachment(uint8_t PortNum)
 #endif /* !USBPDCORE_LIB_NO_PD */
 }
 
+/**
+  * @brief  Set resistors to SinkTxNG
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPD_HW_IF_SetResistor_SinkTxNG(uint8_t PortNum)
 {
-  /* set the resistor SinkTxNG 1.5A5V */
+  /* Set the resistor SinkTxNG 1.5A5V */
   LL_UCPD_SetRpResistor(Ports[PortNum].husbpd, LL_UCPD_RESISTOR_1_5A);
 }
 
+/**
+  * @brief  Set resistors to SinkTxOk
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPD_HW_IF_SetResistor_SinkTxOK(uint8_t PortNum)
 {
-  /* set the resistor SinkTxNG 3.0A5V */
+  /* Set the resistor SinkTxNG 3.0A5V */
   LL_UCPD_SetRpResistor(Ports[PortNum].husbpd, LL_UCPD_RESISTOR_3_0A);
 }
 
+/**
+  * @brief  Check if resistors are set to SinkTxOk
+  * @param  PortNum Port
+  * @retval USBPD_TRUE if resistor is set to SinkTxOk, else USBPD_FALSE
+  */
 uint8_t USBPD_HW_IF_IsResistor_SinkTxOk(uint8_t PortNum)
 {
 #if defined(_LOW_POWER)
@@ -438,6 +498,11 @@ uint8_t USBPD_HW_IF_IsResistor_SinkTxOk(uint8_t PortNum)
   return USBPD_FALSE;
 }
 
+/**
+  * @brief  Signal a Fast Role Swap
+  * @param  PortNum Port
+  * @retval None
+  */
 void USBPD_HW_IF_FastRoleSwapSignalling(uint8_t PortNum)
 {
   LL_UCPD_SignalFRSTX(Ports[PortNum].husbpd);

Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_timersserver.c

@@ -55,11 +55,19 @@ void USBPD_TIM_Init(void)
     /* Counter mode: select up-counting mode */
     LL_TIM_SetCounterMode(TIMX, LL_TIM_COUNTERMODE_UP);
 
+#if defined(TIMX_CLK_FREQ)
+    /* Set the pre-scaler value to have TIMx counter clock equal to 1 MHz */
+    LL_TIM_SetPrescaler(TIMX, __LL_TIM_CALC_PSC(TIMX_CLK_FREQ, 1000000u));
+
+    /* Set the auto-reload value to have a counter frequency of 100Hz */
+    LL_TIM_SetAutoReload(TIMX, __LL_TIM_CALC_ARR(TIMX_CLK_FREQ, LL_TIM_GetPrescaler(TIMX), 100u));
+#else
     /* Set the pre-scaler value to have TIMx counter clock equal to 1 MHz */
     LL_TIM_SetPrescaler(TIMX, __LL_TIM_CALC_PSC(SystemCoreClock, 1000000u));
 
     /* Set the auto-reload value to have a counter frequency of 100Hz */
     LL_TIM_SetAutoReload(TIMX, __LL_TIM_CALC_ARR(SystemCoreClock, LL_TIM_GetPrescaler(TIMX), 100u));
+#endif /* TIMX_CLK_FREQ */
 
     /*********************************/
     /* Output waveform configuration */