From ec3d58b26b895d94a1de1c0b80bb4667c2bde781 Mon Sep 17 00:00:00 2001
From: pi <pi@mainsailos-ea82228>
Date: Sat, 19 Apr 2025 23:41:55 +1000
Subject: [PATCH] c_evening_daylight.cfg modified - 19/04/25 - 23:41:51

---
 .../config/CUSTOM/c_evening_daylight.cfg      | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/printer_data/config/CUSTOM/c_evening_daylight.cfg b/printer_data/config/CUSTOM/c_evening_daylight.cfg
index a25accf..0b472c8 100644
--- a/printer_data/config/CUSTOM/c_evening_daylight.cfg
+++ b/printer_data/config/CUSTOM/c_evening_daylight.cfg
@@ -6,38 +6,52 @@ gcode:
     {% set hour = printer["real_time"].hour %}
     {% set minute = printer["real_time"].minute %}
     {% set total_minutes = hour * 60 + minute %}
-    {% set fade_out_start = 7 * 60 %}
-    {% set fade_out_end = 8 * 60 %}
-    {% set fade_in_start = 16 * 60 + 30 %}
-    {% set fade_in_end = 18 * 60 %}
 
-    {% if total_minutes < fade_out_start %}
-        {% set target = 1.0 %}
-    {% elif total_minutes < fade_out_end %}
-        {% set progress = 1.0 - ((total_minutes - fade_out_start) / (fade_out_end - fade_out_start)) %}
-        {% set target = progress %}
-    {% elif total_minutes < fade_in_start %}
-        {% set target = 0.0 %}
-    {% elif total_minutes < fade_in_end %}
-        {% set progress = (total_minutes - fade_in_start) / (fade_in_end - fade_in_start) %}
-        {% set target = progress %}
+    {% set hyperlapse = printer["gcode_macro HYPERLAPSE"].run|default(false) %}
+    {% set timelapse = printer["gcode_macro TIMELAPSE_TAKE_FRAME"].enable|default(false) %}
+
+    {% if hyperlapse %}
+        {% set rounded_target = 1.0 %}
+        {% set fade_msg = "🎥 Hyperlapse active — lights set to 100%" %}
+    {% elif timelapse %}
+        {% set rounded_target = 1.0 %}
+        {% set fade_msg = "📸 Timelapse active — lights set to 100%" %}
     {% else %}
-        {% set target = 1.0 %}
-    {% endif %}
+        {% set fade_out_start = 7 * 60 %}
+        {% set fade_out_end = 8 * 60 %}
+        {% set fade_in_start = 16 * 60 + 30 %}
+        {% set fade_in_end = 18 * 60 %}
 
-    {% set rounded_target = (target * 100)|int / 100.0 %}
+        {% if total_minutes < fade_out_start %}
+            {% set target = 1.0 %}
+        {% elif total_minutes < fade_out_end %}
+            {% set progress = 1.0 - ((total_minutes - fade_out_start) / (fade_out_end - fade_out_start)) %}
+            {% set target = progress %}
+        {% elif total_minutes < fade_in_start %}
+            {% set target = 0.0 %}
+        {% elif total_minutes < fade_in_end %}
+            {% set progress = (total_minutes - fade_in_start) / (fade_in_end - fade_in_start) %}
+            {% set target = progress %}
+        {% else %}
+            {% set target = 1.0 %}
+        {% endif %}
+
+        {% set rounded_target = (target * 100)|int / 100.0 %}
+        {% set time_display = hour|string ~ ":" ~ ("%02d"|format(minute)) %}
+        {% set fade_msg = "💡 Brightness: " ~ (rounded_target * 100)|int|string ~ "% at " ~ time_display %}
+    {% endif %}
 
     {% if rounded_target != last_brightness %}
         SET_PIN PIN=daylight VALUE={rounded_target}
         SET_GCODE_VARIABLE MACRO=EVENING_DAYLIGHT VARIABLE=last_brightness VALUE={rounded_target}
-        {% set time_display = hour|string ~ ":" ~ ("%02d"|format(minute)) %}
-        {% set fade_msg = "💡 Brightness: " ~ (rounded_target * 100)|int|string ~ "% at " ~ time_display %}
         RESPOND MSG="{fade_msg}"
     {% endif %}
 
 [gcode_macro SMART_DAYLIGHT]
-description: Run EVENING_DAYLIGHT only if timelapse is enabled (no messages)
+description: Run EVENING_DAYLIGHT only if timelapse or hyperlapse is active
 gcode:
-    {% if printer["gcode_macro TIMELAPSE_TAKE_FRAME"].enable %}
+    {% set timelapse = printer["gcode_macro TIMELAPSE_TAKE_FRAME"].enable|default(false) %}
+    {% set hyperlapse = printer["gcode_macro HYPERLAPSE"].run|default(false) %}
+    {% if timelapse or hyperlapse %}
         EVENING_DAYLIGHT
     {% endif %}
\ No newline at end of file