Changeset 88 for ctrl/firmware/Main/CubeMX/Core

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/Core

Files:

• Inc/i2c.h (added)
• Inc/main.h (modified) (1 diff)
• Src/freertos.c (modified) (6 diffs)
• Src/gpio.c (modified) (1 diff)
• Src/i2c.c (added)
• Src/main.c (modified) (4 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;