-
-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from Frix-x/venv
v2.0.0
- Loading branch information
Showing
24 changed files
with
716 additions
and
369 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
# 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/ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
############################################################ | ||
###### AXE_MAP DETECTION AND ACCELEROMETER VALIDATION ###### | ||
############################################################ | ||
# Written by Frix_x#0161 # | ||
|
||
[gcode_macro AXES_MAP_CALIBRATION] | ||
gcode: | ||
{% set z_height = params.Z_HEIGHT|default(20)|int %} # z height to put the toolhead before starting the movements | ||
{% set speed = params.SPEED|default(80)|float * 60 %} # feedrate for the movements | ||
{% set accel = params.ACCEL|default(1500)|int %} # accel value used to move on the pattern | ||
{% set feedrate_travel = params.TRAVEL_SPEED|default(120)|int * 60 %} # travel feedrate between moves | ||
{% set accel_chip = params.ACCEL_CHIP|default("adxl345") %} # ADXL chip name in the config | ||
|
||
{% set mid_x = printer.toolhead.axis_maximum.x|float / 2 %} | ||
{% set mid_y = printer.toolhead.axis_maximum.y|float / 2 %} | ||
|
||
{% set accel = [accel, printer.configfile.settings.printer.max_accel]|min %} | ||
{% set old_accel = printer.toolhead.max_accel %} | ||
{% set old_accel_to_decel = printer.toolhead.max_accel_to_decel %} | ||
{% set old_sqv = printer.toolhead.square_corner_velocity %} | ||
|
||
|
||
{% if not 'xyz' in printer.toolhead.homed_axes %} | ||
{ action_raise_error("Must Home printer first!") } | ||
{% endif %} | ||
|
||
{action_respond_info("")} | ||
{action_respond_info("Starting accelerometer axe_map calibration")} | ||
{action_respond_info("This operation can not be interrupted by normal means. Hit the \"emergency stop\" button to stop it if needed")} | ||
{action_respond_info("")} | ||
|
||
SAVE_GCODE_STATE NAME=STATE_AXESMAP_CALIBRATION | ||
|
||
G90 | ||
|
||
# Set the wanted acceleration values (not too high to avoid oscillation, not too low to be able to reach constant speed on each segments) | ||
SET_VELOCITY_LIMIT ACCEL={accel} ACCEL_TO_DECEL={accel} SQUARE_CORNER_VELOCITY={[(accel / 1000), 5.0]|max} | ||
|
||
# Going to the start position | ||
G1 Z{z_height} F{feedrate_travel / 8} | ||
G1 X{mid_x - 15} Y{mid_y - 15} F{feedrate_travel} | ||
G4 P500 | ||
|
||
ACCELEROMETER_MEASURE CHIP={accel_chip} | ||
G4 P1000 # This first waiting time is to record the background accelerometer noise before moving | ||
G1 X{mid_x + 15} F{speed} | ||
G4 P1000 | ||
G1 Y{mid_y + 15} F{speed} | ||
G4 P1000 | ||
G1 Z{z_height + 15} F{speed} | ||
G4 P1000 | ||
ACCELEROMETER_MEASURE CHIP={accel_chip} NAME=axemap | ||
|
||
RESPOND MSG="Analysis of the movements..." | ||
RUN_SHELL_COMMAND CMD=shaketune PARAMS="AXESMAP {accel}" | ||
|
||
# Restore the previous acceleration values | ||
SET_VELOCITY_LIMIT ACCEL={old_accel} ACCEL_TO_DECEL={old_accel_to_decel} SQUARE_CORNER_VELOCITY={old_sqv} | ||
|
||
RESTORE_GCODE_STATE NAME=STATE_AXESMAP_CALIBRATION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
################################################ | ||
###### STANDARD INPUT_SHAPER CALIBRATIONS ###### | ||
################################################ | ||
# Written by Frix_x#0161 # | ||
|
||
[gcode_macro AXES_SHAPER_CALIBRATION] | ||
description: Perform standard axis input shaper tests on one or both XY axes to select the best input shaper filter | ||
gcode: | ||
{% set min_freq = params.FREQ_START|default(5)|float %} | ||
{% set max_freq = params.FREQ_END|default(133.3)|float %} | ||
{% set hz_per_sec = params.HZ_PER_SEC|default(1)|float %} | ||
{% set axis = params.AXIS|default("all")|string|lower %} | ||
|
||
{% set X, Y = False, False %} | ||
|
||
{% if axis == "all" %} | ||
{% set X, Y = True, True %} | ||
{% elif axis == "x" %} | ||
{% set X = True %} | ||
{% elif axis == "y" %} | ||
{% set Y = True %} | ||
{% else %} | ||
{ action_raise_error("AXIS selection invalid. Should be either all, x or y!") } | ||
{% endif %} | ||
|
||
{% if X %} | ||
TEST_RESONANCES AXIS=X OUTPUT=raw_data NAME=x FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec} | ||
M400 | ||
|
||
RESPOND MSG="X axis frequency profile generation..." | ||
RESPOND MSG="This may take some time (1-3min)" | ||
RUN_SHELL_COMMAND CMD=shaketune PARAMS=SHAPER | ||
{% endif %} | ||
|
||
{% if Y %} | ||
TEST_RESONANCES AXIS=Y OUTPUT=raw_data NAME=y FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec} | ||
M400 | ||
|
||
RESPOND MSG="Y axis frequency profile generation..." | ||
RESPOND MSG="This may take some time (1-3min)" | ||
RUN_SHELL_COMMAND CMD=shaketune PARAMS=SHAPER | ||
{% endif %} |
Oops, something went wrong.