Merge remote-tracking branch 'upstream/master' into prusamini

.github/workflows/invalid-label-bot.yaml

@@ -5,6 +5,7 @@ on:
       types: [labeled]
 jobs:
   comment:
+    if: github.repository == 'Klipper3d/klipper'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@v3

.github/workflows/stale-issue-bot.yaml

@@ -1,10 +1,12 @@
-# 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:
+    if: github.repository == 'Klipper3d/klipper'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/stale@v3
@@ -29,7 +31,38 @@ 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:
+    if: github.repository == 'Klipper3d/klipper'
+    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:
+    if: github.repository == 'Klipper3d/klipper'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@v3
@@ -69,3 +102,106 @@ jobs:
                 state: 'closed'
               });
             }
+  # 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
+        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:
+    if: github.repository == 'Klipper3d/klipper'
+    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'
+              });
+            }
+  # 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: ''

Makefile

@@ -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
@@ -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)

config/example-polar.cfg

@@ -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.

config/example-winch.cfg

@@ -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.
 

config/generic-bigtreetech-e3-rrf-v1.1.cfg

@@ -0,0 +1,117 @@
+# 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
+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
+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
+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
+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.