zwischen speicher

2025-04-22 18:54:45 +02:00 · 2025-04-22 18:54:45 +02:00 · b539afecce
commit b539afecce
parent cace5823ac
6 changed files with 643 additions and 573 deletions
--- a/Software/Core/Src/main.c
+++ b/Software/Core/Src/main.c
@ -375,7 +375,7 @@ static void MX_LTDC_Init(void)
  pLayerCfg.WindowX1 = 1024;
  pLayerCfg.WindowY0 = 0;
  pLayerCfg.WindowY1 = 600;
-  pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB565;
+  pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB888;
  pLayerCfg.Alpha = 1;
  pLayerCfg.Alpha0 = 0;
  pLayerCfg.BlendingFactor1 = LTDC_BLENDING_FACTOR1_CA;
--- a/Software/Core/Src/stm32h7xx_hal_msp.c
+++ b/Software/Core/Src/stm32h7xx_hal_msp.c
@ -331,6 +331,7 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* hltdc)
    /**LTDC GPIO Configuration
    PF10     ------> LTDC_DE
    PC0     ------> LTDC_R5
+    PA1     ------> LTDC_R2
    PA3     ------> LTDC_B5
    PA4     ------> LTDC_VSYNC
    PA5     ------> LTDC_R4
@ -349,6 +350,7 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* hltdc)
    PA10     ------> LTDC_B4
    PA15     ------> LTDC_B6
    PD2     ------> LTDC_B7
+    PD6     ------> LTDC_B2
    */
    GPIO_InitStruct.Pin = GPIO_PIN_10;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@ -364,7 +366,8 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* hltdc)
    GPIO_InitStruct.Alternate = GPIO_AF14_LTDC;
    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);

-    GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_15;
+    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_3|GPIO_PIN_5|GPIO_PIN_6
+                          |GPIO_PIN_15;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
    GPIO_InitStruct.Pull = GPIO_NOPULL;
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@ -434,6 +437,13 @@ void HAL_LTDC_MspInit(LTDC_HandleTypeDef* hltdc)
    GPIO_InitStruct.Alternate = GPIO_AF9_LTDC;
    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);

+    GPIO_InitStruct.Pin = GPIO_PIN_6;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF14_LTDC;
+    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
    /* LTDC interrupt Init */
    HAL_NVIC_SetPriority(LTDC_IRQn, 0, 0);
    HAL_NVIC_EnableIRQ(LTDC_IRQn);
@ -464,6 +474,7 @@ void HAL_LTDC_MspDeInit(LTDC_HandleTypeDef* hltdc)
    /**LTDC GPIO Configuration
    PF10     ------> LTDC_DE
    PC0     ------> LTDC_R5
+    PA1     ------> LTDC_R2
    PA3     ------> LTDC_B5
    PA4     ------> LTDC_VSYNC
    PA5     ------> LTDC_R4
@ -482,21 +493,22 @@ void HAL_LTDC_MspDeInit(LTDC_HandleTypeDef* hltdc)
    PA10     ------> LTDC_B4
    PA15     ------> LTDC_B6
    PD2     ------> LTDC_B7
+    PD6     ------> LTDC_B2
    */
    HAL_GPIO_DeInit(GPIOF, GPIO_PIN_10);

    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_0|GPIO_PIN_4|GPIO_PIN_6|GPIO_PIN_7
                          |GPIO_PIN_9);

-    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6
-                          |GPIO_PIN_8|GPIO_PIN_10|GPIO_PIN_15);
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5
+                          |GPIO_PIN_6|GPIO_PIN_8|GPIO_PIN_10|GPIO_PIN_15);

    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_10|GPIO_PIN_11
                          |GPIO_PIN_15);

    HAL_GPIO_DeInit(GPIOG, GPIO_PIN_7);

-    HAL_GPIO_DeInit(GPIOD, GPIO_PIN_2);
+    HAL_GPIO_DeInit(GPIOD, GPIO_PIN_2|GPIO_PIN_6);

    /* LTDC interrupt DeInit */
    HAL_NVIC_DisableIRQ(LTDC_IRQn);
--- a/Software/FT23_Charger.ioc
+++ b/Software/FT23_Charger.ioc
@ -52,7 +52,7 @@ LTDC.ImageHeight_L0=600
 LTDC.ImageWidth_L0=1024
 LTDC.Layers=0
 LTDC.PCPolarity=LTDC_PCPOLARITY_IIPC
-LTDC.PixelFormat_L0=LTDC_PIXEL_FORMAT_RGB565
+LTDC.PixelFormat_L0=LTDC_PIXEL_FORMAT_RGB888
 LTDC.Red=255
 LTDC.VBP=5
 LTDC.VFP=2
@ -93,90 +93,92 @@ Mcu.Pin14=PH1-OSC_OUT
 Mcu.Pin15=PC0
 Mcu.Pin16=PC2_C
 Mcu.Pin17=PC3_C
-Mcu.Pin18=PA3
-Mcu.Pin19=PA4
+Mcu.Pin18=PA1
+Mcu.Pin19=PA3
 Mcu.Pin2=PC14-OSC32_IN
-Mcu.Pin20=PA5
-Mcu.Pin21=PA6
-Mcu.Pin22=PA7
-Mcu.Pin23=PC4
-Mcu.Pin24=PB0
-Mcu.Pin25=PB1
-Mcu.Pin26=PF11
-Mcu.Pin27=PF12
-Mcu.Pin28=PF13
-Mcu.Pin29=PF14
+Mcu.Pin20=PA4
+Mcu.Pin21=PA5
+Mcu.Pin22=PA6
+Mcu.Pin23=PA7
+Mcu.Pin24=PC4
+Mcu.Pin25=PB0
+Mcu.Pin26=PB1
+Mcu.Pin27=PF11
+Mcu.Pin28=PF12
+Mcu.Pin29=PF13
 Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=PF15
-Mcu.Pin31=PG0
-Mcu.Pin32=PG1
-Mcu.Pin33=PE7
-Mcu.Pin34=PE8
-Mcu.Pin35=PE9
-Mcu.Pin36=PE10
-Mcu.Pin37=PE11
-Mcu.Pin38=PE12
-Mcu.Pin39=PE13
+Mcu.Pin30=PF14
+Mcu.Pin31=PF15
+Mcu.Pin32=PG0
+Mcu.Pin33=PG1
+Mcu.Pin34=PE7
+Mcu.Pin35=PE8
+Mcu.Pin36=PE9
+Mcu.Pin37=PE10
+Mcu.Pin38=PE11
+Mcu.Pin39=PE12
 Mcu.Pin4=PF0
-Mcu.Pin40=PE14
-Mcu.Pin41=PE15
-Mcu.Pin42=PB10
-Mcu.Pin43=PB11
-Mcu.Pin44=PB12
-Mcu.Pin45=PB13
-Mcu.Pin46=PB15
-Mcu.Pin47=PD8
-Mcu.Pin48=PD9
-Mcu.Pin49=PD10
+Mcu.Pin40=PE13
+Mcu.Pin41=PE14
+Mcu.Pin42=PE15
+Mcu.Pin43=PB10
+Mcu.Pin44=PB11
+Mcu.Pin45=PB12
+Mcu.Pin46=PB13
+Mcu.Pin47=PB15
+Mcu.Pin48=PD8
+Mcu.Pin49=PD9
 Mcu.Pin5=PF1
-Mcu.Pin50=PD14
-Mcu.Pin51=PD15
-Mcu.Pin52=PG2
-Mcu.Pin53=PG4
-Mcu.Pin54=PG5
-Mcu.Pin55=PG7
-Mcu.Pin56=PG8
-Mcu.Pin57=PC6
-Mcu.Pin58=PC7
-Mcu.Pin59=PC8
+Mcu.Pin50=PD10
+Mcu.Pin51=PD14
+Mcu.Pin52=PD15
+Mcu.Pin53=PG2
+Mcu.Pin54=PG4
+Mcu.Pin55=PG5
+Mcu.Pin56=PG7
+Mcu.Pin57=PG8
+Mcu.Pin58=PC6
+Mcu.Pin59=PC7
 Mcu.Pin6=PF2
-Mcu.Pin60=PC9
-Mcu.Pin61=PA8
-Mcu.Pin62=PA9
-Mcu.Pin63=PA10
-Mcu.Pin64=PA11
-Mcu.Pin65=PA12
-Mcu.Pin66=PA13
-Mcu.Pin67=PA14
-Mcu.Pin68=PA15
-Mcu.Pin69=PC10
+Mcu.Pin60=PC8
+Mcu.Pin61=PC9
+Mcu.Pin62=PA8
+Mcu.Pin63=PA9
+Mcu.Pin64=PA10
+Mcu.Pin65=PA11
+Mcu.Pin66=PA12
+Mcu.Pin67=PA13
+Mcu.Pin68=PA14
+Mcu.Pin69=PA15
 Mcu.Pin7=PF3
-Mcu.Pin70=PC11
-Mcu.Pin71=PC12
-Mcu.Pin72=PD0
-Mcu.Pin73=PD1
-Mcu.Pin74=PD2
-Mcu.Pin75=PG9
-Mcu.Pin76=PG11
-Mcu.Pin77=PG12
-Mcu.Pin78=PG13
-Mcu.Pin79=PG14
+Mcu.Pin70=PC10
+Mcu.Pin71=PC11
+Mcu.Pin72=PC12
+Mcu.Pin73=PD0
+Mcu.Pin74=PD1
+Mcu.Pin75=PD2
+Mcu.Pin76=PD6
+Mcu.Pin77=PG9
+Mcu.Pin78=PG11
+Mcu.Pin79=PG12
 Mcu.Pin8=PF4
-Mcu.Pin80=PG15
-Mcu.Pin81=PB3
-Mcu.Pin82=PB4
-Mcu.Pin83=PB5
-Mcu.Pin84=PB6
-Mcu.Pin85=PB7
-Mcu.Pin86=PB8
-Mcu.Pin87=PB9
-Mcu.Pin88=PE0
-Mcu.Pin89=PE1
+Mcu.Pin80=PG13
+Mcu.Pin81=PG14
+Mcu.Pin82=PG15
+Mcu.Pin83=PB3
+Mcu.Pin84=PB4
+Mcu.Pin85=PB5
+Mcu.Pin86=PB6
+Mcu.Pin87=PB7
+Mcu.Pin88=PB8
+Mcu.Pin89=PB9
 Mcu.Pin9=PF5
-Mcu.Pin90=VP_CRC_VS_CRC
-Mcu.Pin91=VP_SYS_VS_Systick
-Mcu.Pin92=VP_MEMORYMAP_VS_MEMORYMAP
-Mcu.PinsNb=93
+Mcu.Pin90=PE0
+Mcu.Pin91=PE1
+Mcu.Pin92=VP_CRC_VS_CRC
+Mcu.Pin93=VP_SYS_VS_Systick
+Mcu.Pin94=VP_MEMORYMAP_VS_MEMORYMAP
+Mcu.PinsNb=95
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32H7A3ZITx
@ -198,7 +200,9 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:false
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-PA10.Mode=RGB565
+PA1.Mode=RGB666
+PA1.Signal=LTDC_R2
+PA10.Mode=RGB666
 PA10.Signal=LTDC_B4
 PA11.Mode=Device_Only_FS
 PA11.Signal=USB_OTG_HS_DM
@ -208,36 +212,36 @@ PA13.Mode=Trace_Asynchronous_SW
 PA13.Signal=DEBUG_JTMS-SWDIO
 PA14.Mode=Trace_Asynchronous_SW
 PA14.Signal=DEBUG_JTCK-SWCLK
-PA15.Mode=RGB565
+PA15.Mode=RGB666
 PA15.Signal=LTDC_B6
-PA3.Mode=RGB565
+PA3.Mode=RGB666
 PA3.Signal=LTDC_B5
 PA4.GPIOParameters=GPIO_Speed
 PA4.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
-PA4.Mode=RGB565
+PA4.Mode=RGB666
 PA4.Signal=LTDC_VSYNC
-PA5.Mode=RGB565
+PA5.Mode=RGB666
 PA5.Signal=LTDC_R4
-PA6.Mode=RGB565
+PA6.Mode=RGB666
 PA6.Signal=LTDC_G2
 PA7.Signal=FMC_SDNWE
-PA8.Mode=RGB565
+PA8.Mode=RGB666
 PA8.Signal=LTDC_B3
 PA9.Mode=Activate_VBUS_FS
 PA9.Signal=USB_OTG_HS_VBUS
-PB0.Mode=RGB565
+PB0.Mode=RGB666
 PB0.Signal=LTDC_R3
-PB1.Mode=RGB565
+PB1.Mode=RGB666
 PB1.Signal=LTDC_R6
-PB10.Mode=RGB565
+PB10.Mode=RGB666
 PB10.Signal=LTDC_G4
-PB11.Mode=RGB565
+PB11.Mode=RGB666
 PB11.Signal=LTDC_G5
 PB12.Mode=Asynchronous
 PB12.Signal=UART5_RX
 PB13.Mode=Asynchronous
 PB13.Signal=UART5_TX
-PB15.Mode=RGB565
+PB15.Mode=RGB666
 PB15.Signal=LTDC_G7
 PB3.Mode=Trace_Asynchronous_SW
 PB3.Signal=DEBUG_JTDO-SWO
@ -263,7 +267,7 @@ PB8.Mode=FDCAN_Activate
 PB8.Signal=FDCAN1_RX
 PB9.Mode=FDCAN_Activate
 PB9.Signal=FDCAN1_TX
-PC0.Mode=RGB565
+PC0.Mode=RGB666
 PC0.Signal=LTDC_R5
 PC10.GPIOParameters=PinState,GPIO_PuPd,GPIO_Label
 PC10.GPIO_Label=Display_Standby
@ -289,27 +293,29 @@ PC2_C.Mode=SdramChipSelect1_1
 PC2_C.Signal=FMC_SDNE0
 PC3_C.Mode=SdramChipSelect1_1
 PC3_C.Signal=FMC_SDCKE0
-PC4.Mode=RGB565
+PC4.Mode=RGB666
 PC4.Signal=LTDC_R7
 PC6.GPIOParameters=GPIO_Speed
 PC6.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
-PC6.Mode=RGB565
+PC6.Mode=RGB666
 PC6.Signal=LTDC_HSYNC
-PC7.Mode=RGB565
+PC7.Mode=RGB666
 PC7.Signal=LTDC_G6
 PC8.GPIOParameters=GPIO_Label
 PC8.GPIO_Label=Display_Reset
 PC8.Locked=true
 PC8.Signal=GPIO_Output
-PC9.Mode=RGB565
+PC9.Mode=RGB666
 PC9.Signal=LTDC_G3
 PD0.Signal=FMC_D2_DA2
 PD1.Signal=FMC_D3_DA3
 PD10.Signal=FMC_D15_DA15
 PD14.Signal=FMC_D0_DA0
 PD15.Signal=FMC_D1_DA1
-PD2.Mode=RGB565
+PD2.Mode=RGB666
 PD2.Signal=LTDC_B7
+PD6.Mode=RGB666
+PD6.Signal=LTDC_B2
 PD8.Signal=FMC_D13_DA13
 PD9.Signal=FMC_D14_DA14
 PE0.Signal=FMC_NBL0
@ -333,7 +339,7 @@ PF0.Signal=FMC_A0
 PF1.Signal=FMC_A1
 PF10.GPIOParameters=GPIO_PuPd
 PF10.GPIO_PuPd=GPIO_NOPULL
-PF10.Mode=RGB565
+PF10.Mode=RGB666
 PF10.Signal=LTDC_DE
 PF11.Signal=FMC_SDNRAS
 PF12.Signal=FMC_A6
@ -376,7 +382,7 @@ PG4.Signal=FMC_A14_BA0
 PG5.Signal=FMC_A15_BA1
 PG7.GPIOParameters=GPIO_Speed
 PG7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
-PG7.Mode=RGB565
+PG7.Mode=RGB666
 PG7.Signal=LTDC_CLK
 PG8.Signal=FMC_SDCLK
 PG9.GPIOParameters=GPIO_Label
@ -455,7 +461,6 @@ RCC.DIVM3=2
 RCC.DIVN1=25
 RCC.DIVN2=25
 RCC.DIVN3=20
-RCC.DIVP1=2
 RCC.DIVP1Freq_Value=200000000
 RCC.DIVP2=2
 RCC.DIVP2Freq_Value=200000000
@ -487,7 +492,7 @@ RCC.I2C123CLockSelection=RCC_I2C123CLKSOURCE_D2PCLK1
 RCC.I2C123Freq_Value=100000000
 RCC.I2C4CLockSelection=RCC_I2C4CLKSOURCE_D3PCLK1
 RCC.I2C4Freq_Value=100000000
-RCC.IPParameters=ADCCLockSelection,ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CDCPRE,CDCPREFreq_Value,CDPPRE,CDPPRE1,CDPPRE2,CECCLockSelection,CECFreq_Value,CKPERFreq_Value,CKPERSourceSelection,CSI_VALUE,CortexFreq_Value,Cortex_Div,Cortex_DivARG,CpuClockFreq_Value,DAC1Freq_Value,DAC2Freq_Value,DFSDM2ACLkFreq_Value,DFSDM2Freq_Value,DFSDMACLkFreq_Value,DFSDMCLockSelection,DFSDMFreq_Value,DIVM1,DIVM2,DIVM3,DIVN1,DIVN2,DIVN3,DIVP1,DIVP1Freq_Value,DIVP2,DIVP2Freq_Value,DIVP3,DIVP3Freq_Value,DIVQ1,DIVQ1Freq_Value,DIVQ2,DIVQ2Freq_Value,DIVQ3,DIVQ3Freq_Value,DIVR1,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3Freq_Value,EXTERNAL_CLOCK_VALUE,FDCANFreq_Value,FMCCLockSelection,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HSE_VALUE,HSI48_VALUE,HSIDiv,HSI_VALUE,I2C123CLockSelection,I2C123Freq_Value,I2C4CLockSelection,I2C4Freq_Value,LPTIM1CLockSelection,LPTIM1Freq_Value,LPTIM2CLockSelection,LPTIM2Freq_Value,LPTIM345CLockSelection,LPTIM345Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSI_VALUE,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL3FRACN,PLLFRACN,PLLSourceVirtual,QSPICLockSelection,QSPIFreq_Value,RCC_MCO1Source,RCC_MCO2Source,RCC_MCODiv1,RCC_MCODiv2,RCC_RTC_Clock_Source_FROM_HSE,RNGCLockSelection,RNGFreq_Value,RTCFreq_Value,SAI1CLockSelection,SAI1Freq_Value,SAI2AFreq_Value,SAI2BCLockSelection,SAI2BFreq_Value,SDMMC1CLockSelection,SDMMCFreq_Value,SPDIFCLockSelection,SPDIFRXFreq_Value,SPI123CLockSelection,SPI123Freq_Value,SPI45Freq_Value,SPI6CLockSelection,SPI6Freq_Value,SRDPPRE,SWPCLockSelection,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Spi45ClockSelection,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16CLockSelection,USART16Freq_Value,USART234578CLockSelection,USART234578Freq_Value,USBCLockSelection,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value,WatchDogFreq_Value
+RCC.IPParameters=ADCCLockSelection,ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CDCPRE,CDCPREFreq_Value,CDPPRE,CDPPRE1,CDPPRE2,CECCLockSelection,CECFreq_Value,CKPERFreq_Value,CKPERSourceSelection,CSI_VALUE,CortexFreq_Value,Cortex_Div,Cortex_DivARG,CpuClockFreq_Value,DAC1Freq_Value,DAC2Freq_Value,DFSDM2ACLkFreq_Value,DFSDM2Freq_Value,DFSDMACLkFreq_Value,DFSDMCLockSelection,DFSDMFreq_Value,DIVM1,DIVM2,DIVM3,DIVN1,DIVN2,DIVN3,DIVP1Freq_Value,DIVP2,DIVP2Freq_Value,DIVP3,DIVP3Freq_Value,DIVQ1,DIVQ1Freq_Value,DIVQ2,DIVQ2Freq_Value,DIVQ3,DIVQ3Freq_Value,DIVR1,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3Freq_Value,EXTERNAL_CLOCK_VALUE,FDCANFreq_Value,FMCCLockSelection,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HSE_VALUE,HSI48_VALUE,HSIDiv,HSI_VALUE,I2C123CLockSelection,I2C123Freq_Value,I2C4CLockSelection,I2C4Freq_Value,LPTIM1CLockSelection,LPTIM1Freq_Value,LPTIM2CLockSelection,LPTIM2Freq_Value,LPTIM345CLockSelection,LPTIM345Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSI_VALUE,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL3FRACN,PLLFRACN,PLLSourceVirtual,QSPICLockSelection,QSPIFreq_Value,RCC_MCO1Source,RCC_MCO2Source,RCC_MCODiv1,RCC_MCODiv2,RCC_RTC_Clock_Source_FROM_HSE,RNGCLockSelection,RNGFreq_Value,RTCFreq_Value,SAI1CLockSelection,SAI1Freq_Value,SAI2AFreq_Value,SAI2BCLockSelection,SAI2BFreq_Value,SDMMC1CLockSelection,SDMMCFreq_Value,SPDIFCLockSelection,SPDIFRXFreq_Value,SPI123CLockSelection,SPI123Freq_Value,SPI45Freq_Value,SPI6CLockSelection,SPI6Freq_Value,SRDPPRE,SWPCLockSelection,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Spi45ClockSelection,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16CLockSelection,USART16Freq_Value,USART234578CLockSelection,USART234578Freq_Value,USBCLockSelection,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value,WatchDogFreq_Value
 RCC.LPTIM1CLockSelection=RCC_LPTIM1CLKSOURCE_D2PCLK1
 RCC.LPTIM1Freq_Value=100000000
 RCC.LPTIM2CLockSelection=RCC_LPTIM2CLKSOURCE_D3PCLK1
--- a/Software/Makefile
+++ b/Software/Makefile
@ -1,5 +1,5 @@
 ##########################################################################################################################
-# File automatically-generated by tool: [projectgenerator] version: [4.5.0-RC5] date: [Thu Apr 03 21:48:01 CEST 2025] 
+# File automatically-generated by tool: [projectgenerator] version: [4.5.0-RC5] date: [Tue Apr 22 18:51:35 CEST 2025] 
 ##########################################################################################################################

 # ------------------------------------------------
--- a/Software/build/FT23_Charger.map
+++ b/Software/build/FT23_Charger.map
--- a/53
+++ b/53
@ -0,0 +1,53 @@
+* [33mcace582[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32m23er-charger-test[m[33m, [m[1;31morigin/23er-charger-test[m[33m)[m changes to ioc file that also doesn't work
+* [33mdd3dacb[m make frequency higher
+* [33m8f8bdae[m ram test (old code)
+* [33m35be2d3[m ioc change
+* [33mb7349c3[m old code test
+* [33m22d0567[m sdram test
+* [33m82a3729[m change memory allocation
+* [33m7e4ce4a[m discard previous trial, tried display with internal frame buffer
+[31m|[m * [33m9108108[m[33m ([m[1;31morigin/23er-alte-code[m[33m, [m[1;32m23er-alte-code[m[33m)[m encounter touchgfx build problem, giving up for now
+[31m|[m * [33m03a0401[m add Path to Makefile (sadly still cant build)
+[31m|[m * [33m3c4e929[m uncomment things
+[31m|[m * [33m6758a1f[m add header file
+[31m|[m * [33mdcd04e2[m touchgfx compilation attempt
+[31m|[m[31m/[m  
+* [33mc30b708[m first software regen
+* [33mc1c85c2[m create new branch for 23 charger testing
+[32m|[m * [33m16d994b[m[33m ([m[1;31morigin/FT25[m[33m, [m[1;32mFT25[m[33m)[m add zener name, clean up
+[32m|[m * [33mc9a0c04[m change supply circuit
+[32m|[m * [33m696c5f1[m file cleanup for new gitignore
+[32m|[m * [33m49bba49[m add battery for RTC
+[32m|[m * [33me4a84b4[m change footprint to match ordered components
+[32m|[m * [33md87cf5d[m test
+[32m|[m * [33m4d17be8[m add review changes
+[32m|[m * [33m9dd8e6b[m add changes from PCB review
+[32m|[m[32m/[m  
+* [33m177f474[m[33m ([m[1;33mtag: [m[1;33mFT25-V0.1[m[33m, [m[1;31morigin/main[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmain[m[33m)[m change schematic
+* [33m1b90194[m change dimension
+* [33m10fe171[m Bauteil Positionierung
+* [33mf3088f4[m finishing schematic, starting to try layout position
+* [33m6c67a2a[m add more function and board clean-up
+* [33m8440c06[m add USB circuit
+* [33m47de276[m add footprint, change IEC circuit size
+* [33ma069658[m added footprints & 3d models
+* [33m0d41d02[m clean up
+* [33m6394f06[m change structure again (added peripheral sheet)
+* [33m229155a[m display circuit
+* [33mf3606df[m add labels
+* [33mcd48af6[m structure change
+* [33m2d2c665[m delete unnecessary file
+* [33m991c6a0[m finalise Ethernet circuit
+* [33mb970b6e[m add SDC and SCS
+* [33m79e716c[m add ethernet circuit
+* [33mf42912f[m change file structure
+* [33mb28d41c[m add ioc file
+* [33m426d20f[m check branch
+* [33m6884a27[m[33m ([m[1;33mtag: [m[1;33mFT23-V1.0[m[33m)[m fix link
+* [33m96d1c1c[m change directory structure
+* [33m5823599[m add README.md
+* [33m105e91f[m change directory structure, using normed naming scheme
+* [33m4a7b54a[m Mirror TSActive on RSD. Don't do anything else.
+* [33m1cbfd28[m Initial commit
+* [33m1d1fd25[m[33m ([m[1;31morigin/threadx-attempt[m[33m, [m[1;32mthreadx-attempt[m[33m)[m Flashing LEDs
+* [33me75f14b[m Create .ioc