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

Timestamp:

Mar 21, 2025, 4:33:42 PM (7 weeks ago)

Author:

Zed

Message:

Added CAN bus support.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/main.h (modified) (3 diffs)
• Inc/stm32h7xx_hal_conf.h (modified) (1 diff)
• Src/adc.c (modified) (6 diffs)
• Src/gpio.c (modified) (1 diff)
• Src/main.c (modified) (4 diffs)

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

@@ -68 +68 @@
 #define EEPROM_I2C_SCL_Pin GPIO_PIN_1
 #define EEPROM_I2C_SCL_GPIO_Port GPIOF
-#define U_BAT_Pin GPIO_PIN_0
-#define U_BAT_GPIO_Port GPIOC
+#define BAT_U_RAW_Pin GPIO_PIN_0
+#define BAT_U_RAW_GPIO_Port GPIOC
 #define DAC_LOAD_I_LIMIT_Pin GPIO_PIN_4
 #define DAC_LOAD_I_LIMIT_GPIO_Port GPIOA
@@ -78 +78 @@
 #define BAT_I_SENSE_MINUS_Pin GPIO_PIN_7
 #define BAT_I_SENSE_MINUS_GPIO_Port GPIOA
+#define LOAD_I_SENSE_PLUS_Pin GPIO_PIN_4
+#define LOAD_I_SENSE_PLUS_GPIO_Port GPIOC
+#define LOAD_I_SENSE_MINUS_Pin GPIO_PIN_5
+#define LOAD_I_SENSE_MINUS_GPIO_Port GPIOC
+#define BAT_U_SENSE_MINUS_Pin GPIO_PIN_0
+#define BAT_U_SENSE_MINUS_GPIO_Port GPIOB
+#define BAT_U_SENSE_PLUS_Pin GPIO_PIN_1
+#define BAT_U_SENSE_PLUS_GPIO_Port GPIOB
 #define U_BAT_SCALE_SWITCH_Pin GPIO_PIN_2
 #define U_BAT_SCALE_SWITCH_GPIO_Port GPIOB
@@ -120 +128 @@
 #define ONEWIRE_TEMP_BUS_Pin GPIO_PIN_15
 #define ONEWIRE_TEMP_BUS_GPIO_Port GPIOA
+#define CAN_RX_Pin GPIO_PIN_0
+#define CAN_RX_GPIO_Port GPIOD
+#define CAN_TX_Pin GPIO_PIN_1
+#define CAN_TX_GPIO_Port GPIOD
 #define ETH_SPI_PWR_Pin GPIO_PIN_3
 #define ETH_SPI_PWR_GPIO_Port GPIOD

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

@@ -36 +36 @@
 
   #define HAL_ADC_MODULE_ENABLED
-/* #define HAL_FDCAN_MODULE_ENABLED   */
+#define HAL_FDCAN_MODULE_ENABLED
 /* #define HAL_FMAC_MODULE_ENABLED   */
 /* #define HAL_CEC_MODULE_ENABLED   */

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

@@ -81 +81 @@
   sConfig.Channel = ADC_CHANNEL_3;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_32CYCLES_5;//ADC_SAMPLETIME_32CYCLES_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_32CYCLES_5;
   sConfig.SingleDiff = ADC_DIFFERENTIAL_ENDED;
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
@@ -95 +95 @@
   sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_2;
-  sConfig.Offset = 0;
   if (HAL_ADC_ConfigChannel(&hadc2, &sConfig) != HAL_OK)
   {
@@ -276 +275 @@
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_5;
+    GPIO_InitStruct.Pin = LOAD_I_SENSE_PLUS_Pin|LOAD_I_SENSE_MINUS_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
+    GPIO_InitStruct.Pin = BAT_U_SENSE_MINUS_Pin|BAT_U_SENSE_PLUS_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -321 +320 @@
     PC0     ------> ADC3_INP10
     */
-    GPIO_InitStruct.Pin = U_BAT_Pin;
+    GPIO_InitStruct.Pin = BAT_U_RAW_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
-    HAL_GPIO_Init(U_BAT_GPIO_Port, &GPIO_InitStruct);
+    HAL_GPIO_Init(BAT_U_RAW_GPIO_Port, &GPIO_InitStruct);
 
     /* ADC3 DMA Init */
@@ -371 +370 @@
     HAL_GPIO_DeInit(GPIOA, BAT_I_SENSE_PLUS_Pin|BAT_I_SENSE_MINUS_Pin);
 
-    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_4|GPIO_PIN_5);
-
-    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_0|GPIO_PIN_1);
+    HAL_GPIO_DeInit(GPIOC, LOAD_I_SENSE_PLUS_Pin|LOAD_I_SENSE_MINUS_Pin);
+
+    HAL_GPIO_DeInit(GPIOB, BAT_U_SENSE_MINUS_Pin|BAT_U_SENSE_PLUS_Pin);
 
     /* ADC2 DMA DeInit */
@@ -392 +391 @@
     PC0     ------> ADC3_INP10
     */
-    HAL_GPIO_DeInit(U_BAT_GPIO_Port, U_BAT_Pin);
+    HAL_GPIO_DeInit(BAT_U_RAW_GPIO_Port, BAT_U_RAW_Pin);
 
     /* ADC3 DMA DeInit */

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

@@ -167 +167 @@
   HAL_GPIO_Init(GSM_STATUS_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PD14 PD15 PD0 PD1 */
-  GPIO_InitStruct.Pin = GPIO_PIN_14|GPIO_PIN_15|GPIO_PIN_0|GPIO_PIN_1;
+  /*Configure GPIO pins : PD14 PD15 */
+  GPIO_InitStruct.Pin = GPIO_PIN_14|GPIO_PIN_15;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

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

@@ -26 +26 @@
 #include "dts.h"
 #include "fatfs.h"
+#include "fdcan.h"
 #include "i2c.h"
 #include "memorymap.h"
@@ -133 +134 @@
   MX_DMA_Init();
   MX_BDMA_Init();
-  MX_ADC2_Init();
-  MX_ADC3_Init();
   MX_RTC_Init();
   MX_SPI4_Init();
@@ -145 +144 @@
   MX_TIM6_Init();
   MX_I2C2_Init();
+  MX_ADC3_Init();
   MX_TIM3_Init();
   MX_I2C1_Init();
@@ -151 +151 @@
   MX_DAC1_Init();
   MX_TIM1_Init();
+  MX_ADC2_Init();
+  MX_FDCAN1_Init();
   /* USER CODE BEGIN 2 */