Skip to content

Commit

Permalink
Merge branch 'main' into feat/tmc5160cs
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerlz authored Dec 17, 2024
2 parents 10aaabb + b500c38 commit d8f872f
Show file tree
Hide file tree
Showing 527 changed files with 154,155 additions and 11,608 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @DangerKlippers/dk-devs
* @KalicoCrew/kalico-devs
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ko_fi: koconnor
custom: https://www.klipper3d.org/Sponsors.html#klipper-developers
ko_fi: kalicocrew
custom: https://docs.kalico.gg/Sponsors.html#the-crew
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: klipper3d deploy
name: docs deployment
on:
workflow_dispatch:
push:
branches:
- master
- main
paths:
- docs/**
- .github/workflows/klipper3d-deploy.yaml
- .github/workflows/cd-docs.yaml

jobs:
deploy:
Expand All @@ -19,18 +19,22 @@ jobs:
with:
python-version: "3.10"

- uses: actions/cache@v3
- uses: actions/cache@v4
id: pip-cache
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('docs/_klipper3d/mkdocs-requirements.txt') }}
path: ${{ env.pythonLocation }}
key: ${{ runner.os }}-pip-${{ hashFiles('docs/_kalico/mkdocs-requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Install dependencies
run: pip install -r docs/_klipper3d/mkdocs-requirements.txt
if: steps.pip-cache.outputs.cache-hit != 'true'
run: pip install -r docs/_kalico/mkdocs-requirements.txt

- name: Build MkDocs Pages
run: docs/_klipper3d/build-translations.sh
run: |
cd docs/
mkdocs build -f _kalico/mkdocs.yml
- name: Deploy
uses: JamesIves/[email protected]
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/ci-docs_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Docs test
on:
pull_request:
paths:
- docs/**
- .github/workflows/ci-docs_test.yaml

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup python
uses: actions/setup-python@v4
with:
python-version: "3.10"

- uses: actions/cache@v4
id: pip-cache
with:
path: ${{ env.pythonLocation }}
key: ${{ runner.os }}-pip-${{ hashFiles('docs/_kalico/mkdocs-requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Install dependencies
if: steps.pip-cache.outputs.cache-hit != 'true'
run: pip install -r docs/_kalico/mkdocs-requirements.txt

- name: Build MkDocs Pages
run: |
cd docs/
mkdocs build -f _kalico/mkdocs.yml --strict
7 changes: 5 additions & 2 deletions .github/workflows/ci-static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ on: pull_request

jobs:
ruff:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: chartboost/ruff-action@v1
- uses: astral-sh/ruff-action@v1
- uses: astral-sh/ruff-action@v1
with:
args: "format --check"
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# development
out
*.so
*.pyc
__pycache__/
.config
.config.old
klippy/.version
Expand All @@ -12,3 +14,11 @@ _test_.*
klippy/plugins/*
!klippy/plugins/__init__.py
.vscode

# docs
site/
.env/
.venv/
env/
venv/
mkdocs-env/
15 changes: 0 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@ exclude: "^docs/|config/|lib/"
default_stages: [commit]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-json
- id: check-toml
- id: check-xml
- id: check-yaml
- id: debug-statements
- id: check-case-conflict
- id: check-docstring-first
- id: detect-private-key
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-builtin-literals

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.5
hooks:
Expand Down
182 changes: 90 additions & 92 deletions README.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions config/generic-fysetc-cheetah-v1.1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ tx_pin: PA2
uart_address: 0
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[stepper_y]
step_pin: PB2
Expand All @@ -44,6 +45,7 @@ tx_pin: PA2
uart_address: 2
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[stepper_z]
step_pin: PC0
Expand All @@ -61,6 +63,7 @@ tx_pin: PA2
uart_address: 1
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[extruder]
step_pin: PC15
Expand All @@ -86,6 +89,7 @@ tx_pin: PA2
uart_address: 3
run_current: 1.0
stealthchop_threshold: 999999
sense_resistor: 0.110

[heater_bed]
heater_pin: PC7
Expand Down
4 changes: 4 additions & 0 deletions config/generic-fysetc-cheetah-v1.2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ uart_pin: PA12
tx_pin: PA11
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[stepper_y]
step_pin: PB2
Expand All @@ -42,6 +43,7 @@ uart_pin: PB7
tx_pin: PB6
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[stepper_z]
step_pin: PC0
Expand All @@ -58,6 +60,7 @@ uart_pin: PB11
tx_pin: PB10
run_current: 0.800
stealthchop_threshold: 999999
sense_resistor: 0.110

[extruder]
step_pin: PC15
Expand All @@ -82,6 +85,7 @@ uart_pin: PA3
tx_pin: PA2
run_current: 1.0
stealthchop_threshold: 999999
sense_resistor: 0.110

[heater_bed]
heater_pin: PC7
Expand Down
4 changes: 4 additions & 0 deletions config/generic-fysetc-cheetah-v2.0.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ uart_address: 0
run_current: 0.800
interpolate: false
stealthchop_threshold: 0
sense_resistor: 0.110

[stepper_y]
step_pin: PC14
Expand All @@ -43,6 +44,7 @@ uart_address: 2
run_current: 0.800
interpolate: false
stealthchop_threshold: 0
sense_resistor: 0.110

[stepper_z]
step_pin: PB9
Expand All @@ -61,6 +63,7 @@ uart_address: 1
run_current: 0.800
interpolate: false
stealthchop_threshold: 0
sense_resistor: 0.110

[extruder]
step_pin: PB2
Expand All @@ -87,6 +90,7 @@ uart_address: 3
run_current: 0.800
interpolate: false
stealthchop_threshold: 0
sense_resistor: 0.110

[heater_bed]
heater_pin: PC7
Expand Down
2 changes: 2 additions & 0 deletions config/generic-ldo-leviathan-v1.2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ uart_pin: PD5
interpolate: False
run_current: 0.6
stealthchop_threshold: 999999
sense_resistor: 0.110

# The Leviathan was developed for Voron printers. It therefore has several
# steppers for the z-axes, but only one heater for one extruder.
Expand Down Expand Up @@ -140,6 +141,7 @@ uart_pin: PD11
interpolate: False
run_current: 0.5
stealthchop_threshold: 0
sense_resistor: 0.110

#[filament_switch_sensor material_0]
#switch_pin: PC0 # FILAMENT-SENSOR
Expand Down
Loading

0 comments on commit d8f872f

Please sign in to comment.