Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into dgus-display
Browse files Browse the repository at this point in the history
  • Loading branch information
Desuuuu committed Dec 25, 2021
2 parents bc8d8e3 + 247cd75 commit 2cdd446
Show file tree
Hide file tree
Showing 299 changed files with 473,855 additions and 3,583 deletions.
1 change: 1 addition & 0 deletions .github/workflows/invalid-label-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
types: [labeled]
jobs:
comment:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/stale-issue-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
# Check for stale issues (no updates in 5 weeks)
stale:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
Expand All @@ -32,6 +33,7 @@ jobs:
days-before-close: 7
# Close tickets marked with "not on github" label
close_not_on_github:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
Expand Down Expand Up @@ -60,6 +62,7 @@ jobs:
}
# Close tickets marked with "resolved" label
close_resolved:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
Expand Down Expand Up @@ -101,6 +104,7 @@ jobs:
}
# Close PRs marked with "not mainline" label
close_not_mainline:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
Expand Down Expand Up @@ -143,6 +147,7 @@ jobs:
}
# Mark (and close) PRs with "pending feedback" for 3+ weeks
mark_inactive:
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
Expand Down Expand Up @@ -189,3 +194,14 @@ jobs:
state: 'closed'
});
}
# Lock closed issues after 6 months of inactivity.
lock:
name: Lock Closed Issues
if: github.repository == 'Klipper3d/klipper'
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v3
with:
process-only: 'issues'
issue-inactive-days: '180'
issue-lock-reason: ''
4 changes: 0 additions & 4 deletions config/generic-bigtreetech-e3-rrf-v1.1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ homing_speed: 50
[tmc2209 stepper_x]
uart_pin: PD6
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[stepper_y]
Expand All @@ -40,7 +39,6 @@ homing_speed: 50
[tmc2209 stepper_y]
uart_pin: PD1
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[stepper_z]
Expand All @@ -56,7 +54,6 @@ position_max: 250
[tmc2209 stepper_z]
uart_pin: PD15
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[extruder]
Expand All @@ -80,7 +77,6 @@ max_temp: 250
[tmc2209 extruder]
uart_pin: PD11
run_current: 0.650
hold_current: 0.500
stealthchop_threshold: 999999

[heater_bed]
Expand Down
24 changes: 0 additions & 24 deletions config/generic-bigtreetech-gtr.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -126,37 +126,31 @@ max_z_accel: 5
#[tmc2208 stepper_x]
#uart_pin: PC14
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2208 stepper_y]
#uart_pin: PE1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2208 stepper_z]
#uart_pin: PB5
#run_current: 0.650
#hold_current: 0.450
#stealthchop_threshold: 999999

#[tmc2208 extruder]
#uart_pin: PG10
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2208 extruder1]
#uart_pin: PD4
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2208 extruder2]
#uart_pin: PC12
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999


Expand All @@ -167,7 +161,6 @@ max_z_accel: 5
#[tmc2130 stepper_x]
#cs_pin: PC14
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -177,7 +170,6 @@ max_z_accel: 5
#cs_pin: PE1
#sense_resistor: 0.075
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -187,7 +179,6 @@ max_z_accel: 5
#cs_pin: PB5
#sense_resistor: 0.075
#run_current: 0.650
#hold_current: 0.450
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -197,7 +188,6 @@ max_z_accel: 5
#cs_pin: PG10
#sense_resistor: 0.075
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -207,7 +197,6 @@ max_z_accel: 5
#cs_pin: PD4
#sense_resistor: 0.075
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -217,7 +206,6 @@ max_z_accel: 5
#cs_pin: PC12
#sense_resistor: 0.075
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -230,9 +218,7 @@ max_z_accel: 5
#[tmc5160 stepper_x]
#cs_pin: PC14
#sense_resistor: 0.075
#interpolate: True
#run_current: 1
#hold_current: 1
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -241,9 +227,7 @@ max_z_accel: 5
#[tmc5160 stepper_y]
#cs_pin: PE1
#sense_resistor: 0.075
#interpolate: True
#run_current: 1
#hold_current: 1
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -252,9 +236,7 @@ max_z_accel: 5
#[tmc5160 stepper_z]
#cs_pin: PB5
#sense_resistor: 0.075
#interpolate: True
#run_current: 0.4
#hold_current: 0.4
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -263,9 +245,7 @@ max_z_accel: 5
#[tmc5160 extruder]
#cs_pin: PG10
#sense_resistor: 0.075
#interpolate: True
#run_current: 0.5
#hold_current: 0.5
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -274,9 +254,7 @@ max_z_accel: 5
#[tmc5160 extruder1]
#cs_pin: PD4
#sense_resistor: 0.075
#interpolate: True
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand All @@ -285,9 +263,7 @@ max_z_accel: 5
#[tmc5160 extruder2]
#cs_pin: PC12
#sense_resistor: 0.075
#interpolate: True
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 0
#spi_software_mosi_pin: PG15
#spi_software_miso_pin: PB6
Expand Down
28 changes: 6 additions & 22 deletions config/generic-bigtreetech-octopus.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -153,52 +153,44 @@ max_z_accel: 100
#uart_pin: PC4
##diag_pin: PG6
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2209 stepper_y]
#uart_pin: PD11
##diag_pin: PG9
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2209 stepper_z]
#uart_pin: PC6
##diag_pin: PG10
#run_current: 0.650
#hold_current: 0.450
#stealthchop_threshold: 999999

#[tmc2209 stepper_]
#uart_pin: PC7
##diag_pin: PG11
#run_current: 0.650
#hold_current: 0.450
#stealthchop_threshold: 999999

#[tmc2209 extruder]
#uart_pin: PF2
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2209 extruder1]
#uart_pin: PE4
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2209 extruder2]
#uart_pin: PE1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2209 extruder2]
#[tmc2209 extruder3]
#uart_pin: PD3
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

########################################
Expand All @@ -208,61 +200,53 @@ max_z_accel: 100
#[tmc2130 stepper_x]
#cs_pin: PC4
#spi_bus: spi1
##diag1_pin: PB10
##diag1_pin: PG6
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 stepper_y]
#cs_pin: PD11
#spi_bus: spi1
##diag1_pin: PE12
##diag1_pin: PG9
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 stepper_z]
#cs_pin: PC6
#spi_bus: spi1
##diag1_pin: PG8
##diag1_pin: PG10
#run_current: 0.650
#hold_current: 0.450
#stealthchop_threshold: 999999

#[tmc2130 stepper_]
#cs_pin: PC7
#spi_bus: spi1
##diag1_pin: PE15
##diag1_pin: PG11
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 extruder]
#cs_pin: PF2
#spi_bus: spi1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 extruder1]
#cs_pin: PE4
#spi_bus: spi1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 extruder2]
#cs_pin: PE1
#spi_bus: spi1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

#[tmc2130 extruder3]
#cs_pin: PD3
#spi_bus: spi1
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

[board_pins]
Expand All @@ -279,7 +263,7 @@ aliases:
EXP2_3=PB1, EXP2_4=PA4,
EXP2_5=PB2, EXP2_6=PA7, # Slot in the socket on this side
EXP2_7=PC15, EXP2_8=<RST>,
EXP2_9=<GND>, EXP2_10=<5V>
EXP2_9=<GND>, EXP2_10=PC5

# See the sample-lcd.cfg file for definitions of common LCD displays.

Expand Down
Loading

0 comments on commit 2cdd446

Please sign in to comment.