Changeset 87 for ctrl/firmware/Main/CubeMX

Timestamp:

Feb 11, 2025, 1:59:45 PM (3 months ago)

Author:

Zed

Message:

RTC is working.

Location:

ctrl/firmware/Main/CubeMX

Files:

• Core/Inc/FreeRTOSConfig.h (modified) (1 diff)
• Core/Inc/rtc.h (modified) (1 diff)
• Core/Src/freertos.c (modified) (1 diff)
• Core/Src/rtc.c (modified) (2 diffs)
• Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rtc_ex.c (added)
• charger.ioc (modified) (1 diff)

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

@@ -58 +58 @@
 
 #define configENABLE_FPU                         1
-#define configENABLE_MPU                         1
+#define configENABLE_MPU                         0
 
 #define configUSE_PREEMPTION                     1

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

@@ -37 +37 @@
 /* USER CODE BEGIN Private defines */
 
+#define RTC_DATE_TIME_REG                                       RTC_BKP_DR31
+#define RTC_DATE_TIME_FIRST_START_ID            (0xEC)
+
 /* USER CODE END Private defines */
 

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

@@ -175 +175 @@
   /* add threads, ... */
 
-  TaskHandle_t r = xTaskCreateStatic(keysTaskStart, keysTaskName, KEYS_TASK_STACK_DEPTH_WORDS, NULL, 25, keysTaskStackBuffer, &keysTaskBuffer);
+  TaskHandle_t r = xTaskCreateStatic(keysTaskStart, keysTaskName, KEYS_TASK_STACK_DEPTH_WORDS, NULL, 24, keysTaskStackBuffer, &keysTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", keysTaskName);
 
-  r = xTaskCreateStatic(ethTaskStart, ethTaskName, ETH_TASK_STACK_DEPTH_WORDS, NULL, 25, ethTaskStackBuffer, &ethTaskBuffer);
+  r = xTaskCreateStatic(ethTaskStart, ethTaskName, ETH_TASK_STACK_DEPTH_WORDS, NULL, 24, ethTaskStackBuffer, &ethTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", ethTaskName);
 
-  r = xTaskCreateStatic(mbSlaveTaskStart, mbSlaveTaskName, MB_SLAVE_TASK_STACK_DEPTH_WORDS, NULL, 25, mbSlaveTaskStackBuffer, &mbSlaveTaskBuffer);
+  r = xTaskCreateStatic(mbSlaveTaskStart, mbSlaveTaskName, MB_SLAVE_TASK_STACK_DEPTH_WORDS, NULL, 24, mbSlaveTaskStackBuffer, &mbSlaveTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", mbSlaveTaskName);
 
-  r = xTaskCreateStatic(beeperTaskStart, beeperTaskName, BEEPER_TASK_STACK_DEPTH_WORDS, NULL, 25, beeperTaskStackBuffer, &beeperTaskBuffer);
+  r = xTaskCreateStatic(beeperTaskStart, beeperTaskName, BEEPER_TASK_STACK_DEPTH_WORDS, NULL, 24, beeperTaskStackBuffer, &beeperTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", beeperTaskName);
 
-  r = xTaskCreateStatic(onewireTaskStart, onewireTaskName, ONEWIRE_TASK_STACK_DEPTH_WORDS, NULL, 25, onewireTaskStackBuffer, &onewireTaskBuffer);
+  r = xTaskCreateStatic(onewireTaskStart, onewireTaskName, ONEWIRE_TASK_STACK_DEPTH_WORDS, NULL, 24, onewireTaskStackBuffer, &onewireTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", onewireTaskName);
 

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

@@ -59 +59 @@
   /* USER CODE BEGIN Check_RTC_BKUP */
 
+  uint32_t firstRunID = HAL_RTCEx_BKUPRead(&hrtc, RTC_DATE_TIME_REG);
+  if (firstRunID == RTC_DATE_TIME_FIRST_START_ID) return;
+
   /* USER CODE END Check_RTC_BKUP */
 
   /** Initialize RTC and set the Time and Date
   */
-  sTime.Hours = 0x0;
-  sTime.Minutes = 0x0;
-  sTime.Seconds = 0x0;
+  sTime.Hours = 12;
+  sTime.Minutes = 0;
+  sTime.Seconds = 0;
   sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
   sTime.StoreOperation = RTC_STOREOPERATION_RESET;
-  if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BIN) != HAL_OK)
   {
     Error_Handler();
@@ -74 +77 @@
   sDate.WeekDay = RTC_WEEKDAY_MONDAY;
   sDate.Month = RTC_MONTH_JANUARY;
-  sDate.Date = 0x1;
-  sDate.Year = 0x0;
+  sDate.Date = 1;
+  sDate.Year = 25;
 
-  if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BIN) != HAL_OK)
   {
     Error_Handler();
   }
   /* USER CODE BEGIN RTC_Init 2 */
+
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_DATE_TIME_REG, RTC_DATE_TIME_FIRST_START_ID);
 
   /* USER CODE END RTC_Init 2 */

ctrl/firmware/Main/CubeMX/charger.ioc

@@ -671 +671 @@
 RCC.VCOInput2Freq_Value=12500000
 RCC.VCOInput3Freq_Value=1000000
+RTC.Format=RTC_FORMAT_BIN
+RTC.Hours=12
+RTC.IPParameters=Format,Hours,Year
+RTC.Year=25
 SDMMC1.ClockDiv=2
 SDMMC1.ClockPowerSave=SDMMC_CLOCK_POWER_SAVE_ENABLE