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

Timestamp:

Jan 22, 2025, 4:41:16 PM (5 days ago)

Author:

Zed

Message:

FAN TACHO RPM was moved changed to use interrupt.

File:

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

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

@@ -6 +6 @@
 
 #include "fan_thread.h"
+#include "utils.h"
 
-static constexpr unsigned INPUT_BUF_SIZE = 256U;  // Must be dev by 4
+static constexpr unsigned INPUT_BUF_SIZE = 64U;  // Must be dev by 4
 
-alignas(32) static char ibuf[INPUT_BUF_SIZE]                                                                    __attribute__((section(".RAM1")));
-alignas(32) static char obuf[INPUT_BUF_SIZE]                                                                    __attribute__((section(".RAM1")));
+alignas(32) static unsigned ibuf[INPUT_BUF_SIZE]                                                                __attribute__((section(".RAM1")));
+//alignas(32) static char obuf[INPUT_BUF_SIZE]                                                                  __attribute__((section(".RAM1")));
+
+static volatile uint32_t rawCnt;
+
+//TX_EVENT_FLAGS_GROUP fanEG;
 
 VOID fanThread(ULONG initial_input)
 {
         (void)initial_input;
-        extern DMA_HandleTypeDef hdma_tim3_ch1;
+        //extern DMA_HandleTypeDef hdma_tim8_ch1;
+        extern TX_THREAD fan_thread_ptr;
 
         // Compute the value of ARR register to generate signal frequency at 25Khz
@@ -26 +32 @@
 
 
-        auto start = __HAL_TIM_GET_COMPARE(&htim3, TIM_CHANNEL_2);
-        auto end = __HAL_TIM_GET_AUTORELOAD(&htim3) - 300;
+        //auto start = __HAL_TIM_GET_COMPARE(&htim3, TIM_CHANNEL_2);
+        //auto end = __HAL_TIM_GET_AUTORELOAD(&htim3) - 300;
 
-        HAL_TIM_IC_Start_IT(&htim8, TIM_CHANNEL_1);//, (uint32_t*)ibuf, INPUT_BUF_SIZE);
-        //__HAL_DMA_DISABLE_IT(&hdma_tim3_ch1, DMA_IT_HT);
-
-
+        //tx_event_flags_create(&fanEG, (char*)"FAN TACHO event group");
+        //ULONG actual_flags;
 
         while(1)
         {
+                for (auto i = 0U; i < INPUT_BUF_SIZE; i++)
+                {
+                        HAL_TIM_IC_Start_IT(&htim8, TIM_CHANNEL_1);//, (uint32_t*)ibuf, INPUT_BUF_SIZE);
+                        //__HAL_DMA_DISABLE_IT(&hdma_tim8_ch1, DMA_IT_HT);
+
+                        tx_thread_suspend(&fan_thread_ptr);
+                        //tx_event_flags_get(&fanEG, 1, TX_AND_CLEAR, &actual_flags, TX_WAIT_FOREVER);
+
+                        //printf("%u, ", rawCnt);
+                        ibuf[i] = rawCnt;
+                }
+
+                unsigned sum = 0;
+                for (auto i = 0U; i < INPUT_BUF_SIZE; i += 4)
+                {
+                        unsigned tmp = 0;
+                        for (auto j = 0U; j < 4U; j++)
+                                tmp += ibuf[i + j];
+                        sum += tmp;
+                }
+
+                sum /= (INPUT_BUF_SIZE / 4U);
+
+                uint32_t div = htim8.Instance->PSC + 1;
+                uint32_t clockHz = SystemCoreClock / div;
+                //uint32_t arr = htim8.Instance->ARR + 1;
+
+                uint32_t rpm = (60U * clockHz) / sum;
+                printf("RPM = %u\n", rpm);
+
+
+                //SCB_InvalidateDCache_by_Addr((uint32_t*)ibuf, INPUT_BUF_SIZE);
+
+
                 /*for (auto i = start; i < end; i++)
                 {
@@ -51 +89 @@
                 //HAL_DMA_PollForTransfer()
 
-                tx_thread_sleep(1000);
+                //tx_thread_sleep(1);
         }
 }
@@ -59 +97 @@
 void pulseMeasured(void)
 {
-        volatile static uint32_t rawCnt;
+        extern TX_THREAD fan_thread_ptr;
         //static uint32_t lastTime;
         /*extern DMA_HandleTypeDef hdma_tim3_ch1;
@@ -71 +109 @@
 
         rawCnt = HAL_TIM_ReadCapturedValue(&htim8, TIM_CHANNEL_1);
+        //tx_event_flags_set(&fanEG, 1, TX_OR);
 
+        /*SCB_InvalidateDCache_by_Addr((uint32_t*)ibuf, INPUT_BUF_SIZE);
+
+        for (auto i = 0U; i < INPUT_BUF_SIZE; i++)
+        {
+                printf("%u,", ibuf[i]);
+        }*/
+        //printf("%u\n", HAL_GetTick());
+
+
+        tx_thread_resume(&fan_thread_ptr);
 }