Changeset 88 for ctrl/firmware/Main/CubeMX

Timestamp:

Feb 11, 2025, 4:00:08 PM (3 months ago)

Author:

Zed

Message:

BME280 data transfer works ok. Device returns its ID 0x60.

Location:

ctrl/firmware/Main/CubeMX

Files:

• Core/Inc/i2c.h (added)
• Core/Inc/main.h (modified) (1 diff)
• Core/Src/freertos.c (modified) (6 diffs)
• Core/Src/gpio.c (modified) (1 diff)
• Core/Src/i2c.c (added)
• Core/Src/main.c (modified) (4 diffs)
• Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_i2c.c (added)
• Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_i2c_ex.c (added)
• charger.ioc (modified) (5 diffs)

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

@@ -126 +126 @@
 #define ETH_SPI_NSS_Pin GPIO_PIN_4
 #define ETH_SPI_NSS_GPIO_Port GPIOB
+#define BME_I2C_SCL_Pin GPIO_PIN_6
+#define BME_I2C_SCL_GPIO_Port GPIOB
+#define BME_I2C_SDA_Pin GPIO_PIN_7
+#define BME_I2C_SDA_GPIO_Port GPIOB
 #define ETH_SPI_INT_Pin GPIO_PIN_8
 #define ETH_SPI_INT_GPIO_Port GPIOB

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

@@ -36 +36 @@
 #include "beeper_task.h"
 #include "onewire_task.h"
+#include "bme_task.h"
 
 /* USER CODE END Includes */
@@ -53 +54 @@
 #define BEEPER_TASK_STACK_DEPTH_WORDS                           (128U)
 #define ONEWIRE_TASK_STACK_DEPTH_WORDS                          (128U)
+#define BME_TASK_STACK_DEPTH_WORDS                                      (256U)
 
 /* USER CODE END PD */
@@ -69 +71 @@
 static StackType_t beeperTaskStackBuffer[BEEPER_TASK_STACK_DEPTH_WORDS]                                 __attribute__((section(".DTCM_RAM")));
 static StackType_t onewireTaskStackBuffer[ONEWIRE_TASK_STACK_DEPTH_WORDS]                               __attribute__((section(".DTCM_RAM")));
+static StackType_t bmeTaskStackBuffer[BME_TASK_STACK_DEPTH_WORDS]                                               __attribute__((section(".DTCM_RAM")));
 
 static uint8_t beeperQueueStorageArea[BEEPER_QUEUE_SIZE * BEEPER_QUEUE_ITEM_SIZE]               __attribute__((section(".DTCM_RAM")));
@@ -78 +81 @@
 static StaticTask_t beeperTaskBuffer                                                                                                    __attribute__((section(".DTCM_RAM")));
 static StaticTask_t onewireTaskBuffer                                                                                                   __attribute__((section(".DTCM_RAM")));
+static StaticTask_t bmeTaskBuffer                                                                                                               __attribute__((section(".DTCM_RAM")));
 
 static StaticQueue_t beeperQueueBuffer                                                                                                  __attribute__((section(".DTCM_RAM")));
@@ -87 +91 @@
 static const char* const beeperTaskName = "BeeperTask";
 static const char* const onewireTaskName = "1WireTask";
-
+static const char* const bmeTaskName = "BMETask";
 
 /* USER CODE END Variables */
@@ -190 +194 @@
   if (r == NULL) printf("Cannot create %s!\n", onewireTaskName);
 
+  r = xTaskCreateStatic(bmeTaskStart, bmeTaskName, BME_TASK_STACK_DEPTH_WORDS, NULL, 24, bmeTaskStackBuffer, &bmeTaskBuffer);
+  if (r == NULL) printf("Cannot create %s!\n", bmeTaskName);
+
   /* USER CODE END RTOS_THREADS */
 

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

@@ -128 +128 @@
 
   /*Configure GPIO pins : PB0 PB1 PB2 PB11
-                           PB12 PB13 PB3 PB5
-                           PB6 PB7 */
+                           PB12 PB13 PB3 PB5 */
   GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_11
-                          |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_3|GPIO_PIN_5
-                          |GPIO_PIN_6|GPIO_PIN_7;
+                          |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_3|GPIO_PIN_5;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

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

@@ -22 +22 @@
 #include "dma.h"
 #include "fatfs.h"
+#include "i2c.h"
 #include "mdma.h"
 #include "memorymap.h"
@@ -140 +141 @@
   MX_USART10_UART_Init();
   MX_TIM6_Init();
+  MX_I2C1_Init();
   /* USER CODE BEGIN 2 */
 
@@ -193 +195 @@
   * in the RCC_OscInitTypeDef structure.
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE
+                              |RCC_OSCILLATORTYPE_LSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSIState = RCC_HSI_DIV1;
+  RCC_OscInitStruct.HSICalibrationValue = 64;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
@@ -246 +251 @@
   PeriphClkInitStruct.PLL3.PLL3P = 2;
   PeriphClkInitStruct.PLL3.PLL3Q = 8;
-  PeriphClkInitStruct.PLL3.PLL3R = 2;
+  PeriphClkInitStruct.PLL3.PLL3R = 4;
   PeriphClkInitStruct.PLL3.PLL3RGE = RCC_PLL3VCIRANGE_0;
   PeriphClkInitStruct.PLL3.PLL3VCOSEL = RCC_PLL3VCOMEDIUM;

ctrl/firmware/Main/CubeMX/charger.ioc

@@ -210 +210 @@
 Mcu.IP0=CORTEX_M7
 Mcu.IP1=DEBUG
-Mcu.IP10=SDMMC1
-Mcu.IP11=SPI2
-Mcu.IP12=SPI4
-Mcu.IP13=SYS
-Mcu.IP14=TIM3
-Mcu.IP15=TIM6
-Mcu.IP16=TIM8
-Mcu.IP17=USART2
-Mcu.IP18=USART3
-Mcu.IP19=USART10
+Mcu.IP10=RTC
+Mcu.IP11=SDMMC1
+Mcu.IP12=SPI2
+Mcu.IP13=SPI4
+Mcu.IP14=SYS
+Mcu.IP15=TIM3
+Mcu.IP16=TIM6
+Mcu.IP17=TIM8
+Mcu.IP18=USART2
+Mcu.IP19=USART3
 Mcu.IP2=DMA
+Mcu.IP20=USART10
 Mcu.IP3=FATFS
 Mcu.IP4=FREERTOS
-Mcu.IP5=MDMA
-Mcu.IP6=MEMORYMAP
-Mcu.IP7=NVIC
-Mcu.IP8=RCC
-Mcu.IP9=RTC
-Mcu.IPNb=20
+Mcu.IP5=I2C1
+Mcu.IP6=MDMA
+Mcu.IP7=MEMORYMAP
+Mcu.IP8=NVIC
+Mcu.IP9=RCC
+Mcu.IPNb=21
 Mcu.Name=STM32H723ZETx
 Mcu.Package=LQFP144
@@ -277 +278 @@
 Mcu.Pin49=PB4(NJTRST)
 Mcu.Pin5=PH0-OSC_IN
-Mcu.Pin50=PB8
-Mcu.Pin51=PB9
-Mcu.Pin52=VP_FATFS_VS_SDIO
-Mcu.Pin53=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin54=VP_RTC_VS_RTC_Activate
-Mcu.Pin55=VP_RTC_VS_RTC_Calendar
-Mcu.Pin56=VP_SYS_VS_tim7
-Mcu.Pin57=VP_TIM3_VS_ClockSourceINT
-Mcu.Pin58=VP_TIM6_VS_ClockSourceINT
-Mcu.Pin59=VP_TIM8_VS_ControllerModeReset
+Mcu.Pin50=PB6
+Mcu.Pin51=PB7
+Mcu.Pin52=PB8
+Mcu.Pin53=PB9
+Mcu.Pin54=VP_FATFS_VS_SDIO
+Mcu.Pin55=VP_FREERTOS_VS_CMSIS_V2
+Mcu.Pin56=VP_RTC_VS_RTC_Activate
+Mcu.Pin57=VP_RTC_VS_RTC_Calendar
+Mcu.Pin58=VP_SYS_VS_tim7
+Mcu.Pin59=VP_TIM3_VS_ClockSourceINT
 Mcu.Pin6=PH1-OSC_OUT
-Mcu.Pin60=VP_TIM8_VS_ClockSourceINT
-Mcu.Pin61=VP_MEMORYMAP_VS_MEMORYMAP
+Mcu.Pin60=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin61=VP_TIM8_VS_ControllerModeReset
+Mcu.Pin62=VP_TIM8_VS_ClockSourceINT
+Mcu.Pin63=VP_MEMORYMAP_VS_MEMORYMAP
 Mcu.Pin7=PF15
 Mcu.Pin8=PG0
 Mcu.Pin9=PG1
-Mcu.PinsNb=62
+Mcu.PinsNb=64
 Mcu.ThirdParty0=STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0
 Mcu.ThirdPartyNb=1
@@ -395 +398 @@
 PB4(NJTRST).PinState=GPIO_PIN_SET
 PB4(NJTRST).Signal=GPIO_Output
+PB6.GPIOParameters=GPIO_Label
+PB6.GPIO_Label=BME_I2C_SCL
+PB6.Locked=true
+PB6.Mode=I2C
+PB6.Signal=I2C1_SCL
+PB7.GPIOParameters=GPIO_Label
+PB7.GPIO_Label=BME_I2C_SDA
+PB7.Locked=true
+PB7.Mode=I2C
+PB7.Signal=I2C1_SDA
 PB8.GPIOParameters=GPIO_Label,GPIO_ModeDefaultEXTI
 PB8.GPIO_Label=ETH_SPI_INT
@@ -620 +633 @@
 RCC.DIVR2=10
 RCC.DIVR2Freq_Value=25000000
-RCC.DIVR3Freq_Value=100000000
+RCC.DIVR3=4
+RCC.DIVR3Freq_Value=50000000
 RCC.FDCANFreq_Value=100000000
 RCC.FMCFreq_Value=100000000
@@ -626 +640 @@
 RCC.HCLK3ClockFreq_Value=100000000
 RCC.HCLKFreq_Value=100000000
-RCC.I2C123Freq_Value=100000000
+RCC.I2C123CLockSelection=RCC_I2C1235CLKSOURCE_HSI
+RCC.I2C123Freq_Value=64000000
 RCC.I2C4Freq_Value=100000000
-RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVM2,DIVM3,DIVN1,DIVN2,DIVN3,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1Freq_Value,DIVQ2,DIVQ2Freq_Value,DIVQ3,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2,DIVR2Freq_Value,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL2_VCI_Range-AdvancedSettings,PLLFRACN,PLLSourceVirtual,QSPIFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123CLockSelection,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Spi45ClockSelection,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16CLockSelection,USART16Freq_Value,USART234578CLockSelection,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value
+RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVM2,DIVM3,DIVN1,DIVN2,DIVN3,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1Freq_Value,DIVQ2,DIVQ2Freq_Value,DIVQ3,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2,DIVR2Freq_Value,DIVR3,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,I2C123CLockSelection,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL2_VCI_Range-AdvancedSettings,PLLFRACN,PLLSourceVirtual,QSPIFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123CLockSelection,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Spi45ClockSelection,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16CLockSelection,USART16Freq_Value,USART234578CLockSelection,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value
 RCC.LPTIM1Freq_Value=100000000
 RCC.LPTIM2Freq_Value=100000000
 RCC.LPTIM345Freq_Value=100000000
 RCC.LPUART1Freq_Value=100000000
-RCC.LTDCFreq_Value=100000000
+RCC.LTDCFreq_Value=50000000
 RCC.MCO1PinFreq_Value=64000000
 RCC.MCO2PinFreq_Value=100000000