Skip to content

Commit

Permalink
Merge branch 'master' into work-dual-car-docs-20210721
Browse files Browse the repository at this point in the history
  • Loading branch information
charlespick authored Sep 16, 2021
2 parents a3ee140 + 46167ca commit 5fc73e3
Show file tree
Hide file tree
Showing 154 changed files with 579,281 additions and 577,030 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/close-invalid-bot.yaml

This file was deleted.

126 changes: 123 additions & 3 deletions .github/workflows/stale-issue-bot.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Enable the github stale issue bot tracker
name: "Close stale issues"
# Close and warn on tickets that have become stale
name: "Close stale tickets"
on:
schedule:
- cron: '0 0 * * *'
- cron: '0 */12 * * *'
jobs:
# Check for stale issues (no updates in 5 weeks)
stale:
runs-on: ubuntu-latest
steps:
Expand All @@ -29,6 +30,35 @@ jobs:
exempt-issue-labels: 'enhancement,bug'
days-before-stale: 35
days-before-close: 7
# Close tickets marked with "not on github" label
close_not_on_github:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
with:
script: |
const issues = await github.issues.listForRepo({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
labels: 'not on github',
per_page: 100,
page: 1
});
const expireMillis = 1000 * 60 * 60 * 36;
const curtime = new Date().getTime();
for (var issue of issues.data.values()) {
const updatetime = new Date(issue.updated_at).getTime();
if (curtime < updatetime + expireMillis)
continue;
await github.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
state: 'closed'
});
}
# Close tickets marked with "resolved" label
close_resolved:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -69,3 +99,93 @@ jobs:
state: 'closed'
});
}
# Close PRs marked with "not mainline" label
close_not_mainline:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
with:
script: |
const issues = await github.issues.listForRepo({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
labels: 'not mainline',
per_page: 100,
page: 1
});
const expireMillis = 1000 * 60 * 60 * 24 * 7;
const curtime = new Date().getTime();
for (var issue of issues.data.values()) {
const updatetime = new Date(issue.updated_at).getTime();
if (curtime < updatetime + expireMillis)
continue;
msg = "This PR is being closed because it is currently not"
+ " considered a good match for the master Klipper"
+ " repository."
+ "\n\n"
+ "Best regards,\n"
+ "~ Your friendly GitIssueBot"
+ "\n\n"
+ "PS: I'm just an automated script, not a human being.";
await github.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
body: msg
});
await github.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
state: 'closed'
});
}
# Mark (and close) PRs with "pending feedback" for 3+ weeks
mark_inactive:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
with:
script: |
const issues = await github.issues.listForRepo({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
labels: 'pending feedback',
per_page: 100,
page: 1
});
const expireMillis = 1000 * 60 * 60 * 24 * 21;
const curtime = new Date().getTime();
for (var issue of issues.data.values()) {
const updatetime = new Date(issue.updated_at).getTime();
if (curtime < updatetime + expireMillis)
continue;
msg = "It looks like this GitHub Pull Request has become"
+ " inactive. If there are any further updates, you can"
+ " add a comment here or open a new ticket."
+ "\n\n"
+ "Best regards,\n"
+ "~ Your friendly GitIssueBot"
+ "\n\n"
+ "PS: I'm just an automated script, not a human being.";
await github.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
labels: ['inactive']
});
await github.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
body: msg
});
await github.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
state: 'closed'
});
}
121 changes: 121 additions & 0 deletions config/generic-bigtreetech-e3-rrf-v1.1.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
# This file contains common pin mappings for the BigTreeTech E3 RRF 1.1.
# To use this config, the firmware should be compiled for the
# STM32F407 with a "32KiB bootloader".

# The "make flash" command does not work on the E3 RRF 1.1. Instead,
# after running "make", copy the generated "out/klipper.bin" file to a
# file named "firmware.bin" on an SD card and then restart the E3 RRF
# 1.1 with that SD card.

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

[stepper_x]
step_pin: PD5
dir_pin: !PD4
enable_pin: !PD7
microsteps: 16
rotation_distance: 40
endstop_pin: ^PC0
position_endstop: 0
position_max: 235
homing_speed: 50

[tmc2209 stepper_x]
uart_pin: PD6
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[stepper_y]
step_pin: PD0
dir_pin: !PA15
enable_pin: !PD3
microsteps: 16
rotation_distance: 40
endstop_pin: ^PC1
position_endstop: 0
position_max: 235
homing_speed: 50

[tmc2209 stepper_y]
uart_pin: PD1
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[stepper_z]
step_pin: PC6
dir_pin: PC7
enable_pin: !PD14
microsteps: 16
rotation_distance: 8
endstop_pin: ^PC2
position_endstop: 0.0
position_max: 250

[tmc2209 stepper_z]
uart_pin: PD15
run_current: 0.580
hold_current: 0.500
stealthchop_threshold: 999999

[extruder]
step_pin: PD12
dir_pin: !PD13
enable_pin: !PD10
microsteps: 16
rotation_distance: 33.500
nozzle_diameter: 0.400
filament_diameter: 1.750
heater_pin: PB3
sensor_type: EPCOS 100K B57560G104F
sensor_pin: PA0
control: pid
pid_Kp: 21.527
pid_Ki: 1.063
pid_Kd: 108.982
min_temp: 0
max_temp: 250

[tmc2209 extruder]
uart_pin: PD11
run_current: 0.650
hold_current: 0.500
stealthchop_threshold: 999999

[heater_bed]
heater_pin: PB4
sensor_type: EPCOS 100K B57560G104F
sensor_pin: PA1
control: pid
pid_Kp: 54.027
pid_Ki: 0.770
pid_Kd: 948.182
min_temp: 0
max_temp: 130

[heater_fan nozzle_cooling_fan]
pin: PB6

[fan]
pin: PB5

[mcu]
serial: /dev/serial/by-id/usb-Klipper_stm32f407xx_370025000247303034313331-if00

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

# Warning: display section not tested!

[board_pins]
aliases:
# EXP1 header
EXP1_1=PE8, EXP1_3=PE7, EXP1_5=PB2, EXP1_7=PB1, EXP1_9=<GND>,
EXP1_2=PE9, EXP1_4=<RST>, EXP1_6=PE10, EXP1_8=PE11, EXP1_10=<5V>

# See the sample-lcd.cfg file for definitions of common LCD displays.
4 changes: 4 additions & 0 deletions config/generic-bigtreetech-skr-2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ pin: PB7
#[heater_fan fan2]
#pin: PB5

# Due to BTT implementing a Marlin-specific safety feature,
# "anti-reversal stepper protection", this pin needs pulling
# high to pass power to stepper drivers and most FETs

[output_pin motor_power]
pin: PC13
value: 1
Expand Down
4 changes: 2 additions & 2 deletions config/generic-creality-v4.2.7.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ max_z_accel: 100

[board_pins]
aliases:
EXP1_1=PC6,EXP1_3=PB10,EXP1_5=PB14,EXP1_7=PB12,EXP1_9=<GND>
EXP1_2=PB2,EXP1_4=PB11,EXP1_6=PB13,EXP1_8=PB15,EXP1_10=<5V>
EXP1_1=PC6,EXP1_3=PB10,EXP1_5=PB14,EXP1_7=PB12,EXP1_9=<GND>,
EXP1_2=PB2,EXP1_4=PB11,EXP1_6=PB13,EXP1_8=PB15,EXP1_10=<5V>,
PROBE_IN=PB0,PROBE_OUT=PB1,FIL_RUNOUT=PC6
29 changes: 26 additions & 3 deletions config/generic-mks-robin-e3.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
# MKS Robin E3 has onboard TMC2209. This config can also be used for
# MKS Robin E3D if equipped with TMC2209 stepper drivers.

# Please note pin name change for stepper Z for v1.1 of the boards.

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

[stepper_x]
Expand All @@ -38,8 +40,8 @@ position_max: 165
homing_speed: 50

[stepper_z]
step_pin: PB7 #PC14 if using board v1.1
dir_pin: !PB6 #PC15 if using board v1.1
step_pin: PB7 # PC14 if using board v1.1
dir_pin: !PB6 # !PC15 if using board v1.1
enable_pin: !PB8
microsteps: 16
rotation_distance: 8
Expand Down Expand Up @@ -102,6 +104,10 @@ pin: PA8
#control_pin: PA3
#...

#[filament_switch_sensor my_sensor]
#switch_pin: PB10
#...

[mcu]
serial: /dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0
restart_method: command
Expand All @@ -121,6 +127,23 @@ aliases:
EXP1_2=PC1, EXP1_4=PA5, EXP1_6=PA7, EXP1_8=PC5, EXP1_10=<5V>,
# EXP2 header
EXP2_1=PB14, EXP2_3=PB11, EXP2_5=PB0, EXP2_7=PC10, EXP2_9=<GND>,
EXP2_2=PB13, EXP2_4=PA15, EXP2_6=PB15, EXP2_8=<RST>, EXP2_10=<NC>
EXP2_2=PB13, EXP2_4=PA15, EXP2_6=PB15, EXP2_8=<RST>, EXP2_10=<NC>,
# CR_EXP3 header - additional header dedicated to Creality Ender 3/5 stock screens
CR_EXP3_10=<5V>, CR_EXP3_8=PA4, CR_EXP3_6=PA6, CR_EXP3_4=<RST>, CR_EXP3_2=PC3,
CR_EXP3_9=<GND>, CR_EXP3_7=PA5, CR_EXP3_5=PB0, CR_EXP3_3=PB11, CR_EXP3_1=PC1

# If you're using this board to replace stock Creality board, connect display to EXP3
# and use this display config
#[display]
#lcd_type: st7920
#sid_pin: CR_EXP3_8
#cs_pin: CR_EXP3_7
#sclk_pin: CR_EXP3_6
#encoder_pins: ^CR_EXP3_5, ^CR_EXP3_3
#click_pin: ^!CR_EXP3_2
#
#[output_pin beeper]
## pin: EXP1_9
#pin: CR_EXP3_1

# See the sample-lcd.cfg file for definitions of common LCD displays.
4 changes: 2 additions & 2 deletions config/generic-replicape.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ aliases:
mcu: host
aliases:
# Host aliases for Linux MCU
HOST_X2_STOP=gpio30, HOST_Y2_STOP=gpio113, HOST_Z2_STOP=gpio4
HOST_X2_STOP=gpio30, HOST_Y2_STOP=gpio113, HOST_Z2_STOP=gpio4,
# Thermistors
THERM_E=analog4, THERM_H=analog5, THERM_BED=analog6
THERM_E=analog4, THERM_H=analog5, THERM_BED=analog6,
# D1W pin
DALLAS=gpio2
4 changes: 2 additions & 2 deletions config/printer-creality-ender3max-2021.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,5 @@ lcd_type: st7920
cs_pin: PB12
sclk_pin: PB13
sid_pin: PB15
encoder_pins: ^PD2, ^PD3
click_pin: ^!PC0
encoder_pins: ^PB14, ^PB10
click_pin: ^!PB2
Loading

0 comments on commit 5fc73e3

Please sign in to comment.