Skip to content

Commit

Permalink
Merge branch 'Klipper3d:master' into feature/linux-setgrp
Browse files Browse the repository at this point in the history
  • Loading branch information
Laikulo authored Aug 14, 2023
2 parents d2e3a38 + 261efdd commit 00e8118
Show file tree
Hide file tree
Showing 251 changed files with 300,844 additions and 680 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ci_cache
key: ${{ runner.os }}-build-${{ hashFiles('scripts/ci-install.sh') }}
Expand All @@ -21,7 +21,7 @@ jobs:
run: ./scripts/ci-build.sh 2>&1

- name: Upload micro-controller data dictionaries
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: data-dict
path: ci_build/dict
8 changes: 4 additions & 4 deletions .github/workflows/klipper3d-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.8'
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('docs/_klipper3d/mkdocs-requirements.txt') }}
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Build MkDocs Pages
run: docs/_klipper3d/build-translations.sh
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.5
uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
branch: gh-pages # The branch the action should deploy to.
folder: site # The folder the action should deploy.
2 changes: 1 addition & 1 deletion .github/workflows/stale-issue-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: |
Expand Down
4 changes: 2 additions & 2 deletions config/generic-bigtreetech-octopus-max-ez.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ aliases:
# See the sample-lcd.cfg file for definitions of common LCD displays.

#[bltouch]
#sensor_pin: PB14
#control_pin: PB15
#sensor_pin: ^PB15
#control_pin: PB14

# Proximity switch
#[probe]
Expand Down
2 changes: 1 addition & 1 deletion config/generic-fysetc-f6.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ max_temp: 130
pin: PL5

#fan for hotend FAN1
#[heater_fan my_nozzle_fan]
#[heater_fan heatbreak_cooling_fan]
#pin: PL4
#shutdown_speed: 1

Expand Down
2 changes: 1 addition & 1 deletion config/generic-fysetc-s6-v2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ max_temp: 130
pin: PB0

#fan for hotend FAN1
#[heater_fan my_nozzle_fan]
#[heater_fan heatbreak_cooling_fan]
#pin: PB1
#shutdown_speed: 1

Expand Down
2 changes: 1 addition & 1 deletion config/generic-fysetc-s6.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ max_temp: 130
pin: PB0

#fan for hotend FAN1
#[heater_fan my_nozzle_fan]
#[heater_fan heatbreak_cooling_fan]
#pin: PB1
#shutdown_speed: 1

Expand Down
2 changes: 1 addition & 1 deletion config/generic-fysetc-spider.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ max_temp: 130
pin: PB0

#fan for hotend FAN1
#[heater_fan my_nozzle_fan]
#[heater_fan heatbreak_cooling_fan]
#pin: PB1
#shutdown_speed: 1

Expand Down
117 changes: 117 additions & 0 deletions config/generic-remram.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# This file contains common pin mappings for remram boards. To use this
# config, the firmware should be compiled for the ST stm32f765.

# See docs/Config_Reference.md for a description of parameters.

[mcu]
serial: /dev/ttyACM0

[printer]
kinematics: cartesian
max_velocity: 300
max_accel: 3000
max_z_velocity: 5
max_z_accel: 100

[stepper_x]
step_pin: PA15
dir_pin: PC10
enable_pin: !PC12
microsteps: 16
rotation_distance: 40
endstop_pin: ^!PB12 # X_MIN
position_endstop: 0
position_max: 200
homing_speed: 10

[tmc2130 stepper_x]
cs_pin: PB1
spi_bus: spi1
run_current: 0.600
stealthchop_threshold: 999999
diag1_pin: ^!PC11

[stepper_y]
step_pin: PB3
dir_pin: !PD6
enable_pin: !PD4
microsteps: 16
rotation_distance: 40
endstop_pin: ^!PB14 # Y_MIN
position_endstop: 0
position_max: 200
homing_speed: 10

[tmc2130 stepper_y]
cs_pin: PB0
spi_bus: spi1
run_current: 0.600
stealthchop_threshold: 999999
diag1_pin: ^!PD5

[stepper_z]
step_pin: PB10
dir_pin: PE13
enable_pin: !PE15
microsteps: 16
rotation_distance: 8
endstop_pin: ^!PD8 # Z_MIN
position_endstop: 0.5
position_max: 200
homing_speed: 10

[tmc2130 stepper_z]
cs_pin: PC5
spi_bus: spi1
run_current: 0.600
stealthchop_threshold: 999999
diag1_pin: ^!PE14

[extruder]
step_pin: PB11
dir_pin: PE10
enable_pin: !PE11
microsteps: 16
rotation_distance: 33.500
nozzle_diameter: 0.400
filament_diameter: 1.750
heater_pin: PA3 # HEATER
sensor_type: Generic 3950
sensor_pin: PC1 # TEMP2
control: pid
pid_Kp: 22.2
pid_Ki: 1.08
pid_Kd: 114
min_temp: 0
max_temp: 250

[tmc2130 extruder]
cs_pin: PC4
spi_bus: spi1
run_current: 0.600
stealthchop_threshold: 999999
diag1_pin: ^!PE12

[heater_fan hotend_fan]
pin: PA2 # FAN2

[heater_bed]
heater_pin: PA1 # BED OUT
sensor_type: Generic 3950
sensor_pin: PC0 # TEMP1
control: watermark
min_temp: 0
max_temp: 130

[fan] # Print cooling fan.
pin: PA0 # FAN1

# [temperature_sensor temp3]
# sensor_type: Generic 3950
# sensor_pin: PC2 # TEMP3
# min_temp: 0
# max_temp: 300
# gcode_id: temp3

[static_digital_output yellow_led]
pins: !PD0 # STATUS LED
8 changes: 4 additions & 4 deletions config/printer-anycubic-kobra-go-2022.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rotation_distance: 40
endstop_pin: !PH2
position_endstop: -13
position_min:-13
position_max: 238
position_max: 236
homing_speed: 50

[stepper_y]
Expand All @@ -34,7 +34,7 @@ rotation_distance: 40
endstop_pin: ^!PC13
position_endstop: -9
position_min:-9
position_max: 238
position_max: 230
homing_speed: 50

[stepper_z]
Expand All @@ -46,7 +46,7 @@ rotation_distance: 8
endstop_pin: ^PC14
position_endstop: 0
position_min: -10
position_max: 250
position_max: 255
homing_speed: 5

[extruder]
Expand Down Expand Up @@ -85,7 +85,7 @@ pid_kd: 1675.16
speed: 200
horizontal_move_z: 2.5
mesh_min: 5, 5
mesh_max: 217.2, 207.8
mesh_max: 215, 215
probe_count: 5, 5

[probe]
Expand Down
3 changes: 2 additions & 1 deletion config/printer-creality-cr10-smart-pro-2022.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
# communication. Enable PA0 GPIO pin on startup.
#
# Flash this firmware on the MCU by copying "out/klipper.bin" to an SD
# card and turning the printer on with the card inserted. The firmware
# card and turning the printer on by pressing and holding the power
# button with the card inserted for 10-20 seconds. The firmware
# filename must end in ".bin" and must not match the last filename
# that was flashed.
#
Expand Down
Loading

0 comments on commit 00e8118

Please sign in to comment.