fixed nozzle and status led on/off. (Frix-x#454)

ksummers92 · Feb 13, 2024 · 3468ad6 · 3468ad6
1 parent 7964dbe
commit 3468ad6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/config/hardware/lights/neopixel_caselight.cfg b/config/hardware/lights/neopixel_caselight.cfg
@@ -2,6 +2,7 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_caselight_enabled = True
+variable_status_leds_effects_enabled = False
 variable_status_leds_caselight_led_name: "caselight"
 gcode:
 

diff --git a/config/hardware/lights/neopixel_caselight_effects.cfg b/config/hardware/lights/neopixel_caselight_effects.cfg
@@ -3,7 +3,8 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_caselight_enabled = True
-variable_status_leds_caselight_led_name: "caselight_effects"
+variable_status_leds_effects_enabled = True
+variable_status_leds_caselight_led_name: "caselight"
 gcode:
 
 # Also include directly the leds control macros from here 

diff --git a/config/hardware/lights/status_leds.cfg b/config/hardware/lights/status_leds.cfg
@@ -2,6 +2,7 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_enabled: True
+variable_status_leds_effects_enabled: False
 variable_status_leds_logo_led_name: "status_leds"
 variable_status_leds_logo_idx: '1'
 variable_status_leds_nozzle_led_name: "status_leds"

diff --git a/config/hardware/lights/status_leds_effects.cfg b/config/hardware/lights/status_leds_effects.cfg
@@ -3,9 +3,10 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_enabled: True
-variable_status_leds_logo_led_name: "status_leds_effects"
+variable_status_leds_effects_enabled: True
+variable_status_leds_logo_led_name: "status_leds"
 variable_status_leds_logo_idx: '1'
-variable_status_leds_nozzle_led_name: "status_leds_effects"
+variable_status_leds_nozzle_led_name: "status_leds"
 variable_status_leds_nozzle_idx: '2,3'
 gcode:
 

diff --git a/config/hardware/lights/status_leds_rainbow_barf.cfg b/config/hardware/lights/status_leds_rainbow_barf.cfg
@@ -3,6 +3,7 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_enabled: True
+variable_status_leds_effects_enabled: False
 variable_status_leds_logo_led_name: "status_leds"
 variable_status_leds_logo_idx: '1,2,3,4,5,6,7,8'
 variable_status_leds_nozzle_led_name: "status_leds"

diff --git a/config/hardware/lights/status_leds_rainbow_barf_effects.cfg b/config/hardware/lights/status_leds_rainbow_barf_effects.cfg
@@ -3,9 +3,10 @@
 
 [gcode_macro _USER_VARIABLES]
 variable_status_leds_enabled: True
-variable_status_leds_logo_led_name: "status_leds_effects"
+variable_status_leds_effects_enabled: True
+variable_status_leds_logo_led_name: "status_leds"
 variable_status_leds_logo_idx: '1,2,3,4,5,6,7,8'
-variable_status_leds_nozzle_led_name: "status_leds_effects"
+variable_status_leds_nozzle_led_name: "status_leds"
 variable_status_leds_nozzle_idx: '9,10'
 gcode:
 

diff --git a/macros/hardware_functions/status_leds.cfg b/macros/hardware_functions/status_leds.cfg
@@ -22,6 +22,10 @@ gcode:
     {% set led = params.LED|string %}
     {% set idx = (params.IDX|string).split(',') %}
     {% set transmit_last = params.TRANSMIT|default(1) %}
+
+    {% if printer["gcode_macro _USER_VARIABLES"].status_leds_effects_enabled %} 
+        STOP_LED_EFFECTS LEDS="neopixel:"{led}" ("{params.IDX}")"
+    {% endif %}
 
     {% for led_index in idx %}
         {% set transmit=transmit_last if loop.last else 0 %}
@@ -198,19 +202,19 @@ gcode:
     {% endif %}
 
     {% if printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
-        {% if printer["gcode_macro _USER_VARIABLES"].status_leds_logo_led_name == "status_leds"%}
+        {% if printer["gcode_macro _USER_VARIABLES"].status_leds_effects_enabled == False %}
             _SET_LEDS_BY_NAME LEDS="logo" COLOR={status_color[color].logo} TRANSMIT={logo_transmit}
             _SET_LEDS_BY_NAME LEDS="nozzle" COLOR={status_color[color].nozzle} TRANSMIT=1
-        {% elif printer["gcode_macro _USER_VARIABLES"].status_leds_logo_led_name == "status_leds_effects"%}
+        {% else %}
             SET_LED_EFFECT EFFECT={"sb_logo_" + status_color[color].logo} REPLACE=1 FADETIME=0.5
             SET_LED_EFFECT EFFECT={"sb_nozzle_" + status_color[color].nozzle} REPLACE=1 FADETIME=0.5
         {% endif %}
     {% endif %}
 
     {% if printer["gcode_macro _USER_VARIABLES"].status_leds_caselight_enabled%}
-        {% if printer["gcode_macro _USER_VARIABLES"].status_leds_caselight_led_name == "caselight"%}
+        {% if printer["gcode_macro _USER_VARIABLES"].status_leds_effects_enabled == False %}
             _SET_ALLLEDS_BY_NAME LEDS="caselight" COLOR={status_color[color].caselight} TRANSMIT=1
-        {% elif printer["gcode_macro _USER_VARIABLES"].status_leds_caselight_led_name == "caselight_effects"%}
+        {% else %}
             SET_LED_EFFECT EFFECT={"cl_" + status_color[color].caselight} REPLACE=1 FADETIME=0.5
         {% endif %}
     {% endif %}

diff --git a/moonraker/base.conf b/moonraker/base.conf
@@ -40,6 +40,6 @@ enable_auto_refresh: True
 type: git_repo
 path: ~/klippain_config
 origin: https://github.com/Frix-x/klippain.git
-primary_branch: main
+primary_branch: develop
 managed_services: moonraker klipper
 install_script: install.sh