Merge branch 'main'

This commit is contained in:
Bassam Husain
2023-01-17 23:48:53 -05:00
2 changed files with 7 additions and 5 deletions

View File

@@ -1,5 +1,6 @@
{
"editor.tabSize": 4,
"editor.insertSpaces": true,
"editor.detectIndentation": false
"editor.detectIndentation": false,
"git.mergeEditor": false
}

View File

@@ -124,8 +124,8 @@ pid_kd: 86.991
pid_kp: 21.479
pid_ki: 1.326
min_temp: 0
max_temp: 260
min_extrude_temp: 190
max_temp: 300
# min_extrude_temp: 190 # TODO enable after initial setup
[tmc2209 extruder]
uart_pin: PC14
@@ -152,10 +152,11 @@ uart_address: 3
# probe_points: 110, 110, 20
# [input_shaper]
# shaper_freq_x = 114.6
# shaper_freq_x: 46.948
# shaper_type_x: mzv
# shaper_freq_y = 77
# shaper_freq_y: 52.493
# shaper_type_y: mzv
# shaper_type: ei
#####################################################################
# Misc