diff --git a/macros/config_backup.cfg b/macros/config_backup.cfg index 16cd455..4906f1e 100644 --- a/macros/config_backup.cfg +++ b/macros/config_backup.cfg @@ -1,9 +1,9 @@ - [gcode_shell_command backup_cfg] - command: ~/printer_data/config/autocommit.sh - timeout: 30 - verbose: True +[gcode_shell_command backup_cfg] +command: sh /home/biqu/printer_data/config/autocommit.sh +timeout: 30 +verbose: True - [gcode_macro BACKUP_CFG] - description: Backs up config directory GitHub - gcode: - RUN_SHELL_COMMAND CMD=backup_cfg +[gcode_macro BACKUP_CFG] +description: Backs up config directory GitHub +gcode: + RUN_SHELL_COMMAND CMD=backup_cfg diff --git a/macros/main.cfg b/macros/main.cfg index 39e2a14..691b232 100644 --- a/macros/main.cfg +++ b/macros/main.cfg @@ -526,22 +526,6 @@ gcode: # Restore previous gcode state (absolute/relative, etc) RESTORE_GCODE_STATE NAME=TEST_SPEED - -[gcode_macro test] -gcode: - {% set iterations = params.ITERATIONS|default(5)|int %} - ;G32 - SAVE_GCODE_STATE NAME=TEST - G1 Z10 - ;SET_VELOCITY_LIMIT ACCEL=8000 - SET_VELOCITY_LIMIT ACCEL=10000 SQUARE_CORNER_VELOCITY=12 - {% for i in range(iterations) %} - G1 F18000 - G1 X300 Y300 - G1 X150 Y50 - {% endfor %} - SET_VELOCITY_DEFAULT - RESTORE_GCODE_STATE NAME=TEST [gcode_macro _bot_data] diff --git a/moonraker-sql.db b/moonraker-sql.db index 54c3304..fbec75c 100644 Binary files a/moonraker-sql.db and b/moonraker-sql.db differ diff --git a/printer.cfg b/printer.cfg index 30a5594..60e4efd 100644 --- a/printer.cfg +++ b/printer.cfg @@ -129,7 +129,7 @@ pid_kd: 278.281 [probe] x_offset: 0 y_offset: 0 -#z_offset: -0.825 +z_offset: -0.890 lift_speed: 15 #10 speed: 3.0 #5 samples: 3 @@ -207,9 +207,6 @@ algorithm: bicubic #*# xz_skew = 0.0 #*# yz_skew = 0.0 #*# -#*# [probe] -#*# z_offset = -0.890 -#*# #*# [bed_mesh default] #*# version = 1 #*# points = @@ -226,3 +223,5 @@ algorithm: bicubic #*# max_x = 217.19799999999998 #*# min_y = 146.587 #*# max_y = 202.78699999999998 + +[include shell_command.cfg] diff --git a/shell_command.cfg b/shell_command.cfg new file mode 100644 index 0000000..34e7581 --- /dev/null +++ b/shell_command.cfg @@ -0,0 +1,7 @@ +[gcode_shell_command hello_world] +command: echo hello world +timeout: 2. +verbose: True +[gcode_macro HELLO_WORLD] +gcode: + RUN_SHELL_COMMAND CMD=hello_world \ No newline at end of file