From 01111286de3373997d42211e8c877679e19c9f1d Mon Sep 17 00:00:00 2001
From: Vid Tadel <tadelv@gmail.com>
Date: Fri, 24 Jan 2025 21:36:25 +0100
Subject: [PATCH] ramp to target fan value

---
 src/fan.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/src/fan.cpp b/src/fan.cpp
index 3a54976..45881de 100644
--- a/src/fan.cpp
+++ b/src/fan.cpp
@@ -1,29 +1,75 @@
 #include "fan.h"
+#include "FreeRTOS.h"
 #include "config.h"
 #include "logging.h"
+#include "projdefs.h"
+#include "queue.h"
+#include "semphr.h"
+#include "task.h"
 
+#define RAMP_DELAY_MS 50
+
+/*SemaphoreHandle_t fanMutex; // Mutex to protect currentFanSpeed*/
+QueueHandle_t speedQueue;
+int currentFanSpeed = 0;
+int targetSpeed = 0;
+
+void rampFanSpeedTask(void *pvParams);
 // Initialize the fan
 // This function should be called in the setup function
 void initFan() {
-	analogWrite(FAN_PIN, 0);
+  analogWrite(FAN_PIN, 0);
+  /*fanMutex = xSemaphoreCreateMutex();*/
+  speedQueue = xQueueCreate(1, sizeof(int));
+
+  xTaskCreate(rampFanSpeedTask, "FanRampTask", configMINIMAL_STACK_SIZE + 2048,
+              NULL, 1, NULL);
 }
 
-int currentFanSpeed = 0;
 // set the fan speed
 // speed: the speed of the fan, from 0 to 100
 // 0 means the fan is off, 100 means the fan is at full speed
 void setFanSpeed(int speed) {
-	if (speed < 0) {
-		speed = 0;
-	} else if (speed > 100) {
-		speed = 100;
-	}
-	currentFanSpeed = speed;
-	/*analogWrite(FAN_PIN, speed * 255 / 100);*/
-	analogWrite(FAN_PIN, currentFanSpeed * 255 / 100);
-	logf("Fan speed set to %d%%\n", speed);
+  if (speed < 0) {
+    speed = 0;
+  } else if (speed > 100) {
+    speed = 100;
+  }
+  targetSpeed = speed;
+
+  logf("Fan speed set to %d%%\n", speed);
+  if (xQueueOverwrite(speedQueue, &speed) == pdPASS) {
+    logf("Requested fan speed set to %d%%\n", speed);
+  }
 }
 
-int getFanSpeed() {
-	return currentFanSpeed;
+int getFanSpeed() { return targetSpeed; }
+
+void rampFanSpeedTask(void *pvParams) {
+  int desiredSpeed = 0;
+
+  while (true) {
+    // Wait for a new target speed from the queue
+    if (xQueueReceive(speedQueue, &desiredSpeed, portMAX_DELAY) == pdPASS) {
+      while (true) {
+
+        // Gradually adjust the speed
+        if (currentFanSpeed < desiredSpeed) {
+          currentFanSpeed++;
+        } else if (currentFanSpeed > desiredSpeed) {
+          currentFanSpeed--;
+        }
+
+        analogWrite(FAN_PIN, currentFanSpeed * 255 / 100);
+        logf("Fan speed updated to %d%%\n", currentFanSpeed);
+
+        // Break if the target speed is reached
+        if (currentFanSpeed == desiredSpeed) {
+          break;
+        }
+
+        vTaskDelay(pdMS_TO_TICKS(RAMP_DELAY_MS)); // Delay between adjustments
+      }
+    }
+  }
 }