Changeset 97 for ctrl/firmware/Main/CubeMX

Timestamp:

Feb 14, 2025, 3:46:57 PM (3 months ago)

Author:

Zed

Message:

DAC works.

Location:

ctrl/firmware/Main/CubeMX

Files:

• Core/Inc/dac.h (added)
• Core/Inc/main.h (modified) (1 diff)
• Core/Inc/stm32h7xx_hal_conf.h (modified) (1 diff)
• Core/Src/dac.c (added)
• Core/Src/gpio.c (modified) (1 diff)
• Core/Src/main.c (modified) (2 diffs)
• Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_dac.h (added)
• Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dac.c (added)
• charger.ioc (modified) (5 diffs)

ctrl/firmware/Main/CubeMX/Core/Inc/main.h

@@ -70 +70 @@
 #define U_BAT_Pin GPIO_PIN_0
 #define U_BAT_GPIO_Port GPIOC
+#define DAC_U_LIMIT_Pin GPIO_PIN_5
+#define DAC_U_LIMIT_GPIO_Port GPIOA
 #define POWER_4V_EN_Pin GPIO_PIN_15
 #define POWER_4V_EN_GPIO_Port GPIOF

ctrl/firmware/Main/CubeMX/Core/Inc/stm32h7xx_hal_conf.h

@@ -43 +43 @@
 /* #define HAL_CRC_MODULE_ENABLED   */
 /* #define HAL_CRYP_MODULE_ENABLED   */
-/* #define HAL_DAC_MODULE_ENABLED   */
+#define HAL_DAC_MODULE_ENABLED
 /* #define HAL_DCMI_MODULE_ENABLED   */
 /* #define HAL_DMA2D_MODULE_ENABLED   */

ctrl/firmware/Main/CubeMX/Core/Src/gpio.c

@@ -118 +118 @@
 
   /*Configure GPIO pins : PA0 PA1 PA2 PA3
-                           PA4 PA5 PA6 PA7
-                           PA9 PA10 PA11 PA12 */
+                           PA4 PA6 PA7 PA9
+                           PA10 PA11 PA12 */
   GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3
-                          |GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7
-                          |GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12;
+                          |GPIO_PIN_4|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_9
+                          |GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

ctrl/firmware/Main/CubeMX/Core/Src/main.c

@@ -22 +22 @@
 #include "adc.h"
 #include "bdma.h"
+#include "dac.h"
 #include "dma.h"
 #include "dts.h"
@@ -147 +148 @@
   MX_USART3_UART_Init();
   MX_DTS_Init();
+  MX_DAC1_Init();
   /* USER CODE BEGIN 2 */
 

ctrl/firmware/Main/CubeMX/charger.ioc

@@ -70 +70 @@
 CORTEX_M7.TypeExtField_S-Cortex_Memory_Protection_Unit_Region2_Settings_S=MPU_TEX_LEVEL1
 CORTEX_M7.default_mode_Activation=1
+DAC1.DAC_Channel-DAC_OUT2=DAC_CHANNEL_2
+DAC1.IPParameters=DAC_Channel-DAC_OUT2
 DTS.IPParameters=RefClock,SamplingTime
 DTS.RefClock=DTS_REFCLKSEL_LSE
@@ -274 +276 @@
 Mcu.IP0=ADC3
 Mcu.IP1=BDMA
-Mcu.IP10=MEMORYMAP
-Mcu.IP11=NVIC
-Mcu.IP12=RCC
-Mcu.IP13=RTC
-Mcu.IP14=SDMMC1
-Mcu.IP15=SPI2
-Mcu.IP16=SPI4
-Mcu.IP17=SYS
-Mcu.IP18=TIM3
-Mcu.IP19=TIM6
+Mcu.IP10=I2C2
+Mcu.IP11=MEMORYMAP
+Mcu.IP12=NVIC
+Mcu.IP13=RCC
+Mcu.IP14=RTC
+Mcu.IP15=SDMMC1
+Mcu.IP16=SPI2
+Mcu.IP17=SPI4
+Mcu.IP18=SYS
+Mcu.IP19=TIM3
 Mcu.IP2=CORTEX_M7
-Mcu.IP20=TIM8
-Mcu.IP21=USART2
-Mcu.IP22=USART3
-Mcu.IP23=USART10
-Mcu.IP24=VREFBUF
-Mcu.IP3=DEBUG
-Mcu.IP4=DMA
-Mcu.IP5=DTS
-Mcu.IP6=FATFS
-Mcu.IP7=FREERTOS
-Mcu.IP8=I2C1
-Mcu.IP9=I2C2
-Mcu.IPNb=25
+Mcu.IP20=TIM6
+Mcu.IP21=TIM8
+Mcu.IP22=USART2
+Mcu.IP23=USART3
+Mcu.IP24=USART10
+Mcu.IP25=VREFBUF
+Mcu.IP3=DAC1
+Mcu.IP4=DEBUG
+Mcu.IP5=DMA
+Mcu.IP6=DTS
+Mcu.IP7=FATFS
+Mcu.IP8=FREERTOS
+Mcu.IP9=I2C1
+Mcu.IPNb=26
 Mcu.Name=STM32H723ZETx
 Mcu.Package=LQFP144
 Mcu.Pin0=PE2
 Mcu.Pin1=PE3
-Mcu.Pin10=PF15
-Mcu.Pin11=PG0
-Mcu.Pin12=PG1
-Mcu.Pin13=PE7
-Mcu.Pin14=PE11
-Mcu.Pin15=PE12
-Mcu.Pin16=PE13
-Mcu.Pin17=PE14
-Mcu.Pin18=PE15
-Mcu.Pin19=PB10
+Mcu.Pin10=PA5
+Mcu.Pin11=PF15
+Mcu.Pin12=PG0
+Mcu.Pin13=PG1
+Mcu.Pin14=PE7
+Mcu.Pin15=PE11
+Mcu.Pin16=PE12
+Mcu.Pin17=PE13
+Mcu.Pin18=PE14
+Mcu.Pin19=PE15
 Mcu.Pin2=PE6
-Mcu.Pin20=PB14
-Mcu.Pin21=PB15
-Mcu.Pin22=PD8
-Mcu.Pin23=PD9
-Mcu.Pin24=PD10
-Mcu.Pin25=PD11
-Mcu.Pin26=PD12
-Mcu.Pin27=PD13
-Mcu.Pin28=PC6
-Mcu.Pin29=PC7
+Mcu.Pin20=PB10
+Mcu.Pin21=PB14
+Mcu.Pin22=PB15
+Mcu.Pin23=PD8
+Mcu.Pin24=PD9
+Mcu.Pin25=PD10
+Mcu.Pin26=PD11
+Mcu.Pin27=PD12
+Mcu.Pin28=PD13
+Mcu.Pin29=PC6
 Mcu.Pin3=PC14-OSC32_IN
-Mcu.Pin30=PC8
-Mcu.Pin31=PC9
-Mcu.Pin32=PA8
-Mcu.Pin33=PA13(JTMS/SWDIO)
-Mcu.Pin34=PA14(JTCK/SWCLK)
-Mcu.Pin35=PA15(JTDI)
-Mcu.Pin36=PC10
-Mcu.Pin37=PC11
-Mcu.Pin38=PC12
-Mcu.Pin39=PD2
+Mcu.Pin30=PC7
+Mcu.Pin31=PC8
+Mcu.Pin32=PC9
+Mcu.Pin33=PA8
+Mcu.Pin34=PA13(JTMS/SWDIO)
+Mcu.Pin35=PA14(JTCK/SWCLK)
+Mcu.Pin36=PA15(JTDI)
+Mcu.Pin37=PC10
+Mcu.Pin38=PC11
+Mcu.Pin39=PC12
 Mcu.Pin4=PC15-OSC32_OUT
-Mcu.Pin40=PD3
-Mcu.Pin41=PD4
-Mcu.Pin42=PD5
-Mcu.Pin43=PD6
-Mcu.Pin44=PD7
-Mcu.Pin45=PG9
-Mcu.Pin46=PG10
-Mcu.Pin47=PG11
-Mcu.Pin48=PG12
-Mcu.Pin49=PG13
+Mcu.Pin40=PD2
+Mcu.Pin41=PD3
+Mcu.Pin42=PD4
+Mcu.Pin43=PD5
+Mcu.Pin44=PD6
+Mcu.Pin45=PD7
+Mcu.Pin46=PG9
+Mcu.Pin47=PG10
+Mcu.Pin48=PG11
+Mcu.Pin49=PG12
 Mcu.Pin5=PF0
-Mcu.Pin50=PG14
-Mcu.Pin51=PG15
-Mcu.Pin52=PB4(NJTRST)
-Mcu.Pin53=PB6
-Mcu.Pin54=PB7
-Mcu.Pin55=PB8
-Mcu.Pin56=PB9
-Mcu.Pin57=VP_ADC3_TempSens_Input
-Mcu.Pin58=VP_ADC3_Vref_Input
-Mcu.Pin59=VP_ADC3_Vbat_Input
+Mcu.Pin50=PG13
+Mcu.Pin51=PG14
+Mcu.Pin52=PG15
+Mcu.Pin53=PB4(NJTRST)
+Mcu.Pin54=PB6
+Mcu.Pin55=PB7
+Mcu.Pin56=PB8
+Mcu.Pin57=PB9
+Mcu.Pin58=VP_ADC3_TempSens_Input
+Mcu.Pin59=VP_ADC3_Vref_Input
 Mcu.Pin6=PF1
-Mcu.Pin60=VP_DTS_VS-DTS
-Mcu.Pin61=VP_FATFS_VS_SDIO
-Mcu.Pin62=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin63=VP_RTC_VS_RTC_Activate
-Mcu.Pin64=VP_RTC_VS_RTC_Calendar
-Mcu.Pin65=VP_SYS_VS_tim7
-Mcu.Pin66=VP_TIM3_VS_ClockSourceINT
-Mcu.Pin67=VP_TIM6_VS_ClockSourceINT
-Mcu.Pin68=VP_TIM8_VS_ControllerModeReset
-Mcu.Pin69=VP_TIM8_VS_ClockSourceINT
+Mcu.Pin60=VP_ADC3_Vbat_Input
+Mcu.Pin61=VP_DTS_VS-DTS
+Mcu.Pin62=VP_FATFS_VS_SDIO
+Mcu.Pin63=VP_FREERTOS_VS_CMSIS_V2
+Mcu.Pin64=VP_RTC_VS_RTC_Activate
+Mcu.Pin65=VP_RTC_VS_RTC_Calendar
+Mcu.Pin66=VP_SYS_VS_tim7
+Mcu.Pin67=VP_TIM3_VS_ClockSourceINT
+Mcu.Pin68=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin69=VP_TIM8_VS_ControllerModeReset
 Mcu.Pin7=PH0-OSC_IN
-Mcu.Pin70=VP_VREFBUF_V_VREFBUF
-Mcu.Pin71=VP_MEMORYMAP_VS_MEMORYMAP
-Mcu.Pin72=VP_STMicroelectronics.X-CUBE-EEPRMA1_VS_BoardOoPartJjEEPROM_5.1.0_5.1.0
+Mcu.Pin70=VP_TIM8_VS_ClockSourceINT
+Mcu.Pin71=VP_VREFBUF_V_VREFBUF
+Mcu.Pin72=VP_MEMORYMAP_VS_MEMORYMAP
+Mcu.Pin73=VP_STMicroelectronics.X-CUBE-EEPRMA1_VS_BoardOoPartJjEEPROM_5.1.0_5.1.0
 Mcu.Pin8=PH1-OSC_OUT
 Mcu.Pin9=PC0
-Mcu.PinsNb=73
+Mcu.PinsNb=74
 Mcu.ThirdParty0=STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0
 Mcu.ThirdParty1=STMicroelectronics.X-CUBE-EEPRMA1.5.1.0
@@ -422 +426 @@
 PA15(JTDI).Locked=true
 PA15(JTDI).Signal=GPIO_Output
+PA5.GPIOParameters=GPIO_Label
+PA5.GPIO_Label=DAC_U_LIMIT
+PA5.Locked=true
+PA5.Signal=COMP_DAC12_group
 PA8.GPIOParameters=GPIO_PuPd,GPIO_Label
 PA8.GPIO_Label=SD_DETECT
@@ -665 +673 @@
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-MX_BDMA_Init-BDMA-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_SPI4_Init-SPI4-false-HAL-true,6-MX_SDMMC1_SD_Init-SDMMC1-false-HAL-true,7-SystemClock_Config-RCC-false-HAL-false,8-MX_FATFS_Init-FATFS-false-HAL-false,9-MX_TIM8_Init-TIM8-false-HAL-true,10-MX_SPI2_Init-SPI2-false-HAL-true,11-MX_USART2_UART_Init-USART2-false-HAL-true,12-MX_USART10_UART_Init-USART10-false-HAL-true,13-MX_TIM6_Init-TIM6-false-HAL-true,14-MX_I2C2_Init-I2C2-false-HAL-true,15-MX_ADC3_Init-ADC3-false-HAL-true,16-MX_TIM3_Init-TIM3-false-HAL-true,17-MX_I2C1_Init-I2C1-false-HAL-true,18-MX_USART3_UART_Init-USART3-false-HAL-true,19-MX_DTS_Init-DTS-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,0-MX_VREFBUF_Init-VREFBUF-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-MX_BDMA_Init-BDMA-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_SPI4_Init-SPI4-false-HAL-true,6-MX_SDMMC1_SD_Init-SDMMC1-false-HAL-true,7-SystemClock_Config-RCC-false-HAL-false,8-MX_FATFS_Init-FATFS-false-HAL-false,9-MX_TIM8_Init-TIM8-false-HAL-true,10-MX_SPI2_Init-SPI2-false-HAL-true,11-MX_USART2_UART_Init-USART2-false-HAL-true,12-MX_USART10_UART_Init-USART10-false-HAL-true,13-MX_TIM6_Init-TIM6-false-HAL-true,14-MX_I2C2_Init-I2C2-false-HAL-true,15-MX_ADC3_Init-ADC3-false-HAL-true,16-MX_TIM3_Init-TIM3-false-HAL-true,17-MX_I2C1_Init-I2C1-false-HAL-true,18-MX_USART3_UART_Init-USART3-false-HAL-true,19-MX_DTS_Init-DTS-false-HAL-true,20-MX_DAC1_Init-DAC1-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,0-MX_VREFBUF_Init-VREFBUF-false-HAL-true
 RCC.ADCCLockSelection=RCC_ADCCLKSOURCE_PLL3
 RCC.ADCFreq_Value=60000000
@@ -762 +770 @@
 SH.ADCx_INP10.0=ADC3_INP10,IN10-Single-Ended
 SH.ADCx_INP10.ConfNb=1
+SH.COMP_DAC12_group.0=DAC1_OUT2,DAC_OUT2
+SH.COMP_DAC12_group.ConfNb=1
 SH.GPXTI8.0=GPIO_EXTI8
 SH.GPXTI8.ConfNb=1