Index: trunk/fw_g473rct/fw_g473rct.ioc
===================================================================
--- trunk/fw_g473rct/fw_g473rct.ioc	(revision 75)
+++ trunk/fw_g473rct/fw_g473rct.ioc	(revision 76)
@@ -1,5 +1,5 @@
 #MicroXplorer Configuration settings - do not modify
 ADC1.Channel-20\#ChannelRegularConversion=ADC_CHANNEL_1
-ADC1.ClockPrescaler=ADC_CLOCK_ASYNC_DIV2
+ADC1.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
 ADC1.CommonPathInternal=null|null|null|null
 ADC1.ContinuousConvMode=DISABLE
@@ -21,5 +21,5 @@
 ADC1.master=1
 ADC2.Channel-4\#ChannelRegularConversion=ADC_CHANNEL_3
-ADC2.ClockPrescaler=ADC_CLOCK_ASYNC_DIV2
+ADC2.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
 ADC2.CommonPathInternal=null|null|null|null
 ADC2.DMAContinuousRequests=DISABLE
@@ -39,5 +39,5 @@
 ADC3.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_5
 ADC3.Channel-4\#ChannelRegularConversion=ADC_CHANNEL_12
-ADC3.ClockPrescaler=ADC_CLOCK_ASYNC_DIV2
+ADC3.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
 ADC3.CommonPathInternal=null|null|null|null
 ADC3.ContinuousConvMode=ENABLE
@@ -62,5 +62,5 @@
 ADC3.master=1
 ADC4.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_4
-ADC4.ClockPrescaler=ADC_CLOCK_ASYNC_DIV2
+ADC4.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
 ADC4.CommonPathInternal=null|null|null|null
 ADC4.ContinuousConvMode=DISABLE
@@ -74,5 +74,5 @@
 ADC4.Ratio=ADC_OVERSAMPLING_RATIO_256
 ADC4.RightBitShift=ADC_RIGHTBITSHIFT_4
-ADC4.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
+ADC4.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_6CYCLES_5
 ADC4.SingleDiff-3\#ChannelRegularConversion=ADC_DIFFERENTIAL_ENDED
 ADC5.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_TEMPSENSOR_ADC5
@@ -80,5 +80,5 @@
 ADC5.Channel-4\#ChannelRegularConversion=ADC_CHANNEL_2
 ADC5.Channel-5\#ChannelRegularConversion=ADC_CHANNEL_1
-ADC5.ClockPrescaler=ADC_CLOCK_ASYNC_DIV2
+ADC5.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
 ADC5.CommonPathInternal=null|ADC_CHANNEL_TEMPSENSOR_ADC1|ADC_CHANNEL_VBAT|null
 ADC5.ContinuousConvMode=ENABLE
@@ -111,4 +111,6 @@
 CRC.IPParameters=DefaultPolynomialUse,DefaultInitValueUse,InitValue,CRCLength
 CRC.InitValue=0xFF
+DAC1.DAC_Channel-DAC_OUT2=DAC_CHANNEL_2
+DAC1.IPParameters=DAC_Channel-DAC_OUT2
 Dma.ADC1.0.Direction=DMA_PERIPH_TO_MEMORY
 Dma.ADC1.0.EventEnable=DISABLE
@@ -151,5 +153,5 @@
 Dma.ADC3.2.MemInc=DMA_MINC_ENABLE
 Dma.ADC3.2.Mode=DMA_CIRCULAR
-Dma.ADC3.2.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC3.2.PeriphDataAlignment=DMA_PDATAALIGN_WORD
 Dma.ADC3.2.PeriphInc=DMA_PINC_DISABLE
 Dma.ADC3.2.Polarity=HAL_DMAMUX_REQ_GEN_RISING
@@ -168,5 +170,5 @@
 Dma.ADC4.3.MemInc=DMA_MINC_ENABLE
 Dma.ADC4.3.Mode=DMA_NORMAL
-Dma.ADC4.3.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC4.3.PeriphDataAlignment=DMA_PDATAALIGN_WORD
 Dma.ADC4.3.PeriphInc=DMA_PINC_DISABLE
 Dma.ADC4.3.Polarity=HAL_DMAMUX_REQ_GEN_RISING
@@ -185,5 +187,5 @@
 Dma.ADC5.4.MemInc=DMA_MINC_ENABLE
 Dma.ADC5.4.Mode=DMA_CIRCULAR
-Dma.ADC5.4.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC5.4.PeriphDataAlignment=DMA_PDATAALIGN_WORD
 Dma.ADC5.4.PeriphInc=DMA_PINC_DISABLE
 Dma.ADC5.4.Polarity=HAL_DMAMUX_REQ_GEN_RISING
@@ -290,25 +292,26 @@
 Mcu.IP0=ADC1
 Mcu.IP1=ADC2
-Mcu.IP10=NVIC
-Mcu.IP11=RCC
-Mcu.IP12=RTC
-Mcu.IP13=SPI3
-Mcu.IP14=SYS
-Mcu.IP15=TIM3
-Mcu.IP16=UCPD1
-Mcu.IP17=USART1
-Mcu.IP18=USART2
-Mcu.IP19=USB
+Mcu.IP10=IWDG
+Mcu.IP11=NVIC
+Mcu.IP12=RCC
+Mcu.IP13=RTC
+Mcu.IP14=SPI3
+Mcu.IP15=SYS
+Mcu.IP16=TIM3
+Mcu.IP17=UCPD1
+Mcu.IP18=USART1
+Mcu.IP19=USART2
 Mcu.IP2=ADC3
-Mcu.IP20=USBPD
-Mcu.IP21=USB_DEVICE
+Mcu.IP20=USB
+Mcu.IP21=USBPD
+Mcu.IP22=USB_DEVICE
 Mcu.IP3=ADC4
 Mcu.IP4=ADC5
 Mcu.IP5=CRC
-Mcu.IP6=DMA
-Mcu.IP7=I2C3
-Mcu.IP8=I2C4
-Mcu.IP9=IWDG
-Mcu.IPNb=22
+Mcu.IP6=DAC1
+Mcu.IP7=DMA
+Mcu.IP8=I2C3
+Mcu.IP9=I2C4
+Mcu.IPNb=23
 Mcu.Name=STM32G473R(B-C-E)Tx
 Mcu.Package=LQFP64
@@ -317,60 +320,61 @@
 Mcu.Pin10=PA3
 Mcu.Pin11=PA4
-Mcu.Pin12=PA6
-Mcu.Pin13=PA7
-Mcu.Pin14=PC4
-Mcu.Pin15=PC5
-Mcu.Pin16=PB0
-Mcu.Pin17=PB1
-Mcu.Pin18=PB2
-Mcu.Pin19=PB10
+Mcu.Pin12=PA5
+Mcu.Pin13=PA6
+Mcu.Pin14=PA7
+Mcu.Pin15=PC4
+Mcu.Pin16=PC5
+Mcu.Pin17=PB0
+Mcu.Pin18=PB1
+Mcu.Pin19=PB2
 Mcu.Pin2=PC15-OSC32_OUT
-Mcu.Pin20=PB11
-Mcu.Pin21=PB12
-Mcu.Pin22=PB13
-Mcu.Pin23=PB14
-Mcu.Pin24=PB15
-Mcu.Pin25=PC6
-Mcu.Pin26=PC7
-Mcu.Pin27=PC8
-Mcu.Pin28=PC9
-Mcu.Pin29=PA8
+Mcu.Pin20=PB10
+Mcu.Pin21=PB11
+Mcu.Pin22=PB12
+Mcu.Pin23=PB13
+Mcu.Pin24=PB14
+Mcu.Pin25=PB15
+Mcu.Pin26=PC6
+Mcu.Pin27=PC7
+Mcu.Pin28=PC8
+Mcu.Pin29=PC9
 Mcu.Pin3=PF0-OSC_IN
-Mcu.Pin30=PA9
-Mcu.Pin31=PA10
-Mcu.Pin32=PA11
-Mcu.Pin33=PA12
-Mcu.Pin34=PA13
-Mcu.Pin35=PA14
-Mcu.Pin36=PA15
-Mcu.Pin37=PC10
-Mcu.Pin38=PC11
-Mcu.Pin39=PC12
+Mcu.Pin30=PA8
+Mcu.Pin31=PA9
+Mcu.Pin32=PA10
+Mcu.Pin33=PA11
+Mcu.Pin34=PA12
+Mcu.Pin35=PA13
+Mcu.Pin36=PA14
+Mcu.Pin37=PA15
+Mcu.Pin38=PC10
+Mcu.Pin39=PC11
 Mcu.Pin4=PF1-OSC_OUT
-Mcu.Pin40=PD2
-Mcu.Pin41=PB4
-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.Pin40=PC12
+Mcu.Pin41=PD2
+Mcu.Pin42=PB4
+Mcu.Pin43=PB5
+Mcu.Pin44=PB6
+Mcu.Pin45=PB7
+Mcu.Pin46=PB9
+Mcu.Pin47=VP_ADC5_TempSens_Input
+Mcu.Pin48=VP_ADC5_Vbat_Input
+Mcu.Pin49=VP_CRC_VS_CRC
 Mcu.Pin5=PC0
-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.Pin50=VP_IWDG_VS_IWDG
+Mcu.Pin51=VP_RTC_VS_RTC_Activate
+Mcu.Pin52=VP_SYS_V_VREFBUF
+Mcu.Pin53=VP_SYS_VS_Systick
+Mcu.Pin54=VP_SYS_VS_DBSignals
+Mcu.Pin55=VP_TIM3_VS_ClockSourceINT
+Mcu.Pin56=VP_USBPD_VS_USBPD1
+Mcu.Pin57=VP_USBPD_VS_PD3FULL
+Mcu.Pin58=VP_USBPD_VS_usbpd_tim1
+Mcu.Pin59=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS
 Mcu.Pin6=PC1
 Mcu.Pin7=PA0
 Mcu.Pin8=PA1
 Mcu.Pin9=PA2
-Mcu.PinsNb=59
+Mcu.PinsNb=60
 Mcu.ThirdParty0=STMicroelectronics.X-CUBE-EEPRMA1.5.2.0
 Mcu.ThirdPartyNb=1
@@ -437,4 +441,6 @@
 PA4.Locked=true
 PA4.Signal=GPIO_Output
+PA5.Locked=true
+PA5.Signal=COMP_DAC12_group
 PA6.GPIOParameters=GPIO_Label
 PA6.GPIO_Label=ADC2_IN3_UBAT+
@@ -586,7 +592,9 @@
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_ADC2_Init-ADC2-false-HAL-true,6-MX_ADC3_Init-ADC3-false-HAL-true,7-MX_ADC4_Init-ADC4-false-HAL-true,8-MX_ADC5_Init-ADC5-false-HAL-true,9-MX_I2C3_Init-I2C3-false-HAL-true,10-MX_I2C4_Init-I2C4-false-HAL-true,11-MX_SPI3_Init-SPI3-false-HAL-true,12-MX_USART1_UART_Init-USART1-false-HAL-true,13-MX_USART2_UART_Init-USART2-false-HAL-true,14-MX_CRC_Init-CRC-false-HAL-true,15-MX_RTC_Init-RTC-false-HAL-true,16-MX_IWDG_Init-IWDG-false-HAL-true,17-MX_TIM3_Init-TIM3-false-HAL-true,18-MX_USB_Device_Init-USB_DEVICE-false-HAL-false,19-MX_UCPD1_Init-UCPD1-false-LL-true,20-MX_USBPD_Init-USBPD-false-HAL-false
-RCC.ADC12Freq_Value=100000000
-RCC.ADC345Freq_Value=100000000
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_ADC2_Init-ADC2-false-HAL-true,6-MX_ADC3_Init-ADC3-false-HAL-true,7-MX_ADC4_Init-ADC4-false-HAL-true,8-MX_ADC5_Init-ADC5-false-HAL-true,9-MX_I2C3_Init-I2C3-false-HAL-true,10-MX_I2C4_Init-I2C4-false-HAL-true,11-MX_SPI3_Init-SPI3-false-HAL-true,12-MX_USART1_UART_Init-USART1-false-HAL-true,13-MX_USART2_UART_Init-USART2-false-HAL-true,14-MX_CRC_Init-CRC-false-HAL-true,15-MX_RTC_Init-RTC-false-HAL-true,16-MX_IWDG_Init-IWDG-false-HAL-true,17-MX_TIM3_Init-TIM3-false-HAL-true,18-MX_USB_Device_Init-USB_DEVICE-false-HAL-false,19-MX_UCPD1_Init-UCPD1-false-LL-true,20-MX_USBPD_Init-USBPD-false-HAL-false,21-MX_DAC1_Init-DAC1-false-HAL-true
+RCC.ADC12CLockSelection=RCC_ADC12CLKSOURCE_PLL
+RCC.ADC12Freq_Value=25000000
+RCC.ADC345CLockSelection=RCC_ADC345CLKSOURCE_PLL
+RCC.ADC345Freq_Value=25000000
 RCC.AHBFreq_Value=100000000
 RCC.APB1Freq_Value=100000000
@@ -611,5 +619,5 @@
 RCC.I2C4Freq_Value=100000000
 RCC.I2SFreq_Value=100000000
-RCC.IPParameters=ADC12Freq_Value,ADC345Freq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CK48CLockSelection,CRSFreq_Value,CortexFreq_Value,EXTERNAL_CLOCK_VALUE,FCLKCortexFreq_Value,FDCANFreq_Value,FamilyName,HCLKFreq_Value,HRTIM1Freq_Value,HSE_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2C4Freq_Value,I2SFreq_Value,LPTIM1Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSI_VALUE,MCO1PinFreq_Value,PLLM,PLLN,PLLP,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSourceVirtual,PWRFreq_Value,QSPIFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,UART4Freq_Value,UART5Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=ADC12CLockSelection,ADC12Freq_Value,ADC345CLockSelection,ADC345Freq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CK48CLockSelection,CRSFreq_Value,CortexFreq_Value,EXTERNAL_CLOCK_VALUE,FCLKCortexFreq_Value,FDCANFreq_Value,FamilyName,HCLKFreq_Value,HRTIM1Freq_Value,HSE_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2C4Freq_Value,I2SFreq_Value,LPTIM1Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSI_VALUE,MCO1PinFreq_Value,PLLM,PLLN,PLLP,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSourceVirtual,PWRFreq_Value,QSPIFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,UART4Freq_Value,UART5Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=100000000
 RCC.LPUART1Freq_Value=100000000
@@ -640,4 +648,6 @@
 RCC.VCOInputFreq_Value=12500000
 RCC.VCOOutputFreq_Value=200000000
+SH.COMP_DAC12_group.0=DAC1_OUT2,DAC_OUT2
+SH.COMP_DAC12_group.ConfNb=1
 SH.GPXTI2.0=GPIO_EXTI2
 SH.GPXTI2.ConfNb=1
@@ -656,5 +666,5 @@
 TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
 TIM3.IPParameters=TIM_MasterOutputTrigger,Prescaler,PeriodNoDither,AutoReloadPreload
-TIM3.PeriodNoDither=1000
+TIM3.PeriodNoDither=500
 TIM3.Prescaler=99
 TIM3.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE