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

next version #452

Merged
merged 50 commits into from
Feb 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
d4bbd74
Turn on filter only if it was used during printing. (#380)
tehniemer Dec 13, 2023
59ff255
added parameters to park (#391)
Surion79 Dec 13, 2023
6c78e14
M8P v2.0 SPI fix (#389)
Surion79 Dec 13, 2023
ea69a8b
Add per material filament sensor management (#381)
tehniemer Dec 15, 2023
e88cf79
Remove _TIP_SHAPING from End/cancel print macros (#357)
tehniemer Dec 15, 2023
26b9bb1
Klipper SET_PRINT_STATS_INFO compatibility (#392)
Surion79 Dec 15, 2023
b5422ba
Fix error with turning on filter only if it was used during printing.…
tehniemer Dec 19, 2023
fe82709
fix missing variable to cancel_print (#408)
tehniemer Dec 19, 2023
6e845ec
filament sensor status checks universal (#411)
tehniemer Dec 20, 2023
a46d218
proper Shake&Tune integration in Klippain
Frix-x Jan 7, 2024
b22121e
add mellow SB2040 v2 and SB2040 Pro toolhead boards (#417)
Benoitone Jan 9, 2024
d0a0c01
correct overriders misspelling (#425)
Surion79 Jan 9, 2024
15172ce
check if heatsoak is configured to verbose message (#424)
Surion79 Jan 9, 2024
fd29fed
typo
Frix-x Jan 9, 2024
784bdf5
Add pin definitions for Fysetc S6 V2.X
aaarsene Jan 10, 2024
14da7e4
add TR8x2 leadscrew config for trident
aaarsene Jan 15, 2024
8524631
Add older version of Fysetc mini12864 display
aaarsene Jan 15, 2024
562ba0a
HappyHare & other related dev (#371)
Benoitone Feb 1, 2024
7e1ed94
fix status leds at startup (#448)
Benoitone Feb 1, 2024
c07b523
display menu and V0 Display (#420)
Elias23 Feb 4, 2024
a866a36
improved display management structure
Frix-x Feb 4, 2024
ce74c32
fixed MMU includes for HappyHare symlink
Frix-x Feb 4, 2024
7964dbe
Add BLTouch support (#450)
nmsmith22389 Feb 8, 2024
3468ad6
fixed nozzle and status led on/off. (#454)
claudioguareschi Feb 8, 2024
4a4199b
reverted update manager to main branch
Frix-x Feb 8, 2024
2fc0ee9
followed naming scheme for bltouch include as virtual
Frix-x Feb 8, 2024
246e318
moved the machine.cfg include and included additional thermistor defs
Frix-x Feb 8, 2024
45a447d
Mellow fly super8 template (#463)
Benoitone Feb 13, 2024
e350d0c
Support for TMC5160 on Z Axis (#469)
reineruhry Feb 14, 2024
4fde96d
added fix to prevent issues when updating Klippain without MMU (#462)
Surion79 Feb 20, 2024
a2e8b52
Add configs for Fysetc SB Can TH boards (#464)
lokiagent Feb 20, 2024
e0a170e
fix: make prime line height a variable parameter (#466)
arcadien Feb 20, 2024
7631b57
fix for extrude when temperature is too low (#480)
Benoitone Feb 20, 2024
fbf07e2
Add BTT Kraken MCU support (#476)
Benoitone Feb 20, 2024
795fb3f
fix BTT_MMB pin (#486)
Benoitone Feb 21, 2024
5b1763b
added fix for rsense for TMC5160 (#489)
Surion79 Feb 22, 2024
0589d24
fix for rsense on TMC5160 Z (#490)
Surion79 Feb 22, 2024
ef862ad
Create stale action workflow (#449)
Surion79 Feb 22, 2024
7de5d57
fixed K-Shake&Tune integration
Frix-x Feb 22, 2024
a3034a1
Merge branch 'main' into develop
Feb 22, 2024
405a98e
Avoid cooling hotend in extruder_preheating #495 (#496)
elpopo-eng Feb 23, 2024
9e50375
Add a park front macro for toolhead maintenance (#494)
elpopo-eng Feb 25, 2024
b14490a
Update MMU include order to allow overriding default HH defs (#497)
Benoitone Feb 25, 2024
69b453b
avoid led effect flashing on startup if leds desabled on startup (#500)
Benoitone Feb 25, 2024
9fc555d
Added BTT SKR2 board template (#503)
tsk-2222 Feb 26, 2024
0ecc550
fixed the regression introduced in startup call
Frix-x Feb 26, 2024
a031aa1
fix typo in stale.yml
Frix-x Feb 26, 2024
a8bf8bc
fixed probe pin for BTT_SB2209_RP2040_v1.0 (#507)
Surion79 Feb 26, 2024
742d474
LDO Nitehawk MCU template and tachometer management (#505)
Frix-x Feb 26, 2024
20f41e8
update primeline to make it adaptive (#498)
elpopo-eng Feb 27, 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 and Frix-x committed Feb 13, 2024
commit 3468ad66f9c132b9d61ccfd6e8ebcb03389d0047
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