From bccf58544618a4686f377fec2099d1e997c88025 Mon Sep 17 00:00:00 2001
From: Bassam Husain <bassam.husain@gmail.com>
Date: Fri, 10 Mar 2023 05:30:53 -0500
Subject: [PATCH] Pulled in changes from master.

---
 cfgs/{macros.cfg => misc-macros.cfg} | 13 +++++++++++++
 printer-skr-mini-e3-v3.cfg           | 23 +++--------------------
 printer.cfg                          | 24 +++---------------------
 3 files changed, 19 insertions(+), 41 deletions(-)
 rename cfgs/{macros.cfg => misc-macros.cfg} (96%)

diff --git a/cfgs/macros.cfg b/cfgs/misc-macros.cfg
similarity index 96%
rename from cfgs/macros.cfg
rename to cfgs/misc-macros.cfg
index f762c09..643707d 100644
--- a/cfgs/macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -1,3 +1,16 @@
+[force_move]
+enable_force_move: True
+
+[temperature_sensor raspberry_pi]
+sensor_type: temperature_host
+
+[virtual_sdcard]
+path: /home/pi/printer_data/gcodes
+
+# NOTE Cancel objects feature is enabled. If you're using a low powered device, comment out [exclude_object].
+# Also see [file_manager] section in moonraker.conf.
+[exclude_object]
+
 [pause_resume]
 [display_status]
 
diff --git a/printer-skr-mini-e3-v3.cfg b/printer-skr-mini-e3-v3.cfg
index 2c094ca..9f54144 100644
--- a/printer-skr-mini-e3-v3.cfg
+++ b/printer-skr-mini-e3-v3.cfg
@@ -4,7 +4,7 @@
 # 
 # See https://www.klipper3d.org/Config_Reference.html for configuration reference.
 
-[include ./cfgs/macros.cfg]
+[include ./cfgs/misc-macros.cfg]
 [include ./cfgs/PARKING.cfg]
 [include ./cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg]
 [include ./cfgs/beeper.cfg]
@@ -131,9 +131,6 @@ pid_kd: 1343.571
 min_temp: 0
 max_temp: 110
 
-[fan]
-pin: PC6
-
 [probe]
 pin: PC14
 x_offset: 27
@@ -161,12 +158,6 @@ fade_start: 1
 fade_end: 10
 fade_target: 0
 
-[virtual_sdcard]
-path: /home/pi/printer_data/gcodes
-
-[temperature_sensor raspberry_pi]
-sensor_type: temperature_host
-
 [display]
 lcd_type: st7920
 cs_pin: PB8
@@ -200,16 +191,8 @@ speed: 50
 horizontal_move_z: 10
 screw_thread: CCW-M4
 
-# NOTE this is the pin for the filament switch, if you have one
-# [filament_switch_sensor fil_sensor]
-# switch_pin: PA4 # "Pulled-high"
-
-# NOTE Cancel objects feature is enabled. If you're using a low powered device, comment out [exclude_object].
-# Also see [file_manager] section in moonraker.conf.
-[exclude_object]
-
-[force_move]
-enable_force_move: True
+[fan]
+pin: PC6
 
 [controller_fan electronic_enclosure_fan]
 pin: PB15
diff --git a/printer.cfg b/printer.cfg
index 3a0387a..22b8629 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -4,7 +4,7 @@
 # 
 # See https://www.klipper3d.org/Config_Reference.html for configuration reference.
 
-[include ./cfgs/macros.cfg]
+[include ./cfgs/misc-macros.cfg]
 [include ./cfgs/PARKING.cfg]
 [include ./cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg]
 [include ./cfgs/beeper.cfg]
@@ -107,7 +107,6 @@ pid_ki: 1.326
 min_temp: 0
 max_temp: 300
 max_extrude_only_distance: 150.0
-pressure_advance: 0.027
 
 [tmc2209 extruder]
 uart_pin: PC14
@@ -128,9 +127,6 @@ pid_kd: 1343.571
 min_temp: 0
 max_temp: 110
 
-[fan]
-pin: PA0
-
 [probe]
 pin: PB1
 x_offset: 27
@@ -157,12 +153,6 @@ fade_start: 1
 fade_end: 10
 fade_target: 0
 
-[virtual_sdcard]
-path: /home/pi/printer_data/gcodes
-
-[temperature_sensor raspberry_pi]
-sensor_type: temperature_host
-
 [display]
 lcd_type: st7920
 cs_pin: PB12
@@ -196,13 +186,5 @@ speed: 50
 horizontal_move_z: 10
 screw_thread: CCW-M4
 
-# NOTE this is the pin for the filament switch, if you have one
-# [filament_switch_sensor fil_sensor]
-# switch_pin: PA4 # "Pulled-high"
-
-# NOTE Cancel objects feature is enabled. If you're using a low powered device, comment out [exclude_object].
-# Also see [file_manager] section in moonraker.conf.
-[exclude_object]
-
-[force_move]
-enable_force_move: True
\ No newline at end of file
+[fan]
+pin: PA0