Index: trunk/fw_g473rct/SES/smartPro.emProject
===================================================================
--- trunk/fw_g473rct/SES/smartPro.emProject	(revision 54)
+++ trunk/fw_g473rct/SES/smartPro.emProject	(revision 55)
@@ -26,5 +26,5 @@
       arm_fp_abi="Hard"
       arm_fpu_type="FPv4-SP-D16"
-      arm_linker_heap_size="1024"
+      arm_linker_heap_size="4096"
       arm_linker_process_stack_size="0"
       arm_linker_stack_size="2048"
@@ -34,6 +34,6 @@
       arm_target_interface_type="SWD"
       batch_build_configurations="Debug125A_12V;Debug125A_24V;Release125A_12V;Release125A_24V"
-      c_preprocessor_definitions="__VTOR_CONFIG;ARM_MATH_CM4;STM32G473xx;__STM32G473_SUBFAMILY;__STM32G4XX_FAMILY"
-      c_user_include_directories="$(ProjectDir)/../Drivers/STM32G4xx_HAL_Driver/Inc;$(ProjectDir)/../Core/Inc;$(ProjectDir)/../Drivers/CMSIS/Include;$(ProjectDir)/../Drivers/CMSIS/Device/ST/STM32G4xx/Include;$(ProjectDir)/inc"
+      c_preprocessor_definitions="__VTOR_CONFIG;ARM_MATH_CM4;STM32G473xx;__STM32G473_SUBFAMILY;__STM32G4XX_FAMILY;USBPD_PORT_COUNT=1;USBPDCORE_LIB_PD3_FULL;USE_FULL_LL_DRIVER;USE_HAL_DRIVER;_SRC"
+      c_user_include_directories="$(ProjectDir)/../Drivers/STM32G4xx_HAL_Driver/Inc;$(ProjectDir)/../Core/Inc;$(ProjectDir)/../Drivers/CMSIS/Include;$(ProjectDir)/../Drivers/CMSIS/Device/ST/STM32G4xx/Include;$(ProjectDir)/inc;$(ProjectDir)/../USB_Device/App;$(ProjectDir)/../USB_Device/Target;$(ProjectDir)/../Middlewares\\ST\\STM32_USB_Device_Library\\Class\\CDC\\Inc;$(ProjectDir)/../Middlewares\\ST\\STM32_USB_Device_Library\\Core\\Inc;$(ProjectDir)/../USBPD;$(ProjectDir)/../USBPD/App;$(ProjectDir)/../USBPD/Target;$(ProjectDir)/../Middlewares/ST/STM32_USBPD_Library/Core/inc;$(ProjectDir)/../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc"
       debug_initial_breakpoint_set_option="Never"
       debug_register_definition_file="$(ProjectDir)/STM32G473xx_Registers.xml"
@@ -62,6 +62,5 @@
       Name="Debug125A_24V"
       c_preprocessor_definitions="DEVICETYPE=125;SYSTEM_VOLTAGE_24V"
-      gcc_debugging_level="Level 3"
-      gcc_optimization_level="Debug" />
+      gcc_debugging_level="Level 3" />
     <configuration
       Name="Release125A_12V"
@@ -96,6 +95,6 @@
         <file file_name="../Core/Inc/stm32g4xx_hal_conf.h" />
         <file file_name="../Core/Inc/stm32g4xx_it.h" />
+        <file file_name="../Core/Inc/tim.h" />
         <file file_name="../Core/Inc/usart.h" />
-        <file file_name="../Core/Inc/usb.h" />
       </folder>
       <folder Name="src">
@@ -103,5 +102,4 @@
         <file file_name="../Core/Src/crc.c" />
         <file file_name="../Core/Src/dma.c" />
-        <file file_name="../Core/Src/fdcan.c" />
         <file file_name="../Core/Src/gpio.c" />
         <file file_name="../Core/Src/i2c.c" />
@@ -118,6 +116,6 @@
           <configuration Name="Common" build_exclude_from_build="Yes" />
         </file>
+        <file file_name="../Core/Src/tim.c" />
         <file file_name="../Core/Src/usart.c" />
-        <file file_name="../Core/Src/usb.c" />
       </folder>
     </folder>
@@ -149,4 +147,6 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_spi.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_spi_ex.h" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_tim.h" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_tim_ex.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_uart.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_uart_ex.h" />
@@ -165,4 +165,5 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_ll_spi.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_ll_system.h" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_ll_ucpd.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_ll_usart.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_ll_usb.h" />
@@ -179,5 +180,4 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dma_ex.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_exti.c" />
-        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_fdcan.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_flash.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_flash_ex.c" />
@@ -197,7 +197,12 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_spi.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_spi_ex.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_tim.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_tim_ex.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart_ex.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_adc.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_dma.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_gpio.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_ucpd.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_usb.c" />
       </folder>
@@ -214,7 +219,5 @@
       <file file_name="inc/fast_current.h" />
       <file file_name="inc/int_bat_voltage.h" />
-      <file file_name="src/main.c">
-        <configuration Name="Common" build_exclude_from_build="Yes" />
-      </file>
+      <file file_name="inc/ltc_current.h" />
       <file file_name="inc/modbus.h" />
       <file file_name="inc/outputs.h" />
@@ -244,4 +247,5 @@
       <file file_name="src/fast_current.c" />
       <file file_name="src/int_bat_voltage.c" />
+      <file file_name="src/ltc_current.c" />
       <file file_name="src/modbus.c" />
       <file file_name="src/outputs.c" />
@@ -263,4 +267,51 @@
       <file file_name="../Core/Src/system_stm32g4xx.c" />
     </folder>
+    <folder Name="usb">
+      <folder Name="inc">
+        <file file_name="../Core/Inc/ucpd.h" />
+        <file file_name="../USB_Device/App/usb_device.h" />
+        <file file_name="../USB_Device/App/usbd_cdc_if.h" />
+        <file file_name="../USB_Device/Target/usbd_conf.h" />
+        <file file_name="../USB_Device/App/usbd_desc.h" />
+        <file file_name="../USBPD/App/usbpd.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_cad_hw_if.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Core/inc/usbpd_core.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Core/inc/usbpd_def.h" />
+        <file file_name="../USBPD/usbpd_devices_conf.h" />
+        <file file_name="../USBPD/Target/usbpd_dpm_conf.h" />
+        <file file_name="../USBPD/App/usbpd_dpm_core.h" />
+        <file file_name="../USBPD/Target/usbpd_dpm_user.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_hw.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_hw_if.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_phy.h" />
+        <file file_name="../USBPD/App/usbpd_pwr_if.h" />
+        <file file_name="../USBPD/Target/usbpd_pwr_user.h" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc/usbpd_timersserver.h" />
+      </folder>
+      <folder Name="src">
+        <file file_name="../Core/Src/ucpd.c" />
+        <file file_name="../USB_Device/App/usb_device.c" />
+        <file file_name="../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c" />
+        <file file_name="../USB_Device/App/usbd_cdc_if.c" />
+        <file file_name="../USB_Device/Target/usbd_conf.c" />
+        <file file_name="../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c" />
+        <file file_name="../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c" />
+        <file file_name="../USB_Device/App/usbd_desc.c" />
+        <file file_name="../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c" />
+        <file file_name="../USBPD/App/usbpd.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_cad_hw_if.c" />
+        <file file_name="../USBPD/App/usbpd_dpm_core.c" />
+        <file file_name="../USBPD/Target/usbpd_dpm_user.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_hw.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_hw_if_it.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy_hw_if.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_pwr_hw_if.c" />
+        <file file_name="../USBPD/App/usbpd_pwr_if.c" />
+        <file file_name="../USBPD/Target/usbpd_pwr_user.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_timersserver.c" />
+        <file file_name="../Middlewares/ST/STM32_USBPD_Library/Core/lib/USBPDCORE_PD3_FULL_CM4_wc32.a" />
+      </folder>
+    </folder>
   </project>
 </solution>