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

v4.2.0 #309

Merged
merged 62 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3e3d5dc
Remove invalid option extruder
LongDono Sep 12, 2023
498f409
Merge pull request #294 from LongDono/patch-1
Frix-x Sep 13, 2023
5dd679c
Add dwell to wait for nozzle cooldown
austinrdennis Sep 18, 2023
e4f0121
flush klipper buffer before reseting filament sensor
Frix-x Sep 18, 2023
82e3ba8
resetting filter in the start_print to avoid a remaining delayed stop
Frix-x Sep 18, 2023
00ec18e
fixed typo in SKR pico template on motor pin definition
Frix-x Sep 18, 2023
0879739
Correct modified M109 to fix probing while too hot. Revert G4 command
austinrdennis Sep 18, 2023
7604992
Enhance M109 and M190 logic with "fix_heaters_temperature_settle" set…
austinrdennis Sep 20, 2023
79b7ce5
Fix variable refference error
austinrdennis Sep 20, 2023
7ffacb4
Merge pull request #302 from Klippain-Fork-Org-1/main
Frix-x Sep 20, 2023
7b02536
Add files via upload
W141-ID Sep 22, 2023
ba163f5
Update printer.cfg
W141-ID Sep 22, 2023
4997bb3
Add extruder stepper vibrations
fbeauKmi Sep 24, 2023
aca4652
Merge branch 'develop' into main
Frix-x Sep 25, 2023
056533c
Merge pull request #306 from fbeauKmi/main
Frix-x Sep 25, 2023
4e0c7b1
Merge branch 'develop' into rampon
Frix-x Sep 25, 2023
ad12f6b
Merge pull request #305 from W141-ID/rampon
Frix-x Sep 25, 2023
a25017a
Corrected mistake in variable configuration
JerrettDavis Sep 25, 2023
66012d1
Merge branch 'develop' into fix-configuration-typo
Frix-x Sep 25, 2023
8655be2
Merge pull request #307 from JerrettDavis/fix-configuration-typo
Frix-x Sep 25, 2023
090ec13
auto uninstall script added
Frix-x Sep 18, 2023
76df76c
Merge pull request #308 from Frix-x/uninstall-script
Frix-x Sep 25, 2023
d461b09
Add Servo in SKR_Mini_E3 mcu template
Benoitone Sep 27, 2023
3c0e61a
reworked input shaper scripts
Frix-x Sep 25, 2023
c2b7b4f
lot of improvements of the new shaper scripts
Oct 4, 2023
fbb6092
added the support of the new scripts in plot_graph.sh and the gcode m…
Oct 4, 2023
85ee7e1
Add Spider 3 board
Benoitone Oct 5, 2023
1639e20
Merge branch 'Spider3.0' of https://github.com/Benoitone/klippain int…
Benoitone Oct 5, 2023
f5f2cd0
added filtering before the peak detection to avoid catching noise and…
Oct 5, 2023
923b2a1
Merge pull request #313 from Benoitone/Spider3.0
Frix-x Oct 5, 2023
8b37179
Merge pull request #310 from Benoitone/develop
Frix-x Oct 5, 2023
f88d4f4
refactored the plot_graph.sh into a Python script
Oct 6, 2023
89bf53c
tweaks to the install script and gitignore
Frix-x Oct 7, 2023
e8dd08e
fixed damping ratio computation
Frix-x Oct 9, 2023
e71e030
IS workflow v2 documentation draft
Frix-x Oct 14, 2023
99981e1
IS Documentation Reth draft (#319)
Frix-x Oct 16, 2023
cf2d69c
Add BTT EBB SB2209 CAN v1.0 RP2040 (#312)
Benoitone Oct 21, 2023
26d94ae
added creality bed (#320)
Gethe Oct 23, 2023
d84664e
moved the docs in preparation for K-Shake&Tune release...
Frix-x Oct 16, 2023
824c4b8
Merge branch 'develop' into damping-test2
Frix-x Oct 26, 2023
3d9a8e4
Merge pull request #324 from Frix-x/damping-test2
Frix-x Oct 26, 2023
a69cda4
Merge branch 'main' into develop
Frix-x Oct 26, 2023
76fb077
fix: module heatsoak bed should use current temperature
pvpacheco Oct 28, 2023
12e4ede
Create adxl345_sht_v2.x.cfg
blutack Oct 29, 2023
c6e6d05
Merge pull request #328 from blutack/main
Frix-x Nov 1, 2023
99a211b
fix status LEDs for separate nozzle and logo LEDs
kdomanski Oct 24, 2023
693948c
Merge branch 'develop' into main
Frix-x Nov 6, 2023
d47e520
Merge pull request #322 from kdomanski/main
Frix-x Nov 6, 2023
e060b33
prevent flashing if G28 is not required
Surion79 Nov 6, 2023
9862fbe
bump K-Shake&Tune to v1.1.2
Frix-x Nov 6, 2023
84e3b32
Merge branch 'develop' into fix/heatsoak-bed-temperature
Frix-x Nov 6, 2023
244b924
Merge pull request #327 from pvpacheco/fix/heatsoak-bed-temperature
Frix-x Nov 6, 2023
884a58a
Merge branch 'develop' into QglFlashFix
Frix-x Nov 6, 2023
330f791
Merge pull request #332 from Frix-x/QglFlashFix
Frix-x Nov 6, 2023
cba2aa9
added a prefilled template for own user custom MCU
Frix-x Nov 6, 2023
e37ce23
fixed conditional QGL/Z_TILT that wasn't working properly
Frix-x Nov 6, 2023
ed71139
added G2Z and G2E integration (#329)
Surion79 Nov 8, 2023
06bc136
transmit rawparams for _MODULE_CUSTOM1/3 and allow mesh profile load …
mypompon Nov 10, 2023
ac74f21
Update install.sh for is_workflow chmod (#338)
Benoitone Nov 12, 2023
20f766a
feat(mcu): Manta M8P V2 (#341)
dhazelett Nov 17, 2023
6fe679e
Merge branch 'main' into develop
Frix-x Nov 17, 2023
c56fb96
RP2040 USB support for Fysetc PortableInputShaper (#345)
Frix-x Nov 17, 2023
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
169 changes: 169 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,175 @@
# -------------------------------------------------------------------
# This gitignore is configured to not track user defined files at the root of the config
# And thus allowing a full update of the repo while keeping user files untouched
# -------------------------------------------------------------------


/*.cfg
/*.conf
/.VERSION


# -------------------------------------------------------------------
# Python specifics added here as well to avoid pycache folder, etc...
# -------------------------------------------------------------------

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ Finally, Klippain requires a few simple steps to configure and customize it for
> General rule to keep the auto-update feature working: **never modify Klippain files directly**, but instead add overrides as per the documentation! To proceed, you can modify all the pre-installed templates in your config root folder (`printer.cfg`, `mcu.cfg`, `variables.cfg` and `overrides.cfg`) as they will be preserved on update.


## Removing Klippain

In case Klippain doesn't suit your needs or if you installed it by mistake, you can easily remove Klippain and revert to your previous configuration by using the automated uninstall script. During the uninstallation process, the script will remove all specific Klippain files and configurations. Additionally, you will be given an option to restore your previously backed-up configuration, allowing your printer to return to its last working state (from before Klippain was installed).

To run the uninstall script, execute the following command over SSH:

```bash
wget -O - https://raw.githubusercontent.com/Frix-x/klippain/main/uninstall.sh | bash
```

> **Note**
>
> All backups are preserved during the uninstallation process. So, you can easily revert back at any time if you wish to :stuck_out_tongue_winking_eye:


## Support the Project

I strive to accommodate user requests that align with this configuration's design. Feel free to open an issue or a PR for specific hardware device support or new features.
Expand Down
7 changes: 7 additions & 0 deletions config/hardware/accelerometers/adxl345_sht_v2.x.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[include generics/adxl345_hardware_spi1.cfg]

# As it's a toolhead ADXL, we add some default pins overrides from here
[adxl345]
cs_pin: toolhead:ADXL_CS
# Supplied config from Mellow is wrong - it states spi1, but at least for a 072 based unit is it on spi2
spi_bus: spi2
25 changes: 25 additions & 0 deletions config/hardware/accelerometers/adxl345_usb_rampon.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This ADXL file is dedicated to be used with ADXL boards
# connected over USB to the pi as dedicated and standalone ADXL-MCU boards

# This include KUSBA, ...


# You need to override the following to be able to set the proper serial in your overrides.cfg file
[mcu adxl]
serial: /dev/serial/by-id/xxx

[adxl345]
cs_pin: adxl:CS
axes_map: x,y,z

[resonance_tester]
accel_chip: adxl345
probe_points:
-1,-1,-1


# Include the IS calibration macros to unlock them when
# an accelerometer is installed on the machine
[include ../../../macros/helpers/resonance_override.cfg]
[include ../../../macros/calibration/IS_shaper_calibrate.cfg]
[include ../../../macros/calibration/IS_vibrations_measurement.cfg]
29 changes: 29 additions & 0 deletions config/hardware/accelerometers/adxl345_usb_rp2040_spi1.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This ADXL file is dedicated to be used with USB RP2040 boards where the ADXL
# is connected to SPI1

# This include FYSTEC PortableInputShaper, ...


# You need to set the proper serial in your overrides.cfg file
[mcu adxl]
serial: /dev/serial/by-id/xxx

[adxl345]
cs_pin: adxl:gpio13
spi_software_sclk_pin: adxl:gpio10
spi_software_mosi_pin: adxl:gpio11
spi_software_miso_pin: adxl:gpio12
axes_map: x,y,z
# FYSTEC POS: x,-z,y

[resonance_tester]
accel_chip: adxl345
probe_points:
-1,-1,-1


# Include the IS calibration macros to unlock them when
# an accelerometer is installed on the machine
[include ../../../macros/helpers/resonance_override.cfg]
[include ../../../macros/calibration/IS_shaper_calibrate.cfg]
[include ../../../macros/calibration/IS_vibrations_measurement.cfg]
27 changes: 27 additions & 0 deletions config/hardware/axis/Z/V2.4_galileo2Z_1.8deg.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[stepper_z]
rotation_distance: 40
gear_ratio: 9:1
microsteps: 32
full_steps_per_rotation: 200

[stepper_z1]
rotation_distance: 40
gear_ratio: 9:1
microsteps: 32
full_steps_per_rotation: 200

[stepper_z2]
rotation_distance: 40
gear_ratio: 9:1
microsteps: 32
full_steps_per_rotation: 200

[stepper_z3]
rotation_distance: 40
gear_ratio: 9:1
microsteps: 32
full_steps_per_rotation: 200

# We also include the default wiring and speeds from here to avoid duplicating
[include default_wiring_4M.cfg]
[include default_speed.cfg]
15 changes: 15 additions & 0 deletions config/hardware/bed_heaters/creality.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[gcode_macro _USER_VARIABLES]
variable_heaterbed_enabled: True
gcode:


[heater_bed]
heater_pin: BED_HEATER
sensor_type: EPCOS 100K B57560G104F
sensor_pin: BED_TEMPERATURE
max_power: 1
min_temp: 0
max_temp: 150

# We also include the "no wait too much for temperature" patch
[include ../../../macros/helpers/bed_heater_ctrl.cfg]
15 changes: 15 additions & 0 deletions config/hardware/bed_heaters/keenovo.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[gcode_macro _USER_VARIABLES]
variable_heaterbed_enabled: True
gcode:


[heater_bed]
heater_pin: BED_HEATER
sensor_type: NTC 100K MGB18-104F39050L32
sensor_pin: BED_TEMPERATURE
max_power: 1
min_temp: 0
max_temp: 120

# We also include the "no wait too much for temperature" patch
[include ../../../macros/helpers/bed_heater_ctrl.cfg]
28 changes: 28 additions & 0 deletions config/hardware/extruder/galileo2.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[gcode_macro _USER_VARIABLES]
variable_extruder_enabled: True
gcode:


[extruder]
# Galileo 2 Gear Ratio
# new_rd = previous_rd * mesured_distance / requested_distance
rotation_distance: 47.088
gear_ratio: 9:1
microsteps: 16
full_steps_per_rotation: 200

nozzle_diameter: 0.400
filament_diameter: 1.75
max_extrude_only_distance: 110
max_extrude_cross_section: 5
sensor_type: ATC Semitec 104GT-2
min_temp: 10
max_temp: 270
max_power: 1.0
min_extrude_temp: 172
pressure_advance: 0.0475
pressure_advance_smooth_time: 0.040

# We also include the default wiring and low thermal hotend patch
[include default_wiring.cfg]
[include ../../../macros/helpers/hotend_heater_ctrl.cfg]
1 change: 0 additions & 1 deletion config/hardware/filament_sensors/switch_sensor.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ gcode:


[filament_switch_sensor runout_sensor]
extruder: extruder
switch_pin: RUNOUT_SENSOR
pause_on_runout: True
#runout_gcode:
Expand Down
16 changes: 2 additions & 14 deletions config/hardware/heated_bed.cfg
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
[gcode_macro _USER_VARIABLES]
variable_heaterbed_enabled: True
gcode:
## This file is deprecated in favor of the included file.


[heater_bed]
heater_pin: BED_HEATER
sensor_type: NTC 100K MGB18-104F39050L32
sensor_pin: BED_TEMPERATURE
max_power: 1
min_temp: 0
max_temp: 120

# We also include the "no wait too much for temperature" patch
[include ../../macros/helpers/bed_heater_ctrl.cfg]
[include bed_heaters/keenovo.cfg]
Loading