diff --git a/firmware_configurations/README.md b/firmware_configurations/README.md index d18915524..12bad3f55 100644 --- a/firmware_configurations/README.md +++ b/firmware_configurations/README.md @@ -24,6 +24,6 @@ If your mod is lacking a column in the compatibility matrix, feel free to submit | Creator | Config title | Description | V1.6 | V2.1 | V2.2 | |---------|--------------|-------------|------|------|------| | Chron | [SKR 1.3 TMC2208 UART Config](./klipper/Chron) | Configuration for SKR 1.3 TMC2208 UART | :x: | :heavy_check_mark: | :grey_question: | -| Danowar | [FYSETC F6 1.3 Klipper Config](./klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config) | Klipper config for a FYSETC F6 350 build. | :x: | :heavy_check_mark: | :grey_question: | +| Danowar | [FYSETC F6 1.3 Klipper Config](./klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config) | Klipper config for a FYSETC F6 350 build. UPDATED 11/14/19 | :x: | :heavy_check_mark: | :heavy_check_mark: | --- diff --git a/firmware_configurations/klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config/printer.cfg b/firmware_configurations/klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config/printer.cfg index 70765fb4a..5618c0c4f 100644 --- a/firmware_configurations/klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config/printer.cfg +++ b/firmware_configurations/klipper/Danowar/FYSETC_F6_V1.3_Klipper_Config/printer.cfg @@ -90,9 +90,9 @@ enable_pin: !ar56 step_distance: 0.0125 # connected to ymax on mcu_xye endstop_pin: ^!ar15 -position_min: -11 -position_endstop: 339 -position_max: 339 +position_min: 0 +position_endstop: 350 +position_max: 350 homing_speed: 100 homing_retract_dist: 5 homing_positive_dir: true @@ -100,17 +100,18 @@ homing_positive_dir: true [stepper_z] # connected to X on mcu_z (Front Left Stepper, from top) step_pin: z:ar54 -dir_pin: z:ar55 +dir_pin: !z:ar55 enable_pin: !z:ar38 # 1.8deg - 400 steps per mm step_distance: 0.00250 # connected to zmax on mcu_z -endstop_pin: !z:ar12 +endstop_pin: ^!z:ar12 # offset for nozzle to bed off z switch -position_endstop: 1.84 ;ABS -position_max: 340 -position_min: -1 +# position_endstop: 1.63 ;ABS ---FSR +position_endstop: 0.12 +position_max: 335 +position_min: -5 homing_speed: 15.0 second_homing_speed: 3.0 homing_retract_dist: 3.0 @@ -119,7 +120,7 @@ homing_positive_dir: false [stepper_z1] # connected to Y on mcu_z (Rear Left Stepper, from top) step_pin: z:ar60 -dir_pin: !z:ar61 +dir_pin: z:ar61 enable_pin: !z:ar56 # 1.8deg - 400 steps per mm step_distance: 0.00250 @@ -127,7 +128,7 @@ step_distance: 0.00250 [stepper_z2] # connected to Z on mcu_z (Rear Right Stepper, from top) step_pin: z:ar43 -dir_pin: z:ar48 +dir_pin: !z:ar48 enable_pin: !z:ar58 # 1.8deg - 400 steps per mm step_distance: 0.00250 @@ -135,7 +136,7 @@ step_distance: 0.00250 [stepper_z3] # connected to E0 on mcu_z (Front Right Stepper, from top) step_pin: z:ar26 -dir_pin: !z:ar28 +dir_pin: z:ar28 enable_pin: !z:ar24 # 1.8deg - 400 steps per mm step_distance: 0.00250 @@ -144,6 +145,7 @@ step_distance: 0.00250 # ar71 not in pin map, using actual pin number uart_pin: PG3 microsteps: 16 +interpolate: False run_current: 1.0 hold_current: 0.6 @@ -151,6 +153,7 @@ hold_current: 0.6 # ar73 not in pin map, using actual pin number uart_pin: PJ3 microsteps: 16 +interpolate: False run_current: 1.0 hold_current: 0.6 @@ -158,6 +161,15 @@ hold_current: 0.6 # ar76 not in pin map, using actual pin number uart_pin: PJ5 microsteps: 16 +interpolate: False +run_current: 0.8 +hold_current: 0.2 + +[tmc2208 extruder1] +# ar80 not in pin map, using actual pin number +uart_pin: PE7 +microsteps: 16 +interpolate: False run_current: 0.8 hold_current: 0.2 @@ -165,6 +177,7 @@ hold_current: 0.2 # z:ar71 not in pin map, using actual pin number uart_pin: z:PG3 microsteps: 16 +interpolate: False run_current: 0.8 hold_current: 0.6 @@ -172,6 +185,7 @@ hold_current: 0.6 # z:ar73 not in pin map, using actual pin number uart_pin: z:PJ3 microsteps: 16 +interpolate: False run_current: 0.8 hold_current: 0.6 @@ -179,6 +193,7 @@ hold_current: 0.6 # z:ar78 not in pin map, using actual pin number uart_pin: z:PE2 microsteps: 16 +interpolate: False run_current: 0.8 hold_current: 0.6 @@ -186,12 +201,13 @@ hold_current: 0.6 # z:ar76 not in pin map, using actual pin number uart_pin: z:PJ5 microsteps: 16 +interpolate: False run_current: 0.8 hold_current: 0.6 -# used to force a single stepper to move. not used once setup -[force_move] -enable_force_move: true +# # used to force a single stepper to move. not used once setup +# [force_move] +# enable_force_move: true # Probe [probe] @@ -199,45 +215,56 @@ enable_force_move: true pin: ^!z:ar2 x_offset: 0.0 # offset for inductive probe y direction off nozzle -y_offset: 25.0 +y_offset: 30.0 # offset for inductive probe in z height z_offset: 0.00 -speed: 2 +speed: 10 +samples: 1 +sample_retract_dist: 2.0 # this is required for gantry leveling and replaces your G28 command # with the gcode used here. Used to home X/Y/Z with mechanical switches [homing_override] set_position_z: 0 gcode: + BED_MESH_CLEAR G90 G0 Z15 F600 G28 X Y # For the FSR Switch - G0 X227 Y-11 F3000 + G0 X225 Y350 F5000 G28 Z - G0 Z10 F3000 - # Clean nozzle then rezero z + G0 Z13 F2000 + # level gantry + quad_gantry_level + # Clean nozzle then rezero z nozzle_clean - G0 X227 Y-11 F3000 + G0 X225 Y350 F5000 G28 Z - G0 Z10 F3000 + G0 Z13 F2000 #G0 X175 Y170 Z10 F3000 # gantry_level is to put a moving gantry into plan with # a fixed bed. Must have 4 steppers on the gantry [quad_gantry_level] gantry_corners: - -46,-12 - 416,396 + -59,0 + 409,421 points: - 80,60 - 80,250 - 270,250 - 270,60 -speed: 100 -horizontal_move_z: 10 -samples: 1 -sample_retract_dist: 2.0 + 30,0 + 30,280 + 320,280 + 320,0 +# points: + # 100,80 + # 100,230 + # 250,230 + # 250,80 +speed: 300 +horizontal_move_z: 8 +retries: 5 +retry_tolerance: 0.01 +max_adjust: 8 [extruder] # connected to E0 on mcu_xye @@ -249,11 +276,13 @@ step_distance: 0.001803 nozzle_diameter: 0.400 # PA can be disabled by declaring a 0.0 value -pressure_advance: 0.15 +pressure_advance: 0.0 +#pressure_advance: 0.15 # time seconds to look ahead for PA moves default is 0.010 or 10ms pressure_advance_lookahead_time: 0.030 filament_diameter: 1.750 -max_extrude_only_distance: 800.0 +max_extrude_only_distance: 1000.0 +max_extrude_cross_section: 1000.0 # connected to E0 OUT on mcu_xye heater_pin: ar5 @@ -265,14 +294,33 @@ sensor_pin: analog12 smooth_time: 3.0 max_power: 1.0 # PID for 230C -control: pid -pid_Kp: 20.097 -pid_Ki: 0.950 -pid_Kd: 106.265 +#control: pid +#pid_Kp: 28.263 +#pid_Ki: 1.942 +#pid_Kd: 102.808 min_extrude_temp: 0 min_temp: 0 max_temp: 300 +[extruder1] +# connected to E1 on mcu_xye +step_pin: ar36 +dir_pin: ar34 +enable_pin: !ar30 +# 1.8deg - 555 steps per mm - 1/16 microstepping - M2 +step_distance: 0.001803 +nozzle_diameter: 0.400 + +# PA can be disabled by declaring a 0.0 value +pressure_advance: 0.0 +#pressure_advance: 0.15 +# time seconds to look ahead for PA moves default is 0.010 or 10ms +pressure_advance_lookahead_time: 0.030 +filament_diameter: 1.750 +max_extrude_only_distance: 1000.0 +max_extrude_cross_section: 1000.0 +shared_heater: extruder + # thermally controlled hotend fan [heater_fan my_nozzle_fan] # connected to FAN0 on mcu_z @@ -283,39 +331,27 @@ heater: extruder heater_temp: 50.0 fan_speed: 1 -# # thermally controlled electronics bay cooling fans -# [heater_fan cpu_fan] -# # connected to FAN2 on mcu_xye -# pin: ar46 -# max_power: 1.0 -# kick_start_time: 0.500 -# heater: extruder -# heater_temp: 50.0 -# fan_speed: 1 - -# manually controlled electronics bay cooling fans -[output_pin cpu_fan] +# thermally controlled electronics bay cooling fans +[heater_fan cpu_fan] # connected to FAN2 on mcu_xye pin: ar46 -pwm: True -value: 1 -shutdown_value: 0 +max_power: 1.0 +kick_start_time: 0.500 +heater: extruder +heater_temp: 50.0 +fan_speed: 1 -# manually controlled stepstick cooling fans -[output_pin z_driver_fan] -# connected to FAN1 on mcu_z -pin: z:ar45 -pwm: True -value: 1 -shutdown_value: 0 +# stepstick cooling fans +[multi_pin driver_fans] +# connected to FAN1 on each mcu +pins: z:ar45, ar45 -# manually controlled stepstick cooling fans -[output_pin xye_driver_fan] -# connected to FAN1 on mcu_exy -pin: ar45 -pwm: True -value: 1 -shutdown_value: 0 +[controller_fan CPU_Fans] +pin: multi_pin:driver_fans +max_power: .5 +heater: extruder, heater_bed +cycle_time: 0.010 +hardware_pwm: True # manually controlled chamber exhaust (SET_PIN PIN=chamber_fan VALUE=1) [output_pin chamber_fan] @@ -324,6 +360,18 @@ pin: z:ar46 pwm: True value: 0 shutdown_value: 0 +cycle_time: 0.010 +hardware_pwm: True + +# manually controlled hotend light (SET_PIN PIN=hotend_light VALUE=1) +[output_pin HOTEND_LIGHT] +# connected to HEATER1 on mcu_xye +pin: ar6 +pwm: True +value: 0.5 +shutdown_value: 0 +cycle_time: 0.010 +hardware_pwm: True # bed heater configuration [heater_bed] @@ -349,7 +397,8 @@ max_temp: 120 # connected to FAN0 on mcu_xye pin: ar44 max_power: 1.0 -kick_start_time: 0.500 +kick_start_time: 1.00 +hardware_pwm: true [printer] # settings below are the max and can't be commanded over in gcode @@ -369,6 +418,19 @@ square_corner_velocity: 10.0 # cornering velocity. If this is set to zero then the toolhead will # decelerate to zero at each corner. The default is 5mm/s. +[bed_mesh] +speed: 100 +horizontal_move_z: 10 +min_point: 25,0 +max_point: 325,295 +probe_count: 7,7 +fade_end: 10 +split_delta_z: .01 +move_check_distance: 3 +mesh_pps: 2,2 +algorithm: lagrange +relative_reference_index: 24 + [idle_timeout] # high motor off time so I don't have to relevel gantry often timeout: 600000 @@ -380,9 +442,7 @@ timeout: 600000 [gcode_macro g32] gcode: G28 - quad_gantry_level - quad_gantry_level - quad_gantry_level + #quad_gantry_level # macro to level the gantry. use G32 in the terminal to call @@ -400,43 +460,31 @@ gcode: # change for your starting scripting needs [gcode_macro print_start] gcode: - #G21 ; set units to mm - #G90 ; use absolute coordinates - #T0 ; select tool 0 - #G92 E0.0 ; reset e count - #M220 S100 ; reset speed multiplier - - #M140 S[first_layer_bed_temperature] ; set bed temperature and do not wait - #M109 S190 ; set print head temperature and wait - #M190 S[first_layer_bed_temperature] ; set bed temperature and wait - - G28 ; home printer - quad_gantry_level ; final level check - #G28 ; home printer - G28 Z ; rehome just z after gantry level - G0 Z10 F3000 - G0 X175 Y170 F3000 + G28 ; home printer + G91 + G1 E15.00 F1000 + G90 + G0 X175 Y170 Z10 F3000 # Use print_end for you slicer ending script [gcode_macro print_end] gcode: G91 ;relative positioning - G1 E-5.00 F1000 ;retract 5mm of filament + G1 E-15.00 F1000 ;retract 5mm of filament G1 Z+1.00 X-20.0 Y-20.0 F20000 ;short quick move to disengage from print G1 Z+10.00 F20000 ;move Z-Axis 10mm away from part - G90 ;absolute positioning - G1 X350 Y339 ; move to back corner - - #G91 ; relative positioning - #G1 E-8.00 F500 ;retract additional filament to prevent oozing - #G90 ;absolute positioning - - M104 S0 ;turn off hotend - M140 S0 ;turn off heatbed - M106 S0 ; shut off blower + G90 ;absolute positioning + G1 X350 Y339 ; move to back corner + M104 S0 T0 ;turn off hotend + M104 S0 T1 ;turn off hotend + M104 S0 ;turn off hotend + M140 S0 ;turn off heatbed + M106 S0 ; shut off blower + T0 + # Set Temps for ABS Warmup [gcode_macro abs_warmup_temp] gcode: @@ -452,33 +500,66 @@ gcode: [gcode_macro nozzle_clean] gcode: G1 Z10 F3000 ;lift nozzle 25mm - G1 X80 Y-4 F7500 ;move to nozzle brush - G1 Z5 F3000 ;move nozzle into brush - G1 X120 Y-11 F6000 ;scrub - G1 X80 Y-4 F6000 ;scrub - G1 Y-11 F6000 ;move - G1 X120 Y-4 F6000 ;scrub - G1 X80 Y-11 F6000 ;scrub - G1 Y-4 F6000 ;move - G1 X120 Y-11 F6000 ;scrub - G1 X80 Y-4 F6000 ;scrub - G1 Y-11 F6000 ;move - G1 X120 Y-4 F6000 ;scrub - G1 X80 Y-11 F6000 ;scrub - G1 Y-4 F6000 ;move - G1 Z10 F3000 ;lift z 10mm + G1 X70 Y350 F9000 ;move to nozzle brush + G1 Z1 F3000 ;move nozzle into brush + G1 X135 F9000 ;scrub + G1 X70 F9000 ;scrub + G1 X135 F9000 ;scrub + G1 X70 F9000 ;scrub + G1 X135 F9000 ;scrub + G1 X70 F9000 ;scrub + G1 X135 F9000 ;scrub + G1 Z10 F3000 ;lift z 10mm #G1 X175 Y170 F9000 ;move nozzle to center - + +# Tool 0 Filament Load - Only runs when hot +[gcode_macro load_primary] +gcode: + {% if printer.extruder0.temperature > 185 %} + G91 + G1 E825 F10000 + G1 E15 F150 + G90 + {% endif %} + +# Tool 0 Filament Unload - Only runs when hot +[gcode_macro unload_primary] +gcode: + {% if printer.extruder0.temperature > 185 %} + G91 + G1 E10 F300 + G1 E-835 F10000 + G90 + {% endif %} + +# Tool 1 Filament Load - Loads to pre tool change position (-100mm) +[gcode_macro load_secondary] +gcode: + T1 + G91 + G1 E725 F10000 + G90 + T0 + +# Tool 1 Filament Unload +[gcode_macro unload_secondary] +gcode: + T1 + G91 + G1 E-725 F10000 + G90 + T0 + # Macro to Babystep Up 0.02mm [gcode_macro babystep_up] gcode: - SET_GCODE_OFFSET Z_ADJUST=0.02 - + SET_GCODE_OFFSET Z_ADJUST=0.02 move=1 + # Macro to Babystep Down 0.02mm [gcode_macro babystep_down] gcode: - SET_GCODE_OFFSET Z_ADJUST=-0.02 - + SET_GCODE_OFFSET Z_ADJUST=-0.02 move=1 + # BED_MESH_CALIBRATE: Perform Mesh Bed Leveling # BED_MESH_CLEAR: Clear the Mesh so no z-adjusment is made # BED_MESH_MAP: Probe the bed and serialize output @@ -503,3 +584,9 @@ gcode: # STEPPER_BUZZ: Oscillate a given stepper to help id it # UNLOAD_FILAMENT: G-Code macro # Z_TILT_ADJUST: Adjust the Z tilt + +#*# [extruder] +#*# control = pid +#*# pid_kp = 23.580 +#*# pid_ki = 1.131 +#*# pid_kd = 122.910 diff --git a/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.PNG b/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.PNG new file mode 100644 index 000000000..bbed4f2bb Binary files /dev/null and b/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.PNG differ diff --git a/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.stl b/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.stl new file mode 100644 index 000000000..b91fcfe2c Binary files /dev/null and b/printer_mods/Danowar/V2.2_Wrench/2.2_Wrench.stl differ diff --git a/printer_mods/Danowar/V2.2_Wrench/readme.md b/printer_mods/Danowar/V2.2_Wrench/readme.md new file mode 100644 index 000000000..ee2373b79 --- /dev/null +++ b/printer_mods/Danowar/V2.2_Wrench/readme.md @@ -0,0 +1,8 @@ +# Wrench for 2.2 Knobs and Panel Clips + +### Overview +![Image](./2.2_Wrench.PNG) + +Two sided wrench for tightening knobs on the Voron 2.2 Z Drive and A/B Drives. +Purpose of this wrench is to assist with gripping the knobs, NOT for over-torquing +them. Please follow guidelines in manual for proper tightness. diff --git a/printer_mods/README.md b/printer_mods/README.md index 9cb6972fe..30175355a 100644 --- a/printer_mods/README.md +++ b/printer_mods/README.md @@ -34,6 +34,7 @@ If your mod is lacking a column in the compatibility matrix, feel free to submit | | [Load Cell Spool Holder](./Danowar/Load_Cell_Spool_Holder)| Spool holder with built in weight scale|:x: |:heavy_check_mark: |:heavy_check_mark: | | | [TL 2-to-1 Mosquito Toolhead Adapter](./Danowar/TL_2-to-1_Mosquito_Toolhead_Adapter)| Mounts the Triangle Labs 2-to-1 adapter directly to the mosquito toolhead|:heavy_check_mark: |:heavy_check_mark: |:heavy_check_mark: | | | [Tablet mount](./Danowar/Tablet_Mount)|Detachable mount for tablet using magnets |:heavy_check_mark: |:heavy_check_mark: | :heavy_check_mark: | +| | [V2.2 Wrench](./Danowar/V2.2_Wrench)|3 sided wrench for 2.2 bearing caps and panel clips |:x: |:x: | :heavy_check_mark: | | daveidmx| [30mm Fan Adapter](./daveidmx/VORON2)|30mm Fan Adapter | :grey_question:| :grey_question:|:grey_question: | |Dunar |[Panel Rest](./Dunar/Panel_Rest) | External panel holder | :heavy_check_mark: |:heavy_check_mark: |:heavy_check_mark: | |etherwalker |[Pi Zero Camera Mount](./etherwalker/Pi_Zero_Camera_Mount) | Pi Zero Camera Mount| :grey_question:| :grey_question:|:grey_question: |