Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
troy-jacobson committed Feb 21, 2022
2 parents 4dc6609 + 8b0c6fc commit 90d0a6a
Show file tree
Hide file tree
Showing 164 changed files with 112,090 additions and 2,480 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/klipper3d-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- docs/**
- mkdocs.yml
- .github/workflows/klipper3d-deploy.yaml
schedule:
- cron: "0 0 * * *"
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -24,6 +26,8 @@ jobs:
${{ runner.os }}-pip-
- name: Install dependencies
run: pip install -r docs/_klipper3d/mkdocs-requirements.txt
- name: Fetch translations
run: docs/_klipper3d/fetch-translations.sh
- name: Build and deploy klipper3d
run: |
mkdocs gh-deploy --config-file docs/_klipper3d/mkdocs.yml --remote-branch gh-pages --force --verbose
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,21 @@ $(OUT)compile_time_request.o: $(patsubst %.c, $(OUT)src/%.o.ctr,$(src-y)) ./scri

################ Auto generation of "board/" include file link

$(OUT)board-link: $(KCONFIG_CONFIG)
create-board-link:
@echo " Creating symbolic link $(OUT)board"
$(Q)mkdir -p $(addprefix $(OUT), $(dirs-y))
$(Q)echo "#$(CONFIG_BOARD_DIRECTORY)" > $@.temp
$(Q)if ! cmp -s $@.temp $@; then rm -f $(OUT)*.d $(patsubst %,$(OUT)%/*.d,$(dirs-y)) ; mv $@.temp $@ ; fi
$(Q)rm -f $(OUT)*.d $(patsubst %,$(OUT)%/*.d,$(dirs-y))
$(Q)rm -f $(OUT)board
$(Q)ln -sf $(CURDIR)/src/$(CONFIG_BOARD_DIRECTORY) $(OUT)board
$(Q)mkdir -p $(OUT)board-generic
$(Q)rm -f $(OUT)board-generic/board
$(Q)ln -sf $(CURDIR)/src/generic $(OUT)board-generic/board

# Hack to rebuild OUT directory and reload make dependencies on Kconfig change
$(OUT)board-link: $(KCONFIG_CONFIG)
$(Q)mkdir -p $(OUT)
$(Q)echo "# Makefile board-link rule" > $@
$(Q)$(MAKE) create-board-link
include $(OUT)board-link

################ Kconfig rules
Expand All @@ -114,7 +118,7 @@ menuconfig:
################ Generic rules

# Make definitions
.PHONY : all clean distclean olddefconfig menuconfig FORCE
.PHONY : all clean distclean olddefconfig menuconfig create-board-link FORCE
.DELETE_ON_ERROR:

all: $(target-y)
Expand Down
2 changes: 1 addition & 1 deletion config/example-polar.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is an example config file for polar style printers. One
# may copy and edit this file to configure a new polar printer.

# POLAR KINEMATICS ARE A WORK IN PROGRESS. Moves around the 0,0
# POLAR KINEMATICS ARE A WORK IN PROGRESS. Moves around the 0, 0
# position are known to not work properly.

# See docs/Config_Reference.md for a description of parameters.
Expand Down
2 changes: 1 addition & 1 deletion config/example-winch.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Homing is not implemented on cable winch kinematics. In order to
# home the printer, manually send movement commands until the toolhead
# is at 0,0,0 and then issue a G28 command.
# is at 0, 0, 0 and then issue a G28 command.

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

Expand Down
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
16 changes: 0 additions & 16 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 extruder3]
#uart_pin: PD3
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

########################################
Expand All @@ -210,59 +202,51 @@ max_z_accel: 100
#spi_bus: spi1
##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: PG9
#run_current: 0.800
#hold_current: 0.500
#stealthchop_threshold: 999999

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

#[tmc2130 stepper_]
#cs_pin: PC7
#spi_bus: spi1
##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 Down
3 changes: 0 additions & 3 deletions config/generic-bigtreetech-skr-2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,16 @@ aliases:
#[tmc2209 stepper_x]
#uart_pin: PE0
#run_current: 0.800
#hold_current: 0.800
#diag_pin:

#[tmc2209 stepper_y]
#uart_pin: PD3
#run_current: 0.800
#hold_current: 0.800
#diag_pin:

#[tmc2209 stepper_z]
#uart_pin: PD0
#run_current: 0.800
#hold_current: 0.800
#diag_pin:

#[tmc2209 extruder]
Expand Down
Loading

0 comments on commit 90d0a6a

Please sign in to comment.