From cdb6651b92d87ce34b5e33b9db4fb90077842394 Mon Sep 17 00:00:00 2001
From: Kyle Brown <kdb424@gmail.com>
Date: Sat, 1 Jan 2022 11:44:24 -0800
Subject: [PATCH] Purge line fix and purple

---
 klipper-mini12864.cfg |  6 ++---
 print_start.cfg       | 13 ++++++---
 printer.cfg           | 63 +++++++++++++++++++++----------------------
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/klipper-mini12864.cfg b/klipper-mini12864.cfg
index e155919..20cb550 100644
--- a/klipper-mini12864.cfg
+++ b/klipper-mini12864.cfg
@@ -41,6 +41,6 @@ initial_BLUE: 0
 [delayed_gcode setdisplayneopixel]
 initial_duration: 1
 gcode:
-        SET_LED LED=fysetc_mini12864 RED=.5 GREEN=0 BLUE=0 INDEX=1 TRANSMIT=0
-        SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=0 INDEX=2 TRANSMIT=0
-        SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=0 INDEX=3
+        SET_LED LED=fysetc_mini12864 RED=.25 GREEN=0 BLUE=.25 INDEX=1 TRANSMIT=0
+        SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=.25 INDEX=2 TRANSMIT=0
+        SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=.25 INDEX=3
diff --git a/print_start.cfg b/print_start.cfg
index 14077eb..e5fb778 100644
--- a/print_start.cfg
+++ b/print_start.cfg
@@ -39,9 +39,9 @@ gcode:
 
 [gcode_macro LIGHT_DISPLAY]
 gcode:
-    SET_LED LED=fysetc_mini12864 RED=.5 GREEN=0 BLUE=0 INDEX=1 TRANSMIT=0
-    SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=0 INDEX=2 TRANSMIT=0
-    SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=0 INDEX=3
+    SET_LED LED=fysetc_mini12864 RED=.25 GREEN=0 BLUE=.25 INDEX=1 TRANSMIT=0
+    SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=.5 INDEX=2 TRANSMIT=0
+    SET_LED LED=fysetc_mini12864 RED=.05 GREEN=0 BLUE=.5 INDEX=3
 
 [gcode_macro PRIME_LINE]
 description: Print an easy to remove parametric extruder priming line with a built-in handle.
@@ -75,9 +75,14 @@ gcode:
 
     SAVE_GCODE_STATE NAME=STATE_PRIME_LINE
 
+    {% set saved_prime_line = (line.area_start_y - 40) %}
+    {% if saved_prime_line < -3 %}
+      {% set saved_prime_line = -3|int %}
+    {% endif %}
+
     M117 Prime Line
     G90 # absolute positioning
-    G0 X{line.area_start_x} Y{line.area_start_y - 40} Z{line.height} F{line.travel_speed * 60} # move to starting position
+    G0 X{line.area_start_x} Y{saved_prime_line} Z{line.height} F{line.travel_speed * 60} # move to starting position
     M109 S{params.EXTRUDER_TEMP|float*0.98} # Wait until 98% of extruder temp is reached, then continue  
     M104 S{params.EXTRUDER_TEMP} # Set printing extruder temp
     G91 # relative positioning
diff --git a/printer.cfg b/printer.cfg
index 87d38fe..eaf7c97 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -93,7 +93,7 @@ fade_target: 0
 pin: PC15
 x_offset: 0.0
 y_offset: 34.5
-#z_offset = 6.163
+z_offset = 6.628
 speed: 25
 samples_result: median
 samples_tolerance: 0.05
@@ -121,7 +121,7 @@ pid_kp = 27.402
 pid_ki = 1.631
 pid_kd = 115.090
 min_temp: 0
-max_temp: 300
+max_temp: 350
 
 [tmc2209 extruder]
 uart_pin: PC11
@@ -151,6 +151,21 @@ pid_kd = 1120.355
 min_temp: 0
 max_temp: 110
 
+[thermistor chamber_temp]
+temperature1: 10
+resistance1: 100000
+temperature2: 150
+resistance2: 1074
+temperature3: 300
+resistance3: 82.78
+
+[temperature_sensor chamber]
+sensor_type: chamber_temp
+#sensor_type: ATC Semitec 104NT-4-R025H42G
+sensor_pin: PA6
+min_temp: 0
+max_temp: 200
+
 [fan]
 pin: PC6
 
@@ -163,9 +178,16 @@ heater: extruder
 heater_temp: 50.0
 fan_speed: 1.0
 
-#[temperature_sensor chamber]
-#sensor_type: ATC Semitec 104GT-2
-#sensor_pin: PA1
+[temperature_sensor raspberry_pi]
+sensor_type: temperature_host
+min_temp: 10
+max_temp: 100
+
+[temperature_sensor mcu_temp]
+sensor_type: temperature_mcu
+min_temp: 0
+max_temp: 100
+
 
 [mcu]
 serial: /dev/serial/by-id/usb-Klipper_stm32f103xe_33FFD8055646303527842243-if00
@@ -225,30 +247,7 @@ probe_points:
     125,119,20
 
 [input_shaper]
-shaper_type_x = zv
-shaper_freq_x = 56.0
-shaper_type_y: zv
-shaper_freq_y: 47.2
-
-#*# <---------------------- SAVE_CONFIG ---------------------->
-#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
-#*#
-#*# [bed_mesh default]
-#*# version = 1
-#*# points =
-#*# 	  -0.009375, 0.000000, 0.015625
-#*# 	  -0.031250, -0.012500, -0.006250
-#*# 	  -0.025000, -0.031250, -0.025000
-#*# tension = 0.2
-#*# min_x = 89.2
-#*# algo = lagrange
-#*# y_count = 3
-#*# mesh_y_pps = 2
-#*# min_y = 81.7
-#*# x_count = 3
-#*# max_y = 148.3
-#*# mesh_x_pps = 2
-#*# max_x = 155.8
-#*#
-#*# [probe]
-#*# z_offset = 6.100
+shaper_type_x = mzv
+shaper_freq_x = 54.0
+shaper_type_y = mzv
+shaper_freq_y = 48.8