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

Version 4.0.0 RC4 Scripting Improvements #22

Merged
merged 96 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
5fe2541
Merge pull request #21 from rootiest/master
rootiest Jun 13, 2023
9334631
bug fixes in scripts
rootiest Jun 13, 2023
9e621dc
Profile hotfixes
rootiest Jun 13, 2023
cad48ee
feat(.gitignore): ignore all files ending with .service in src directory
rootiest Jun 13, 2023
3666a8f
docs(printer): update printer features in Hephaestus and v2tap300 pro…
rootiest Jun 13, 2023
ccb3245
fe fi fo fum
rootiest Jun 13, 2023
7a916f4
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
242edae
feat(.gitignore): ignore all files ending with .service in src directory
rootiest Jun 13, 2023
8f1137a
docs(printer): update printer features in Hephaestus and v2tap300 pro…
rootiest Jun 13, 2023
ecbaac1
refactor(remove_printcfg.sh): remove unnecessary use of sudo in syste…
rootiest Jun 13, 2023
377903e
feat(.gitignore): ignore all files ending with .service in src directory
rootiest Jun 13, 2023
95c2544
docs(printer): update printer features in Hephaestus and v2tap300 pro…
rootiest Jun 13, 2023
bcab71f
fix remove action
rootiest Jun 13, 2023
b5b6371
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
c99d3ef
fix profile path in printcfg service
rootiest Jun 13, 2023
ce8d576
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
faa2f7a
remove extra space in profile pattern
rootiest Jun 13, 2023
5b28fa2
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
587ee05
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
79f16f4
refactor(printcfg.py): remove unnecessary whitespace in line.startswi…
rootiest Jun 13, 2023
bf3dfe9
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
d01c427
remove unused library
rootiest Jun 13, 2023
cf3544d
test find_string script before implementing
rootiest Jun 13, 2023
fc615e6
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
766577d
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
c5e9bbc
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
807b928
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
a17a658
fix(server.ts): change port variable case from lowercase port to uppe…
rootiest Jun 13, 2023
723efc6
refactor(gen_service.py): remove unused import of subprocess module
rootiest Jun 13, 2023
0ea0c4b
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
38f2aa3
refactor(printcfg.py): remove unnecessary whitespace in line.startswi…
rootiest Jun 13, 2023
3e47895
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
35122e5
test find_string in version check
rootiest Jun 13, 2023
5ae9d70
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
f6ab6eb
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
3bb1fb7
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
6fd120c
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
54fccc2
fix(server.ts): change port variable case from lowercase port to uppe…
rootiest Jun 13, 2023
b7b4918
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
122ffbb
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
b95eb7a
refactor(printcfg.py): remove unnecessary whitespace in line.startswi…
rootiest Jun 13, 2023
1f07036
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
ee1260e
feat(find_string.py): add script to find a string in a file and retur…
rootiest Jun 13, 2023
922625b
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
e726a06
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
3bfb325
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
02c54c1
fix(server.ts): change port variable case from lowercase port to uppe…
rootiest Jun 13, 2023
dadefc9
refactor(gen_service.py): remove unused import of subprocess module
rootiest Jun 13, 2023
f3cdaa1
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
fdde7ed
refactor(printcfg.py): remove unnecessary whitespace in line.startswi…
rootiest Jun 13, 2023
7d154ad
refactor(printcfg.py): move user_profile.cfg to a new config director…
rootiest Jun 13, 2023
c7e7b92
better messaging that doesnt look like an error
rootiest Jun 13, 2023
5bf6a8b
Merge branch 'dev' of https://github.com/rootiest/printcfg into dev
rootiest Jun 13, 2023
7ec2315
commit changes
rootiest Jun 13, 2023
d0db1a9
test
rootiest Jun 13, 2023
d10ec39
fixed all linting errors/warnings!
rootiest Jun 13, 2023
a5439c7
fix typo
rootiest Jun 13, 2023
bda1878
aha found it!
rootiest Jun 13, 2023
b8552ef
lol dont just fix the logger
rootiest Jun 13, 2023
2a3e4d3
in fact lets use a variable
rootiest Jun 13, 2023
b86b90f
add status command
rootiest Jun 13, 2023
893c634
hotfix to printcfg arguments
rootiest Jun 13, 2023
9a573ec
include profile name in status feedback
rootiest Jun 13, 2023
8798387
make sure we run setup with the correct profile name
rootiest Jun 13, 2023
bcd3c24
define type
rootiest Jun 13, 2023
7844086
keep python scripts in src
rootiest Jun 13, 2023
a9d1c0e
attempt to log shell scripts
rootiest Jun 13, 2023
55a9510
did that break it?
rootiest Jun 13, 2023
7cbf175
fix abig typo
rootiest Jun 13, 2023
aa03697
test run setup.sh with logging
rootiest Jun 13, 2023
d948df2
add logging to other shell scripts
rootiest Jun 13, 2023
3975a00
try setup without logging
rootiest Jun 13, 2023
4c50c86
keep logging
rootiest Jun 13, 2023
cfb5e8f
Add gitpython to requirements
rootiest Jun 13, 2023
d994fce
add new functions to printcfg executable
rootiest Jun 13, 2023
4668069
fix typo
rootiest Jun 13, 2023
1401417
don't define branch before check
rootiest Jun 13, 2023
de040dd
improve status responses
rootiest Jun 13, 2023
bf7bbce
fix formatting and add badge
rootiest Jun 13, 2023
bdf5b87
Push suggested fixes
rootiest Jun 13, 2023
bcdc367
fix accidental indent
rootiest Jun 13, 2023
7161f0f
fox some linting
rootiest Jun 13, 2023
9bbab67
Update scripts/remove_printcfg.sh
rootiest Jun 13, 2023
e5d1672
this ai thing needs work
rootiest Jun 13, 2023
b847b10
fixiin lintin
rootiest Jun 13, 2023
a0b9a78
add some verification checks
rootiest Jun 13, 2023
3eb433f
LINTING
rootiest Jun 13, 2023
3f51e73
missed one
rootiest Jun 13, 2023
4e7f473
fix typo
rootiest Jun 13, 2023
33a29e8
black linting
rootiest Jun 13, 2023
bf30139
fix indent
rootiest Jun 13, 2023
63b2350
fix lint
rootiest Jun 13, 2023
fffd2e7
boop
rootiest Jun 13, 2023
c8b26f8
more linting
rootiest Jun 13, 2023
5c5cef2
boop
rootiest Jun 13, 2023
204416d
fuck clones
rootiest Jun 13, 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
3 changes: 2 additions & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_JSCPD: false
2 changes: 1 addition & 1 deletion .github/workflows/opencommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
# this list of branches is often enough,
# but you may still ignore other public branches
branches-ignore: [master, main]
branches-ignore: [master, main, dev]
paths:
- "src/**"
- "scripts/**"
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
user_profile.cfg
user_config.cfg
logs/*
logs/*
src/**.service
log4bash.sh
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@

# PrintCFG Klipper Suite

[![GitHub Super-Linter](https://github.com/rootiest/printcfg/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter)

![header](docs/pretty_header.png)

This set of macros is a full suite of features for Klipper.

It is designed to be fully customizable to fit any printer or configuration. All without having to edit or understand the macros themselves. All configuration for the macros is done in the [user_profile.cfg](profiles/default/variables.cfg) file.

[Documentation is available in the Wiki](https://github.com/rootiest/printcfg/wiki)
## Documentation

### [Documentation is available in the Wiki](https://github.com/rootiest/printcfg/wiki)

## Features

Expand Down
26 changes: 14 additions & 12 deletions profiles/hephaestus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,20 @@ To change to this profile, run:

## Features

rootiest marked this conversation as resolved.
Show resolved Hide resolved
- 300mm build volume
- Voron TAP probe
- Nozzle brush
- Nevermore Filter
- Exhaust Fan
- Bed fans
- Chamber sensor
- Filament sensor on toolhead (load detection possible)
- Door sensor
- Case lights (125 RGBW LEDs)
- StealthBurner LEDs (rainbow barf + RGBW LEDs)
- Beeper (for notifications)
- 300mm build volume: The printer has a build volume of 300mm.
- Voron TAP probe: The printer uses a Voron TAP probe for bed leveling.
- Nozzle brush: The printer has a nozzle brush attached to it.
- Nevermore Filter: The printer has a Nevermore filter installed.
- Exhaust Fan: The printer has an exhaust fan installed.
- Bed fans: The printer has bed fans installed.
- Chamber sensor: The printer has a chamber sensor installed.
- Filament sensor on toolhead (load detection possible): The printer has a filament sensor installed on the toolhead that can detect when filament is loaded.
- Door sensor: The printer has a door sensor installed.
- Case lights (125 RGBW LEDs): The printer has 125 RGBW LEDs installed for lighting.
- StealthBurner LEDs (rainbow barf + RGBW LEDs): The printer has StealthBurner LEDs installed.
- Beeper (for notifications): The printer has a beeper installed for notifications.
- Sensorless homing: The printer uses sensorless homing.
- Adaptive meshing: The printer uses adaptive meshing.

## Notes

Expand Down
2 changes: 2 additions & 0 deletions profiles/v2tap300/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ To change to this profile, run:
- 300mm build volume
- Voron TAP probe
- StealthBurner LEDs
- No Sensorless Homing
- Adaptive Meshing
12 changes: 6 additions & 6 deletions profiles/v2tap300/config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,17 @@ gcode:
######## Door Configs ##########
################################

[gcode_button doors]
#[gcode_button left_door]
########## IMPORTANT ###########
## ---------------------------- ##
# Set pin to match your machine: #
pin: !PG15 #
#pin: !PG15 #
## ---------------------------- ##
########## IMPORTANT ###########
press_gcode:
_close_door ; DO NOT CHANGE
release_gcode:
_open_door ; DO NOT CHANGE
#press_gcode:
# _close_door ; DO NOT CHANGE
#release_gcode:
# _open_door ; DO NOT CHANGE

#[gcode_button right_door]
########## IMPORTANT ###########
Expand Down
4 changes: 2 additions & 2 deletions profiles/v2tap300/variables.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ variable_home_travel_speed: 10000
variable_home_z_speed: 1000
variable_home_retract: 10
variable_home_retract_speed: 1200
variable_sensorless_home: True
variable_sensorless_home: False
variable_home_current: 0.7

## Homing Macros
Expand Down Expand Up @@ -388,7 +388,7 @@ variable_telegram_runout: 'TELEGRAM_FILAMENT_RUNOUT'
## Each door must have a name (e.g. variable_door1_name: 'left_door')
## Each door may optionally have custom macros for open and closed (e.g. variable_door1_open: 'M116')

variable_doors: 1 ; Number of doors (0, 1 or 2) (set to 0 to disable)
variable_doors: 0 ; Number of doors (0, 1 or 2) (set to 0 to disable)

variable_door1_name: 'Left' ; Name of first door switch
variable_door1_open: 'M116' ; Custom macro for open door1 (set to 'M116' to disable)
Expand Down
Loading