magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-29 19:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Blowhole updates

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-12-22 23:54:30 +01:00
parent 87f7205327
commit aacd740413
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 95 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/hardware/blowhole.nix
View file

@ -17,7 +17,7 @@ in {
"nvme" "nvme"
]; ];
zfs.enableUnstable = true; zfs.enableUnstable = true;
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages;
}; };
fileSystems = { fileSystems = {

185
nix/systems/blowhole.nix
View file

@ -350,6 +350,16 @@ inputs: {
user = "klipper"; user = "klipper";
group = "klipper"; group = "klipper";
package = pkgs.klipper.overrideAttrs (_:
{ src = pkgs.fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "v0.10.0";
sha256 = "sha256-rbRDwchiicI+U3IIkIfpuR2/xMzZkC5n2PP335iyUKM=";
};
versin = "0.10.0";
});
settings = settings =
let let
indentGcode = with lib; gcode: indentGcode = with lib; gcode:
@ -359,8 +369,8 @@ inputs: {
{ step_pin = "P2.2"; { step_pin = "P2.2";
dir_pin = "!P2.6"; dir_pin = "!P2.6";
enable_pin = "!P2.1"; enable_pin = "!P2.1";
step_distance = ".0125"; rotation_distance = "40";
# step_distance = ".025"; microsteps = "16";
endstop_pin = "P1.29"; # P1.28 for X-max endstop_pin = "P1.29"; # P1.28 for X-max
position_endstop = "0"; position_endstop = "0";
position_max = "235"; position_max = "235";
@ -371,8 +381,8 @@ inputs: {
{ step_pin = "P0.19"; { step_pin = "P0.19";
dir_pin = "!P0.20"; dir_pin = "!P0.20";
enable_pin = "!P2.8"; enable_pin = "!P2.8";
step_distance = ".0125"; rotation_distance = "40";
# step_distance: .025 microsteps = "16";
endstop_pin = "P1.27"; # P1.26 for Y-max endstop_pin = "P1.27"; # P1.26 for Y-max
position_endstop = "0"; position_endstop = "0";
position_max = "235"; position_max = "235";
@ -384,11 +394,11 @@ inputs: {
step_pin = "P0.22"; step_pin = "P0.22";
dir_pin = "P2.11"; dir_pin = "P2.11";
enable_pin = "!P0.21"; enable_pin = "!P0.21";
step_distance = ".0025"; rotation_distance = "8";
#step_distance: .005 microsteps = "16";
endstop_pin = "P1.25"; # P1.24 for Z-max" endstop_pin = "P1.25"; # P1.24 for Z-max"
position_min = "-0.6"; position_min = "-1.5";
position_endstop = "-0.525"; position_endstop = "-1.18";
position_max = "250"; position_max = "250";
}; };
@ -396,15 +406,14 @@ inputs: {
{ step_pin = "P2.13"; { step_pin = "P2.13";
dir_pin = "!P0.11"; dir_pin = "!P0.11";
enable_pin = "!P2.12"; enable_pin = "!P2.12";
#step_distance: .010526 rotation_distance = "21.646";
step_distance = ".006973475006276127"; microsteps = "16";
#step_distance: .013946950012552254
nozzle_diameter = "0.400"; nozzle_diameter = "0.400";
filament_diameter = "1.750"; filament_diameter = "1.750";
heater_pin = "P2.7"; heater_pin = "P2.7";
sensor_type = "EPCOS 100K B57560G104F"; sensor_type = "PT1000";
sensor_pin = "P0.24"; sensor_pin = "P0.24";
control = "pid"; control = "pid";
pid_Kp = "22.2"; pid_Kp = "22.2";
pid_Ki = "1.08"; pid_Ki = "1.08";
pid_Kd = "114"; pid_Kd = "114";
@ -462,7 +471,6 @@ inputs: {
"tmc2208 stepper_x" = "tmc2208 stepper_x" =
{ uart_pin = "P1.17"; { uart_pin = "P1.17";
microsteps = "16";
run_current = "0.475"; run_current = "0.475";
hold_current = "0.275"; hold_current = "0.275";
stealthchop_threshold = "250"; stealthchop_threshold = "250";
@ -470,7 +478,6 @@ inputs: {
"tmc2208 stepper_y" = "tmc2208 stepper_y" =
{ uart_pin = "P1.15"; { uart_pin = "P1.15";
microsteps = "16";
run_current = "0.475"; run_current = "0.475";
hold_current = "0.275"; hold_current = "0.275";
stealthchop_threshold = "250"; stealthchop_threshold = "250";
@ -478,7 +485,6 @@ inputs: {
"tmc2208 stepper_z" = "tmc2208 stepper_z" =
{ uart_pin = "P1.10"; { uart_pin = "P1.10";
microsteps = "16";
run_current = "0.475"; run_current = "0.475";
hold_current = "0.275"; hold_current = "0.275";
stealthchop_threshold = "30"; stealthchop_threshold = "30";
@ -486,7 +492,6 @@ inputs: {
"tmc2208 extruder" = "tmc2208 extruder" =
{ uart_pin = "P1.8"; { uart_pin = "P1.8";
microsteps = "16";
run_current = "0.560"; run_current = "0.560";
hold_current = "0.360"; hold_current = "0.360";
stealthchop_threshold = "5"; stealthchop_threshold = "5";
@ -527,104 +532,103 @@ inputs: {
# }; # };
"gcode_macro M600" = "gcode_macro M600" =
{ default_parameter_X = 50; { gcode = indentGcode
default_parameter_Y = 0;
default_parameter_Z = 10;
gcode = indentGcode
'' ''
SAVE_GCODE_STATE NAME=M600_state {% set x = params.X|default(50)|float %}
PAUSE {% set y = params.Y|default(0)|float %}
G91 {% set z = params.Z|default(10)|float %}
G1 E-.8 F2700 SAVE_GCODE_STATE NAME=M600_state
G1 Z{Z} PAUSE
G90 G91
G1 X{X} Y{Y} F3000 G1 E-.8 F2700
G91 G1 Z{z}
G1 E-50 F1000 G90
G1 X0.1 F3000 G1 X{x} Y{y} F3000
G1 E-50 F1000 G91
G1 X-0.1 F3000 G1 E-50 F1000
G1 E-50 F1000 G1 X0.1 F3000
G1 X0.1 F3000 G1 E-50 F1000
G1 E-50 F1000 G1 X-0.1 F3000
G1 X-0.1 F3000 G1 E-50 F1000
G1 E-50 F1000 G1 X0.1 F3000
G1 X0.1 F3000 G1 E-50 F1000
G1 E-50 F1000 G1 X-0.1 F3000
G1 X-0.1 F3000 G1 E-50 F1000
RESTORE_GCODE_STATE NAME=M600_state G1 X0.1 F3000
''; G1 E-50 F1000
G1 X-0.1 F3000
RESTORE_GCODE_STATE NAME=M600_state
'';
}; };
"gcode_macro CANCEL_PRINT" = { "gcode_macro CANCEL_PRINT" = {
rename_existing = "BASE_CANCEL_PRINT"; rename_existing = "BASE_CANCEL_PRINT";
gcode = indentGcode gcode = indentGcode
'' ''
TURN_OFF_HEATERS TURN_OFF_HEATERS
CLEAR_PAUSE CLEAR_PAUSE
SDCARD_RESET_FILE SDCARD_RESET_FILE
BASE_CANCEL_PRINT BASE_CANCEL_PRINT
''; '';
}; };
"gcode_macro PARK_WAIT" = "gcode_macro PARK_WAIT" =
{ # Park positions { gcode = indentGcode
default_parameter_X = "0";
default_parameter_Y = "230";
default_parameter_Z = "10";
default_parameter_E = "20";
# Wait time in milliseconds
default_parameter_MILLIS = "5";
gcode = indentGcode
'' ''
SAVE_GCODE_STATE NAME=PAUSE_state {% set x = params.X|default(0)|float %}
G91 {% set y = params.Y|default(230)|float %}
G1 E-{E} F2100 {% set z = params.Z|default(10)|float %}
G1 Z{Z} {% set e = params.Z|default(20)|float %}
G90 {% set millis = params.MILLIS|default(5)|float %}
G1 X{X} Y{Y} F6000
G4 P{MILLIS} SAVE_GCODE_STATE NAME=PAUSE_state
G91
G1 E-{e} F2100
G1 Z{z}
G90
G1 X{x} Y{y} F6000
G91 G4 P{millis}
G1 E{E} F2100
G90 G91
RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1 G1 E{e} F2100
''; G90
RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
'';
}; };
"gcode_macro PAUSE" = "gcode_macro PAUSE" =
{ rename_existing = "BASE_PAUSE"; { rename_existing = "BASE_PAUSE";
default_parameter_X = "0 #edit to your park position";
default_parameter_Y = "230 #edit to your park position";
default_parameter_Z = "10 #edit to your park position";
default_parameter_E = "20 #edit to your retract length";
gcode = indentGcode gcode = indentGcode
'' ''
SAVE_GCODE_STATE NAME=PAUSE_state {% set x = params.X|default(0)|float %}
BASE_PAUSE {% set y = params.Y|default(230)|float %}
G91 {% set z = params.Z|default(10)|float %}
G1 E-{E} F2100 {% set e = params.E|default(20)|float %}
G1 Z{Z}
G90 SAVE_GCODE_STATE NAME=PAUSE_state
G1 X{X} Y{Y} F6000 BASE_PAUSE
''; G91
G1 E-{e} F2100
G1 Z{z}
G90
G1 X{x} Y{y} F6000
'';
}; };
"gcode_macro RESUME" = "gcode_macro RESUME" =
{ rename_existing = "BASE_RESUME"; { rename_existing = "BASE_RESUME";
# Printer retract length;
default_parameter_E = "5";
gcode = indentGcode gcode = indentGcode
'' ''
G91 {% set e = params.Z|default(20)|float %}
G1 E{E} F2100
G90 G91
RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1 G1 E{e} F2100
BASE_RESUME G90
''; RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
BASE_RESUME
'';
}; };
"gcode_macro PRIME_LINE" = "gcode_macro PRIME_LINE" =
@ -648,8 +652,7 @@ inputs: {
# Use absolute coordinates # Use absolute coordinates
G90 G90
# Reset the G-Code Z offset (adjust Z offset if needed) # Reset the G-Code Z offset (adjust Z offset if needed)
# SET_GCODE_OFFSET Z=0.800 SET_GCODE_OFFSET Z=-0.30
# 0.230
# Home the printer # Home the printer
G28 G28
# Prime line # Prime line