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

Timestamp:

Feb 4, 2025, 11:33:27 AM (3 months ago)

Author:

Zed

Message:

Fixing project to enable DMA for SPI2.

Location:

ctrl/firmware/Main/CubeMX/Core/Src

Files:

• main.c (modified) (3 diffs)
• spi.c (modified) (2 diffs)

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

@@ -35 +35 @@
 #include <stdio.h>
 
+#include "dhcp.h"
+
 /* USER CODE END Includes */
 
@@ -110 +112 @@
 
   /* USER CODE BEGIN SysInit */
+
+  printf("CPU clock: %d Hz\n", HAL_RCC_GetSysClockFreq());
 
   /* USER CODE END SysInit */
@@ -265 +269 @@
   /* USER CODE BEGIN Callback 1 */
 
+  // We duplicate this here to make CubeMX regeneratable
+  if (htim->Instance == TIM7)
+  {
+          if (!(HAL_GetTick() % 1000U))
+          {       // One second timer for DHCP
+                  DHCP_time_handler();
+          }
+  }
+
   /* USER CODE END Callback 1 */
 }

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

@@ -44 +44 @@
   hspi2.Init.Direction = SPI_DIRECTION_2LINES;
   hspi2.Init.DataSize = SPI_DATASIZE_8BIT;
-  hspi2.Init.CLKPolarity = SPI_POLARITY_LOW;
-  hspi2.Init.CLKPhase = SPI_PHASE_1EDGE;
+  hspi2.Init.CLKPolarity = SPI_POLARITY_HIGH;
+  hspi2.Init.CLKPhase = SPI_PHASE_2EDGE;
   hspi2.Init.NSS = SPI_NSS_SOFT;
-  hspi2.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+  hspi2.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
   hspi2.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi2.Init.TIMode = SPI_TIMODE_DISABLE;
@@ -60 +60 @@
   hspi2.Init.MasterInterDataIdleness = SPI_MASTER_INTERDATA_IDLENESS_01CYCLE;
   hspi2.Init.MasterReceiverAutoSusp = SPI_MASTER_RX_AUTOSUSP_DISABLE;
-  hspi2.Init.MasterKeepIOState = SPI_MASTER_KEEP_IO_STATE_DISABLE;
+  hspi2.Init.MasterKeepIOState = SPI_MASTER_KEEP_IO_STATE_ENABLE;
   hspi2.Init.IOSwap = SPI_IO_SWAP_DISABLE;
   if (HAL_SPI_Init(&hspi2) != HAL_OK)