Changeset 68 for ctrl/firmware/Main/SES/Core

Timestamp:

Jan 23, 2025, 9:09:36 AM (4 months ago)

Author:

Zed

Message:

Fixing project before Ethernet implementation.

File:

• ctrl/firmware/Main/SES/Core/Src/fan_thread.cpp (modified) (8 diffs)

ctrl/firmware/Main/SES/Core/Src/fan_thread.cpp

@@ -9 +9 @@
 
 static constexpr unsigned INPUT_BUF_SIZE = 64U;  // Must be dev by 4
+static constexpr ULONG ONE_SHOT_TIMER = 0U;
+static constexpr ULONG TIMER_PERIOD_MS = 20U;
 
 alignas(32) static unsigned ibuf[INPUT_BUF_SIZE]                                                                __attribute__((section(".RAM1")));
@@ -16 +18 @@
 
 //TX_EVENT_FLAGS_GROUP fanEG;
+static TX_TIMER timer;
+
+//------------------------------------------------------------------------------
+
+static VOID icTimeout(ULONG);
+
+//------------------------------------------------------------------------------
 
 VOID fanThread(ULONG initial_input)
@@ -38 +47 @@
         //ULONG actual_flags;
 
+        char timer_name[] = "IC overflow timer";
+        tx_timer_create(&timer, timer_name, icTimeout, 0, TIMER_PERIOD_MS, ONE_SHOT_TIMER, TX_NO_ACTIVATE);
+
         while(1)
         {
@@ -43 +55 @@
                 {
                         HAL_TIM_IC_Start_IT(&htim8, TIM_CHANNEL_1);//, (uint32_t*)ibuf, INPUT_BUF_SIZE);
+                        tx_timer_change(&timer, TIMER_PERIOD_MS, ONE_SHOT_TIMER);
+                        tx_timer_activate(&timer);
                         //__HAL_DMA_DISABLE_IT(&hdma_tim8_ch1, DMA_IT_HT);
 
@@ -61 +75 @@
                 }
 
-                sum /= (INPUT_BUF_SIZE / 4U);
+                sum /= (INPUT_BUF_SIZE / 4U); // T = T1 + T2 + T3 + T4
 
                 uint32_t div = htim8.Instance->PSC + 1;
@@ -67 +81 @@
                 //uint32_t arr = htim8.Instance->ARR + 1;
 
-                uint32_t rpm = (60U * clockHz) / sum;
+                uint32_t rpm;
+                if (sum) rpm  = (60U * clockHz) / sum;
+                else rpm = 0;
                 printf("RPM = %u\n", rpm);
 
@@ -108 +124 @@
         //lastTime = HAL_GetTick();
 
+        tx_timer_deactivate(&timer);
+
         rawCnt = HAL_TIM_ReadCapturedValue(&htim8, TIM_CHANNEL_1);
         //tx_event_flags_set(&fanEG, 1, TX_OR);
@@ -119 +137 @@
         //printf("%u\n", HAL_GetTick());
 
-
         tx_thread_resume(&fan_thread_ptr);
 }
+
+//------------------------------------------------------------------------------
+
+static VOID icTimeout(ULONG)
+{
+        extern TX_THREAD fan_thread_ptr;
+        rawCnt = 0;
+        HAL_TIM_IC_Stop_IT(&htim8, TIM_CHANNEL_1);
+        tx_thread_resume(&fan_thread_ptr);
+}