Add functions for USBPD & SDK, submodule Update

cores/arduino/ch32/pinmap.c

@@ -130,15 +130,19 @@ void pin_function(PinName pin, int function)
           case CH_CNF_OUTPUT_PP:
                GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
                break;
+#if !defined(CH32X035)
           case CH_CNF_OUTPUT_OD:
                GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_OD;
                break;
+#endif
           case CH_CNF_OUTPUT_AFPP:
                GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
                break;
+#if !defined(CH32X035)
           case CH_CNF_OUTPUT_AFOD:
                GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_OD;
-               break;           
+               break; 
+#endif          
           default:
                GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
                break;

libraries/USBPD_SINK/src/usbpd_sink.c

@@ -38,6 +38,41 @@ void usbpd_sink_clear_ready(void)
     pdControl_g.cc_USBPD_READY = 0;
 }
 
+uint8_t usbpd_sink_get_pdo_num(void)
+{
+    return pdControl_g.cc_SourcePDONum;
+}
+
+uint8_t usbpd_sink_get_pps_num(void)
+{
+    return pdControl_g.cc_SourcePPSNum;
+}
+
+uint16_t usbpd_sink_get_pdo_voltage(int index)
+{
+    return pdControl_g.cc_FixedSourceCap[index].Voltage;
+}
+
+uint16_t usbpd_sink_get_pdo_current(int index)
+{
+    return pdControl_g.cc_FixedSourceCap[index].Current;
+}
+
+uint16_t usbpd_sink_get_pps_min_voltage(int index)
+{
+    return pdControl_g.cc_PPSSourceCap[index].MinVoltage;
+}
+
+uint16_t usbpd_sink_get_pps_max_voltage(int index)
+{
+    return pdControl_g.cc_PPSSourceCap[index].MaxVoltage;
+}
+
+uint16_t usbpd_sink_get_pps_current(int index)
+{
+    return pdControl_g.cc_PPSSourceCap[index].Current;
+}
+
 bool usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage)
 {
     uint16_t targetVoltage;

libraries/USBPD_SINK/src/usbpd_sink.h

@@ -202,6 +202,14 @@ void usbpd_sink_process(void);
 uint8_t usbpd_sink_get_ready(void);
 void usbpd_sink_clear_ready(void);
 
+uint8_t usbpd_sink_get_pdo_num(void);
+uint8_t usbpd_sink_get_pps_num(void);
+uint16_t usbpd_sink_get_pdo_voltage(int index);
+uint16_t usbpd_sink_get_pdo_current(int index);
+uint16_t usbpd_sink_get_pps_min_voltage(int index);
+uint16_t usbpd_sink_get_pps_max_voltage(int index);
+uint16_t usbpd_sink_get_pps_current(int index);
+
 bool usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage);
 
 

system/CH32L10x/SRC/Debug/debug.c

@@ -149,8 +149,6 @@ void USART_Printf_Init(uint32_t baudrate)
  *
  * @return  size: Data length
  */
-
-#if 0
 __attribute__((used))
 int _write(int fd, char *buf, int size)
 {
@@ -171,7 +169,6 @@ int _write(int fd, char *buf, int size)
 
     return size;
 }
-#endif
 
 /*********************************************************************
  * @fn      _sbrk
@@ -193,3 +190,6 @@ void *_sbrk(ptrdiff_t incr)
     curbrk += incr;
     return curbrk - incr;
 }
+
+void _fini() {}
+void _init() {}

system/CH32L10x/SRC/Debug/debug.h

@@ -2,7 +2,7 @@
  * File Name          : debug.h
  * Author             : WCH
  * Version            : V1.0.0
- * Date               : 2023/07/08
+ * Date               : 2023/11/06
  * Description        : This file contains all the functions prototypes for UART
  *                      Printf , Delay functions.
  *********************************************************************************
@@ -34,6 +34,7 @@ extern uint32_t OPA_Trim;
 extern uint16_t ADC_Trim;
 extern uint32_t TS_Val;
 extern uint32_t CHIPID;
+extern uint16_t USBPD_CFG;
 
 void Delay_Init(void);
 void Delay_Us(uint32_t n);

system/CH32L10x/SRC/Peripheral/inc/ch32l103.h

@@ -2,7 +2,7 @@
  * File Name          : ch32l103.h
  * Author             : WCH
  * Version            : V1.0.0
- * Date               : 2023/07/08
+ * Date               : 2024/11/06
  * Description        : CH32L103 Device Peripheral Access Layer Header File.
  *********************************************************************************
  * Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
@@ -16,7 +16,9 @@
 extern "C" {
 #endif
 
+#ifndef HSE_VALUE
 #define HSE_VALUE    ((uint32_t)8000000) /* Value of the External oscillator in Hz */
+#endif
 
 /* In the following line adjust the External High Speed oscillator (HSE) Startup Timeout value */
 #define HSE_STARTUP_TIMEOUT    ((uint16_t)0x1000) /* Time out for HSE start up */
@@ -27,7 +29,7 @@ extern "C" {
 
 /* Standard Peripheral Library version number */
 #define __CH32L103_STDPERIPH_VERSION_MAIN   (0x01) /* [15:8] main version */
-#define __CH32L103_STDPERIPH_VERSION_SUB    (0x00) /* [7:0] sub version */
+#define __CH32L103_STDPERIPH_VERSION_SUB    (0x03) /* [7:0] sub version */
 #define __CH32L103_STDPERIPH_VERSION        ((__CH32L103_STDPERIPH_VERSION_MAIN << 8)\
                                              |(__CH32L103_STDPERIPH_VERSION_SUB << 0))
 
@@ -40,7 +42,7 @@ typedef enum IRQn
     Ecall_M_Mode_IRQn = 5,     /* Ecall M Mode Interrupt                               */
     Ecall_U_Mode_IRQn = 8,     /* Ecall U Mode Interrupt                               */
     Break_Point_IRQn = 9,      /* Break Point Interrupt                                */
-    SysTicK_IRQn = 12,         /* System timer Interrupt                               */
+    SysTick_IRQn = 12,         /* System timer Interrupt                               */
     Software_IRQn = 14,        /* Software Interrupt                                   */
 
     /******  RISC-V specific Interrupt Numbers *********************************************************/
@@ -94,14 +96,15 @@ typedef enum IRQn
     LPTIM_IRQn = 63,           /* LPTIM global Interrupt                               */
     OPA_IRQn = 64,             /* OPA global Interrupt                                 */
     USBPD_IRQn = 65,           /* USBPD global Interrupt                               */
-    TKeyWakeUp_IRQn = 66,      /* TKey WakeUp Interrupt                                */
+
     USBPDWakeUp_IRQn = 67,     /* USBPD WakeUp Interrupt                               */
     CMPWakeUp_IRQn = 68,       /* CMP WakeUp Interrupt                                 */
 
 } IRQn_Type;
 
 #define HardFault_IRQn    EXC_IRQn
 #define ADC1_2_IRQn       ADC_IRQn
+#define SysTicK_IRQn      SysTick_IRQn
 
 #include <stdint.h>
 #include "core_riscv.h"
@@ -166,13 +169,7 @@ typedef struct
     __IO uint16_t TPCTLR;
     uint16_t      RESERVED12;
     __IO uint16_t TPCSR;
-    uint16_t      RESERVED13[5];
-    __IO uint16_t DATAR11;
-    uint16_t      RESERVED14;
-    __IO uint16_t DATAR12;
-    uint16_t      RESERVED15;
-    __IO uint16_t DATAR13;
-    uint16_t      RESERVED16;
+    uint16_t      RESERVED13;
 } BKP_TypeDef;
 
 /* Controller Area Network TxMailBox */
@@ -824,7 +821,7 @@ typedef struct
 #define ADC_TRIM_BASE                           ((uint32_t)0x1FFFF728)
 #define HSI_LP_TRIM_BASE                        ((uint32_t)0x1FFFF72A)
 #define CHIPID_BASE                             ((uint32_t)0x1FFFF704)
-
+#define USBPD_CFG_BASE                          ((uint32_t)0x1FFFF730)
 
 /* Peripheral declaration */
 #define TIM2                                    ((TIM_TypeDef *)TIM2_BASE)
@@ -906,8 +903,9 @@ typedef struct
 #define ADC_SCAN                                ((uint32_t)0x00000100) /* Scan mode */
 #define ADC_AWDSGL                              ((uint32_t)0x00000200) /* Enable the watchdog on a single channel in scan mode */
 #define ADC_JAUTO                               ((uint32_t)0x00000400) /* Automatic injected group conversion */
-#define ADC_RDISCEN                             ((uint32_t)0x00000800) /* Discontinuous mode on regular channels */
+#define ADC_DISCEN                              ((uint32_t)0x00000800) /* Discontinuous mode on regular channels */
 #define ADC_JDISCEN                             ((uint32_t)0x00001000) /* Discontinuous mode on injected channels */
+#define ADC_RDISCEN                             ADC_DISCEN
 
 #define ADC_DISCNUM                             ((uint32_t)0x0000E000) /* DISCNUM[2:0] bits (Discontinuous mode channel count) */
 #define ADC_DISCNUM_0                           ((uint32_t)0x00002000) /* Bit 0 */
@@ -1278,15 +1276,6 @@ typedef struct
 /*******************  Bit definition for BKP_DATAR10 register  *******************/
 #define BKP_DATAR10_D                           ((uint16_t)0xFFFF) /* Backup data */
 
-/*******************  Bit definition for BKP_DATAR11 register  *******************/
-#define BKP_DATAR11_D                           ((uint16_t)0xFFFF) /* Backup data */
-
-/*******************  Bit definition for BKP_DATAR12 register  *******************/
-#define BKP_DATAR12_D                           ((uint16_t)0xFFFF) /* Backup data */
-
-/*******************  Bit definition for BKP_DATAR13 register  *******************/
-#define BKP_DATAR13_D                           ((uint16_t)0xFFFF) /* Backup data */
-
 /******************  Bit definition for BKP_OCTLR register  *******************/
 #define BKP_CAL                                 ((uint16_t)0x007F) /* Calibration value */
 #define BKP_CCO                                 ((uint16_t)0x0080) /* Calibration Clock Output */
@@ -3547,7 +3536,8 @@ typedef struct
 #define AFIO_PCFR1_CAN_RM_0                     ((uint32_t)0x00002000) /* Bit 0 */
 #define AFIO_PCFR1_CAN_RM_1                     ((uint32_t)0x00004000) /* Bit 1 */
 
-#define AFIO_PCFR1_PD01_RM                      ((uint32_t)0x00008000) /* Port D0/Port D1 mapping on OSC_IN/OSC_OUT */
+#define AFIO_PCFR1_PD0PD1_RM                    ((uint32_t)0x00008000) /* Port D0/Port D1 mapping on OSC_IN/OSC_OUT */
+#define AFIO_PCFR1_PD01_RM                      AFIO_PCFR1_PD0PD1_RM
 
 #define AFIO_PCFR1_SW_CFG                       ((uint32_t)0x07000000) /* SW_CFG[2:0] bits (SDI configuration) */
 #define AFIO_PCFR1_SW_CFG_0                     ((uint32_t)0x01000000) /* Bit 0 */
@@ -4643,6 +4633,7 @@ typedef struct
 /*******************  Bit definition for OPA_CFGR2 register  *******************/
 #define OPA_CFGR2_POLL_VLU                      ((uint32_t)0x000001FF)
 #define OPA_CFGR2_POLL_NUM                      ((uint32_t)0x00000E00)
+#define OPA_CFGR2_POLL_CNT                      ((uint32_t)0x00007000)
 
 /*******************  Bit definition for OPA_CTLR1 register  *******************/
 #define OPA_CTLR1_EN1                           ((uint32_t)0x00000001)
@@ -4661,16 +4652,19 @@ typedef struct
 #define OPA_CTLR2_MODE1                         ((uint32_t)0x00000006)
 #define OPA_CTLR2_NSEL1                         ((uint32_t)0x00000008)
 #define OPA_CTLR2_PSEL1                         ((uint32_t)0x00000010)
+#define OPA_CTLR2_HYEN1                         ((uint32_t)0x00000020)
 #define OPA_CTLR2_LP1                           ((uint32_t)0x00000040)
 #define OPA_CTLR2_EN2                           ((uint32_t)0x00000100)
 #define OPA_CTLR2_MODE2                         ((uint32_t)0x00000600)
 #define OPA_CTLR2_NSEL2                         ((uint32_t)0x00000800)
 #define OPA_CTLR2_PSEL2                         ((uint32_t)0x00001000)
+#define OPA_CTLR2_HYEN2                         ((uint32_t)0x00002000)
 #define OPA_CTLR2_LP2                           ((uint32_t)0x00004000)
 #define OPA_CTLR2_EN3                           ((uint32_t)0x00010000)
 #define OPA_CTLR2_MODE3                         ((uint32_t)0x00060000)
 #define OPA_CTLR2_NSEL3                         ((uint32_t)0x00080000)
 #define OPA_CTLR2_PSEL3                         ((uint32_t)0x00100000)
+#define OPA_CTLR2_HYEN3                         ((uint32_t)0x00200000)
 #define OPA_CTLR2_LP3                           ((uint32_t)0x00400000)
 
 #define OPA_CTLR2_WKUP_MD                       ((uint32_t)0x03000000)

system/CH32L10x/SRC/Peripheral/inc/ch32l103_adc.h

@@ -2,7 +2,7 @@
  * File Name          : ch32l103_adc.h
  * Author             : WCH
  * Version            : V1.0.0
- * Date               : 2023/07/08
+ * Date               : 2024/05/06
  * Description        : This file contains all the functions prototypes for the
  *                      ADC firmware library.
  *********************************************************************************
@@ -153,12 +153,6 @@ typedef struct
 #define ADC_FLAG_JSTRT                                 ((uint8_t)0x08)
 #define ADC_FLAG_STRT                                  ((uint8_t)0x10)
 
-/* ADC_TKey_WakeUp_IO_mode_definition */
-#define ADC_TKey_WakeUp_Mode0                          ((uint32_t)0x00000000)
-#define ADC_TKey_WakeUp_Mode1                          ((uint32_t)0x00080000)
-#define ADC_TKey_WakeUp_Mode2                          ((uint32_t)0x00100000)
-#define ADC_TKey_WakeUp_Mode3                          ((uint32_t)0x00180000)
-
 /* ADC_Sample_mode_definition */
 #define ADC_Sample_NoOver_1M_Mode                      ((uint32_t)0x00000000)
 #define ADC_Sample_Over_1M_Mode                        ((uint32_t)0x00000020)
@@ -202,7 +196,6 @@ ITStatus   ADC_GetITStatus(ADC_TypeDef *ADCx, uint16_t ADC_IT);
 void       ADC_ClearITPendingBit(ADC_TypeDef *ADCx, uint16_t ADC_IT);
 s32        TempSensor_Volt_To_Temper(s32 Value);
 void       ADC_BufferCmd(ADC_TypeDef *ADCx, FunctionalState NewState);
-void       ADC_TKey_WakeUpCmd(ADC_TypeDef *ADCx, uint8_t ADC_Channel, uint32_t IO_Mode, FunctionalState NewState);
 void       ADC_TKey_ChannelxMulShieldCmd(ADC_TypeDef *ADCx, uint8_t ADC_Channel, FunctionalState NewState);
 void       ADC_TKey_MulShieldCmd(ADC_TypeDef *ADCx, FunctionalState NewState);
 void       ADC_DutyDelayCmd(ADC_TypeDef *ADCx, FunctionalState NewState);

system/CH32L10x/SRC/Peripheral/inc/ch32l103_exti.h

@@ -2,7 +2,7 @@
  * File Name          : ch32l103_exti.h
  * Author             : WCH
  * Version            : V1.0.0
- * Date               : 2023/07/08
+ * Date               : 2024/05/06
  * Description        : This file contains all the functions prototypes for the
  *                      EXTI firmware library.
  *********************************************************************************
@@ -69,7 +69,6 @@ typedef struct
 #define EXTI_Line15    ((uint32_t)0x08000)  /* External interrupt line 15 */
 #define EXTI_Line16    ((uint32_t)0x10000)  /* External interrupt line 16 Connected to the PVD Output */
 #define EXTI_Line17    ((uint32_t)0x20000)  /* External interrupt line 17 Connected to the RTC Alarm event */
-#define EXTI_Line18    ((uint32_t)0x40000)  /* External interrupt line 18 Connected to the Tkey Wakeup event */
 #define EXTI_Line19    ((uint32_t)0x80000)  /* External interrupt line 19 Connected to the USBPD Wakeup event */
 #define EXTI_Line20    ((uint32_t)0x100000) /* External interrupt line 20 Connected to the USBFS Wakeup event */
 #define EXTI_Line21    ((uint32_t)0x200000) /* External interrupt line 21 Connected to the LPTIM Wakeup event */

system/CH32L10x/SRC/Peripheral/inc/ch32l103_gpio.h

@@ -2,7 +2,7 @@
  * File Name          : ch32l103_gpio.h
  * Author             : WCH
  * Version            : V1.0.0
- * Date               : 2023/07/08
+ * Date               : 2024/03/01
  * Description        : This file contains all the functions prototypes for the
  *                      GPIO firmware library.
  *********************************************************************************
@@ -121,7 +121,7 @@ typedef enum
 #define GPIO_Remap1_CAN1                ((uint32_t)0x001D4000) /* CAN1 Alternate Function mapping */
 #define GPIO_Remap2_CAN1                ((uint32_t)0x001D6000) /* CAN1 Alternate Function mapping */
 #define GPIO_Remap_PD01                 ((uint32_t)0x00008000) /* PD01 Alternate Function mapping */
-#define GPIO_Remap_SWJ_Disable          ((uint32_t)0x00300400) /* Full SWJ Disabled (JTAG-DP + SW-DP) */
+#define GPIO_Remap_SWJ_Disable          ((uint32_t)0x00300400) /* GPIO_Remap_SWJ_Disable - Full SDI Disabled (SDI) */
 
 //bit[31:30] = 01b - PCFR2
 #define GPIO_Remap_USART4               ((uint32_t)0x40000001) /* USART4 Alternate Function mapping */

system/CH32L10x/SRC/Peripheral/inc/ch32l103_i2c.h

@@ -106,7 +106,7 @@ typedef struct
 #define I2C_IT_ADDR                                          ((uint32_t)0x02000002)
 #define I2C_IT_SB                                            ((uint32_t)0x02000001)
 
-/* SR2 register flags  */
+/* STAR2 register flags  */
 #define I2C_FLAG_DUALF                                       ((uint32_t)0x00800000)
 #define I2C_FLAG_SMBHOST                                     ((uint32_t)0x00400000)
 #define I2C_FLAG_SMBDEFAULT                                  ((uint32_t)0x00200000)
@@ -115,7 +115,7 @@ typedef struct
 #define I2C_FLAG_BUSY                                        ((uint32_t)0x00020000)
 #define I2C_FLAG_MSL                                         ((uint32_t)0x00010000)
 
-/* SR1 register flags */
+/* STAR1 register flags */
 #define I2C_FLAG_SMBALERT                                    ((uint32_t)0x10008000)
 #define I2C_FLAG_TIMEOUT                                     ((uint32_t)0x10004000)
 #define I2C_FLAG_PECERR                                      ((uint32_t)0x10001000)