Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
TheJoshW committed Feb 6, 2021
2 parents 2f8dc20 + a7b50b6 commit fa5079f
Show file tree
Hide file tree
Showing 51 changed files with 26,696 additions and 498 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/invalid-label-bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Enable the github stale issue bot tracker
name: "Add comment to issues marked invalid"
on:
issues:
types: [labeled]
jobs:
comment:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
if (context.payload.label.name != "invalid")
return;
msg = "Unfortunately, it appears the directions at"
+ " https://www.klipper3d.org/Contact.html"
+ " were not followed for this issue.\n"
+ "\n"
+ "We choose to use github as a place that people working on"
+ " improving Klipper can share the results of their work."
+ " We choose to not use github to help diagnose problems"
+ " with a user's printer. We choose to not use github to"
+ " answer user questions. We choose to not use github as"
+ " a place to make requests.\n"
+ "\n"
+ "In the future, please follow the directions at:"
+ " https://www.klipper3d.org/Contact.html\n"
+ "This ticket will be automatically closed.\n"
+ "\n"
+ "Best regards,\n"
+ "~ Your friendly GitIssueBot\n"
+ "\n"
+ "PS: I'm just an automated script, not a human being.";
github.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: msg
})
13 changes: 12 additions & 1 deletion .github/workflows/stale-issue-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "Close stale issues"
on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'
jobs:
stale:
runs-on: ubuntu-latest
Expand All @@ -29,3 +29,14 @@ jobs:
exempt-issue-labels: 'enhancement,bug'
days-before-stale: 21
days-before-close: 7
invalid:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-label: invalid
stale-pr-label: invalid
days-before-stale: -1
days-before-close: 2
remove-stale-when-updated: false
150 changes: 150 additions & 0 deletions config/printer-creality-ender3max-2021.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
# This file contains pin mappings for the stock 2020 Creality Ender 3
# MAX. To use this config, during "make menuconfig" select the
# STM32F103 with a "28KiB bootloader" and with "Use USB for
# communication" disabled.

# Because this printer has factory wiring, mounts, and firmware for
# a BLTouch, but does not ship with one at this time, default values
# for the sensor have been specified, but disabled, in anticipation of
# future revisions or user modification. User should take care to
# customize the offsets, particularly z-offset, for their specific unit.

# If you prefer a direct serial connection, in "make menuconfig"
# select "Enable extra low-level configuration options" and select the
# USART3 serial port, which is broken out on the 10 pin IDC cable used
# for the LCD module as follows:
# 3: Tx, 4: Rx, 9: GND, 10: VCC

# Flash this firmware by copying "out/klipper.bin" to a SD card and
# turning on the printer with the card inserted. The firmware
# filename must end in ".bin" and must not match the last filename
# that was flashed.

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

[stepper_x]
step_pin: PC2
dir_pin: PB9
enable_pin: !PC3
microsteps: 16
rotation_distance: 40
endstop_pin: ^PA5
position_endstop: 0
position_max: 300
homing_speed: 50

[stepper_y]
step_pin: PB8
dir_pin: PB7
enable_pin: !PC3
microsteps: 16
rotation_distance: 40
endstop_pin: ^PA6
position_endstop: 0
position_max: 300
homing_speed: 50

[stepper_z]
step_pin: PB6
dir_pin: !PB5
enable_pin: !PC3
microsteps: 16
rotation_distance: 8
position_endstop: 0.0 # disable to use BLTouch
endstop_pin: ^PA7 # disable to use BLTouch
#endstop_pin: probe:z_virtual_endstop # enable to use BLTouch
#position_min: -5 # enable to use BLTouch
position_max: 340

# [safe_z_home] # enable for BLTouch
# home_xy_position: 150, 150
# speed: 100
# z_hop: 10
# z_hop_speed: 5

# [bltouch] # enable for BLTouch - fast-mode
# sensor_pin: ^PB1
# control_pin: PB0
# pin_up_touch_mode_reports_triggered: True
# probe_with_touch_mode: True
# x_offset: 50 # modify as needed for bltouch location
# y_offset: -6 # modify as needed for bltouch location
# z_offset: 0.0 # modify as needed for bltouch or run PROBE_CALIBRATE
# speed: 10
# samples: 3
# sample_retract_dist: 5.0 # Can be set lower, example 2.5 depending on height of bltouch from bed
# lift_speed: 40
# samples_tolerance_retries: 3
# speed: 10
# samples: 2

# [bed_mesh] # enable for BLTouch
# speed: 300
# mesh_min: 50, 0
# mesh_max: 290, 290
# algorithm: bicubic
# probe_count: 7,7 # 49 points due to large bed size
# horizontal_move_z: 5


# [gcode_macro G29] # If moving from marlin to klipper uncomment to mimic G29
# gcode:
# BED_MESH_CALIBRATE
# G1 X0 Y0 Z10 F4000

[extruder]
max_extrude_only_distance: 100.0
step_pin: PB4
dir_pin: PB3
enable_pin: !PC3
microsteps: 16
rotation_distance: 31.901 # Calibrate - see https://github.com/KevinOConnor/klipper/blob/master/docs/Rotation_Distance.md
nozzle_diameter: 0.400
filament_diameter: 1.750
heater_pin: PA1
sensor_type: EPCOS 100K B57560G104F
sensor_pin: PC5
control: pid
pid_Kp: 21.527
pid_Ki: 1.063
pid_Kd: 108.982
min_temp: 0
max_temp: 250
pressure_advance: 0.0 # Calibrate - see https://github.com/KevinOConnor/klipper/blob/master/docs/Pressure_Advance.md


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

[fan]
pin: PA0

[filament_switch_sensor e0_sensor]
switch_pin: PA4

[mcu]
serial: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0 # Run ls /dev/serial/by-id/* for micro-controller name
restart_method: command

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

[display]
lcd_type: st7920
cs_pin: PB12
sclk_pin: PB13
sid_pin: PB15
encoder_pins: ^PD2, ^PD3
click_pin: ^!PC0
4 changes: 1 addition & 3 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ this document.
## Creating a new issue

Please see the [contact page](Contact.md) for information on creating
an issue. In particular, **we need the klippy.log file** attached to
bug reports. Also, be sure to read the [FAQ](FAQ.md) to see if a
similar issue has already been raised.
an issue.

## Submitting a pull request

Expand Down
9 changes: 9 additions & 0 deletions docs/Config_Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ All dates in this document are approximate.

# Changes

20210201: The `TEST_RESONANCES` command will now disable input shaping
if it was previously enabled (and re-enable it after the test). In order
to override this behavior and keep the input shaping enabled, one can
pass an additional parameter `INPUT_SHAPING=1` to the command.

20210201: The `ACCELEROMETER_MEASURE` command will now append the name
of the accelerometer chip to the output file name if the chip was given
a name in the corresponding adxl345 section of the printer.cfg.

20201222: The `step_distance` setting in the stepper config sections
is deprecated. It is advised to update the config to use the
[`rotation_distance`](Rotation_Distance.md) setting. Support for
Expand Down
22 changes: 22 additions & 0 deletions docs/Config_Reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,23 @@ CPU temperature from the Raspberry Pi running the host software.
sensor_type: rpi_temperature
```

## DS18B20 temperature sensor

DS18B20 is a 1-wire (w1) digital temperature sensor. Note that this sensor is not intended for use with extruders and heater beds, but rather for monitoring ambient temperature (C). These sensors have range up to 125 C, so are usable for e.g. chamber temperature monitoring. They can also function as simple fan/heater controllers. DS18B20 sensors are only supported on the "host mcu", e.g. the Raspberry Pi. The w1-gpio Linux kernel module must be installed.

```
sensor_type: DS18B20
serial_no:
# Each 1-wire device has a unique serial number used to identify the device,
# usually in the format 28-031674b175ff. This parameter must be provided.
# Attached 1-wire devices can be listed using the following Linux command:
# ls /sys/bus/w1/devices/
#ds18_report_time:
# Interval in seconds between readings. Default is 3.0, with a minimum of 1.0
#sensor_mcu:
# The micro-controller to read from. Must be the host_mcu
```

# Fans

## [fan]
Expand Down Expand Up @@ -3025,6 +3042,11 @@ lcd_type:
# Controller" type displays), "uc1701" (which is used in "MKS Mini
# 12864" type displays), "ssd1306", or "sh1106". This parameter must
# be provided.
#hd44780_protocol_init: True
# Perform 8-bit/4-bit protocol initialization on an hd44780 display.
# This is necessary on real hd44780 devices. However, one may
# need to disable this on some "clone" devices. The default
# is True.
#rs_pin:
#e_pin:
#d4_pin:
Expand Down
Loading

0 comments on commit fa5079f

Please sign in to comment.