Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added fix to prevent issues when updating Klippain #462

Merged
merged 39 commits into from
Feb 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c67fa94
Turn on filter only if it was used during printing. (#380)
tehniemer Dec 13, 2023
843a08c
added parameters to park (#391)
Surion79 Dec 13, 2023
bbd8e0f
M8P v2.0 SPI fix (#389)
Surion79 Dec 13, 2023
cba4647
Add per material filament sensor management (#381)
tehniemer Dec 15, 2023
f8b817a
Remove _TIP_SHAPING from End/cancel print macros (#357)
tehniemer Dec 15, 2023
a8f516d
Klipper SET_PRINT_STATS_INFO compatibility (#392)
Surion79 Dec 15, 2023
1793847
Fix error with turning on filter only if it was used during printing.…
tehniemer Dec 19, 2023
e1a6cba
fix missing variable to cancel_print (#408)
tehniemer Dec 19, 2023
09c40f3
filament sensor status checks universal (#411)
tehniemer Dec 20, 2023
6b46f8b
proper Shake&Tune integration in Klippain
Frix-x Jan 7, 2024
fb4143a
add mellow SB2040 v2 and SB2040 Pro toolhead boards (#417)
Benoitone Jan 9, 2024
3a084e1
correct overriders misspelling (#425)
Surion79 Jan 9, 2024
f65cbe8
check if heatsoak is configured to verbose message (#424)
Surion79 Jan 9, 2024
7d3e8ae
typo
Frix-x Jan 9, 2024
8596a09
Create sherpa_mini.cfg
EricZimmerman Jan 15, 2024
eb979e3
Add pin definitions for Fysetc S6 V2.X
aaarsene Jan 10, 2024
16298ee
add TR8x2 leadscrew config for trident
aaarsene Jan 15, 2024
a70d631
Add older version of Fysetc mini12864 display
aaarsene Jan 15, 2024
e5c1a8d
Merge pull request #436 from aaarsene/trident_tr8x2
Frix-x Jan 16, 2024
1ff510b
Merge pull request #437 from aaarsene/fysetc_mini12864_v1.2_v2.0
Frix-x Jan 16, 2024
7b44fa3
Merge pull request #435 from aaarsene/fysetc_s6_v2
Frix-x Jan 16, 2024
095715c
Merge pull request #433 from Frix-x/EricZimmerman-patch-2
Frix-x Jan 16, 2024
9cc1d91
Merge pull request #446 from Frix-x/main
Frix-x Jan 31, 2024
c5b4bdc
HappyHare & other related dev (#371)
Benoitone Feb 1, 2024
3d6cda0
fix status leds at startup (#448)
Benoitone Feb 1, 2024
7759036
display menu and V0 Display (#420)
Elias23 Feb 4, 2024
2254f1b
improved display management structure
Frix-x Feb 4, 2024
07ba7b0
fixed MMU includes for HappyHare symlink
Frix-x Feb 4, 2024
ed733fd
Add BLTouch support (#450)
nmsmith22389 Feb 8, 2024
d3b5079
fixed nozzle and status led on/off. (#454)
claudioguareschi Feb 8, 2024
c828208
reverted update manager to main branch
Frix-x Feb 8, 2024
6bcdf02
followed naming scheme for bltouch include as virtual
Frix-x Feb 8, 2024
51c32b7
moved the machine.cfg include and included additional thermistor defs
Frix-x Feb 8, 2024
73f4135
added fix to prevent issues when updating Klippain
Surion79 Feb 9, 2024
48fa3e3
end print was defect as well
Surion79 Feb 10, 2024
a133074
Merge branch 'develop' into FixMmuErrorOnPrintStart
Surion79 Feb 14, 2024
ba0a8f7
replace code to prevent usage of else
Surion79 Feb 17, 2024
ab01279
reverted last commit due to jinja constraints
Surion79 Feb 17, 2024
e00b4f3
changed code to double default
Surion79 Feb 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed nozzle and status led on/off. (#454)
claudioguareschi authored Feb 8, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit d3b50792579c4da844d01af23f4ea2d5527c62b3
1 change: 1 addition & 0 deletions config/hardware/lights/neopixel_caselight.cfg
Original file line number Diff line number Diff line change
@@ -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:

3 changes: 2 additions & 1 deletion config/hardware/lights/neopixel_caselight_effects.cfg
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions config/hardware/lights/status_leds.cfg
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 3 additions & 2 deletions config/hardware/lights/status_leds_effects.cfg
Original file line number Diff line number Diff line change
@@ -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:

1 change: 1 addition & 0 deletions config/hardware/lights/status_leds_rainbow_barf.cfg
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 3 additions & 2 deletions config/hardware/lights/status_leds_rainbow_barf_effects.cfg
Original file line number Diff line number Diff line change
@@ -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:

12 changes: 8 additions & 4 deletions macros/hardware_functions/status_leds.cfg
Original file line number Diff line number Diff line change
@@ -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 %}
2 changes: 1 addition & 1 deletion moonraker/base.conf
Original file line number Diff line number Diff line change
@@ -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