diff --git a/Firmware/DuetWifi/V2.1/daveidmx/README.txt b/Firmware/Duet/V2.1/daveidmx/README.txt similarity index 94% rename from Firmware/DuetWifi/V2.1/daveidmx/README.txt rename to Firmware/Duet/V2.1/daveidmx/README.txt index 54faa8ac..72ded5d0 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/README.txt +++ b/Firmware/Duet/V2.1/daveidmx/README.txt @@ -55,3 +55,6 @@ Changes: * Added a heatbreak thermistor setting. * Add calibrate_mswitch.g script to help calibrate the mechanical Z offset. * Add coarse_level.g script to level the gantry for when the default dive height is too small. + +* Changing Z endstop configuration for FSR. +* No longer turning off heaters during Z probing. It turns out it's both unnecessary and actually detrimental due to the temperature delta. diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/ABS/load.g b/Firmware/Duet/V2.1/daveidmx/filaments/ABS/load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/ABS/load.g rename to Firmware/Duet/V2.1/daveidmx/filaments/ABS/load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/ABS/unload.g b/Firmware/Duet/V2.1/daveidmx/filaments/ABS/unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/ABS/unload.g rename to Firmware/Duet/V2.1/daveidmx/filaments/ABS/unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/PETG/load.g b/Firmware/Duet/V2.1/daveidmx/filaments/PETG/load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/PETG/load.g rename to Firmware/Duet/V2.1/daveidmx/filaments/PETG/load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/PETG/unload.g b/Firmware/Duet/V2.1/daveidmx/filaments/PETG/unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/PETG/unload.g rename to Firmware/Duet/V2.1/daveidmx/filaments/PETG/unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/PLA/load.g b/Firmware/Duet/V2.1/daveidmx/filaments/PLA/load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/PLA/load.g rename to Firmware/Duet/V2.1/daveidmx/filaments/PLA/load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/filaments/PLA/unload.g b/Firmware/Duet/V2.1/daveidmx/filaments/PLA/unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/filaments/PLA/unload.g rename to Firmware/Duet/V2.1/daveidmx/filaments/PLA/unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/e_fullcurrent.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/e_fullcurrent.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/e_fullcurrent.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/e_fullcurrent.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/e_off.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/e_off.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/e_off.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/e_off.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_downcurrent.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/xy_downcurrent.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_downcurrent.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/xy_downcurrent.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_fullcurrent.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/xy_fullcurrent.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_fullcurrent.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/xy_fullcurrent.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_off.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/xy_off.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_off.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/xy_off.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_torture.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/xy_torture.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/xy_torture.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/xy_torture.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_downcurrent.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/z_downcurrent.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_downcurrent.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/z_downcurrent.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_fullcurrent.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/z_fullcurrent.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_fullcurrent.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/z_fullcurrent.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_off.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/z_off.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_off.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/z_off.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_torture.g b/Firmware/Duet/V2.1/daveidmx/macros/drive/z_torture.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/drive/z_torture.g rename to Firmware/Duet/V2.1/daveidmx/macros/drive/z_torture.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/abs_load.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/abs_load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/abs_load.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/abs_load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/abs_unload.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/abs_unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/abs_unload.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/abs_unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/do_moves_for_load.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/do_moves_for_load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/do_moves_for_load.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/do_moves_for_load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/do_moves_for_unload.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/do_moves_for_unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/do_moves_for_unload.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/do_moves_for_unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/petg_load.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/petg_load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/petg_load.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/petg_load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/petg_unload.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/petg_unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/petg_unload.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/petg_unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/pla_load.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/pla_load.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/pla_load.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/pla_load.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/filament/pla_unload.g b/Firmware/Duet/V2.1/daveidmx/macros/filament/pla_unload.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/filament/pla_unload.g rename to Firmware/Duet/V2.1/daveidmx/macros/filament/pla_unload.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_ABS.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_ABS.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_ABS.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_ABS.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_PETG.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_PETG.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_PETG.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_PETG.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_PLA.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_PLA.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/preheat_PLA.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/preheat_PLA.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_V6_alu_30W.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_V6_alu_30W.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_V6_alu_30W.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_V6_alu_30W.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_V6_copper_36W.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_V6_copper_36W.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_V6_copper_36W.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_V6_copper_36W.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_Volcano_alu_36W.g b/Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_Volcano_alu_36W.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/heating/toolhead_Volcano_alu_36W.g rename to Firmware/Duet/V2.1/daveidmx/macros/heating/toolhead_Volcano_alu_36W.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/homezi.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/homezi.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/homezi.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/homezi.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/homezm.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/homezm.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/homezm.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/homezm.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_x.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_x.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_x.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_x.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_y.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_y.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_y.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_y.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zi.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zi.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zi.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zi.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zlevel.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zlevel.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zlevel.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zlevel.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zm.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zm.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/probe_zm.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/probe_zm.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/zhop_down.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/zhop_down.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/zhop_down.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/zhop_down.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/zhop_up.g b/Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/zhop_up.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/homing/scripts/zhop_up.g rename to Firmware/Duet/V2.1/daveidmx/macros/homing/scripts/zhop_up.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/leveling/bed_mesh_scan.g b/Firmware/Duet/V2.1/daveidmx/macros/leveling/bed_mesh_scan.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/leveling/bed_mesh_scan.g rename to Firmware/Duet/V2.1/daveidmx/macros/leveling/bed_mesh_scan.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/leveling/coarse_level.g b/Firmware/Duet/V2.1/daveidmx/macros/leveling/coarse_level.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/leveling/coarse_level.g rename to Firmware/Duet/V2.1/daveidmx/macros/leveling/coarse_level.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/center_xyz.g b/Firmware/Duet/V2.1/daveidmx/macros/moveto/center_xyz.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/center_xyz.g rename to Firmware/Duet/V2.1/daveidmx/macros/moveto/center_xyz.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/iswitch_safexy.g b/Firmware/Duet/V2.1/daveidmx/macros/moveto/iswitch_safexy.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/iswitch_safexy.g rename to Firmware/Duet/V2.1/daveidmx/macros/moveto/iswitch_safexy.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/mswitch_xy.g b/Firmware/Duet/V2.1/daveidmx/macros/moveto/mswitch_xy.g similarity index 68% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/mswitch_xy.g rename to Firmware/Duet/V2.1/daveidmx/macros/moveto/mswitch_xy.g index 5d574c7f..504027fd 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/mswitch_xy.g +++ b/Firmware/Duet/V2.1/daveidmx/macros/moveto/mswitch_xy.g @@ -2,4 +2,4 @@ ;; *ADJUST* these coordinates for your mechanical switch position G90 ; absolute positioning -G1 X128 Y106 F99999 ; move to directly above mechanical Z-switch +G1 X55 Y129 F99999 ; move to directly above mechanical Z-switch diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/park_xy.g b/Firmware/Duet/V2.1/daveidmx/macros/moveto/park_xy.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/moveto/park_xy.g rename to Firmware/Duet/V2.1/daveidmx/macros/moveto/park_xy.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/pa_nozhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/pa_nozhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/pa_nozhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/pa_nozhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/pa_zhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/pa_zhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/pa_zhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/pa_zhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/quiet_nozhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/quiet_nozhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/quiet_nozhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/quiet_nozhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/quiet_zhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/quiet_zhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/V6/quiet_zhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/V6/quiet_zhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/pa_nozhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/pa_nozhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/pa_nozhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/pa_nozhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/pa_zhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/pa_zhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/pa_zhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/pa_zhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/quiet_nozhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/quiet_nozhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/quiet_nozhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/quiet_nozhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/quiet_zhop.g b/Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/quiet_zhop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/retraction/Volcano/quiet_zhop.g rename to Firmware/Duet/V2.1/daveidmx/macros/retraction/Volcano/quiet_zhop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/11_belting_z_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/11_belting_z_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/11_belting_z_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/11_belting_z_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/11_belting_z_100.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/11_belting_z_100.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/11_belting_z_100.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/11_belting_z_100.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_100.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_100.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/12_belting_xy_100.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/12_belting_xy_100.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_movecycle_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_C.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_C.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_C.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_C.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LF.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LF.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LF.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LF.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LR.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LR.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LR.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_LR.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RF.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RF.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RF.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RF.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RR.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RR.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RR.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/xy_point_RR.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/belting/scripts/z_movecycle_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/01_physics_z_100.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/01_physics_z_100.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/01_physics_z_100.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/01_physics_z_100.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/01_physics_z_1000.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/01_physics_z_1000.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/01_physics_z_1000.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/01_physics_z_1000.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_100.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_100.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/02_physics_xy_100.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/02_physics_xy_100.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_epilogue.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_epilogue.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_epilogue.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_epilogue.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_movecycle_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_prologue.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_prologue.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/xy_prologue.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/xy_prologue.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_epilogue.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_epilogue.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_epilogue.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_epilogue.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_1.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_1.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_1.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_10.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_10.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_10.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_10.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_100.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_100.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_100.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_movecycle_100.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_prologue.g b/Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_prologue.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/testing/physics/scripts/z_prologue.g rename to Firmware/Duet/V2.1/daveidmx/macros/testing/physics/scripts/z_prologue.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/calibrate_mswitch.g b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/calibrate_mswitch.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/calibrate_mswitch.g rename to Firmware/Duet/V2.1/daveidmx/macros/zprobe/calibrate_mswitch.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_ifast.g b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_ifast.g similarity index 96% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_ifast.g rename to Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_ifast.g index 6f0eb379..7fc6eade 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_ifast.g +++ b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_ifast.g @@ -19,5 +19,5 @@ ;; *ADJUST* this file for: ;; Your inductive probe pins ("M558 P*") -M558 P5 I1 H10 R0.1 F1800 T99999 A1 B1 +M558 P5 I1 H10 R0.1 F1800 T99999 A1 B0 G31 P1000 X0 Y25 Z0 diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_islow.g b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_islow.g similarity index 95% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_islow.g rename to Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_islow.g index 2ef2b558..fd6ceedd 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_islow.g +++ b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_islow.g @@ -19,5 +19,5 @@ ;; *ADJUST* this file for: ;; Your inductive probe pins ("M558 P*") -M558 P5 I1 H5 R0.1 F120 T99999 A5 S0.01 B1 +M558 P5 I1 H5 R0.1 F120 T99999 A5 S0.01 B0 G31 P1000 X0 Y25 Z0 diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mfast.g b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mfast.g similarity index 91% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mfast.g rename to Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mfast.g index cd8065ee..6595ae15 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mfast.g +++ b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mfast.g @@ -8,5 +8,5 @@ ;; *ADJUST* this file for: ;; Your mechanical switch pins ("M558 P*") -M558 P7 I0 H5 R0.1 F1800 T99999 A1 B1 +M558 P7 I1 H5 R0.1 F600 T99999 A1 B0 G31 P1000 X0 Y0 Z0 diff --git a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mslow.g b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mslow.g similarity index 89% rename from Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mslow.g rename to Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mslow.g index 99e61ff7..a0b0f7bd 100644 --- a/Firmware/DuetWifi/V2.1/daveidmx/macros/zprobe/use_mslow.g +++ b/Firmware/Duet/V2.1/daveidmx/macros/zprobe/use_mslow.g @@ -8,5 +8,5 @@ ;; ;; !!! This is the only place to edit overall Z-height !!! -M558 P7 I0 H5 R0.1 F120 T99999 A5 S0.01 B1 +M558 P7 I1 H5 R0.1 F120 T99999 A5 S0.01 B0 G31 P1000 X0 Y0 Z2.00 diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/bed.g b/Firmware/Duet/V2.1/daveidmx/sys/bed.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/bed.g rename to Firmware/Duet/V2.1/daveidmx/sys/bed.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/cancel.g b/Firmware/Duet/V2.1/daveidmx/sys/cancel.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/cancel.g rename to Firmware/Duet/V2.1/daveidmx/sys/cancel.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/config.g b/Firmware/Duet/V2.1/daveidmx/sys/config.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/config.g rename to Firmware/Duet/V2.1/daveidmx/sys/config.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/deployprobe.g b/Firmware/Duet/V2.1/daveidmx/sys/deployprobe.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/deployprobe.g rename to Firmware/Duet/V2.1/daveidmx/sys/deployprobe.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/homeall.g b/Firmware/Duet/V2.1/daveidmx/sys/homeall.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/homeall.g rename to Firmware/Duet/V2.1/daveidmx/sys/homeall.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/homex.g b/Firmware/Duet/V2.1/daveidmx/sys/homex.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/homex.g rename to Firmware/Duet/V2.1/daveidmx/sys/homex.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/homey.g b/Firmware/Duet/V2.1/daveidmx/sys/homey.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/homey.g rename to Firmware/Duet/V2.1/daveidmx/sys/homey.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/homez.g b/Firmware/Duet/V2.1/daveidmx/sys/homez.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/homez.g rename to Firmware/Duet/V2.1/daveidmx/sys/homez.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/pause.g b/Firmware/Duet/V2.1/daveidmx/sys/pause.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/pause.g rename to Firmware/Duet/V2.1/daveidmx/sys/pause.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/print_end.g b/Firmware/Duet/V2.1/daveidmx/sys/print_end.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/print_end.g rename to Firmware/Duet/V2.1/daveidmx/sys/print_end.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/print_start.g b/Firmware/Duet/V2.1/daveidmx/sys/print_start.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/print_start.g rename to Firmware/Duet/V2.1/daveidmx/sys/print_start.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/restore_retraction.g b/Firmware/Duet/V2.1/daveidmx/sys/restore_retraction.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/restore_retraction.g rename to Firmware/Duet/V2.1/daveidmx/sys/restore_retraction.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/restore_tool_heater.g b/Firmware/Duet/V2.1/daveidmx/sys/restore_tool_heater.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/restore_tool_heater.g rename to Firmware/Duet/V2.1/daveidmx/sys/restore_tool_heater.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/resume.g b/Firmware/Duet/V2.1/daveidmx/sys/resume.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/resume.g rename to Firmware/Duet/V2.1/daveidmx/sys/resume.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/retractprobe.g b/Firmware/Duet/V2.1/daveidmx/sys/retractprobe.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/retractprobe.g rename to Firmware/Duet/V2.1/daveidmx/sys/retractprobe.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/sleep.g b/Firmware/Duet/V2.1/daveidmx/sys/sleep.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/sleep.g rename to Firmware/Duet/V2.1/daveidmx/sys/sleep.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/start.g b/Firmware/Duet/V2.1/daveidmx/sys/start.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/start.g rename to Firmware/Duet/V2.1/daveidmx/sys/start.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/stop.g b/Firmware/Duet/V2.1/daveidmx/sys/stop.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/stop.g rename to Firmware/Duet/V2.1/daveidmx/sys/stop.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/tpost0.g b/Firmware/Duet/V2.1/daveidmx/sys/tpost0.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/tpost0.g rename to Firmware/Duet/V2.1/daveidmx/sys/tpost0.g diff --git a/Firmware/DuetWifi/V2.1/daveidmx/sys/tpost1.g b/Firmware/Duet/V2.1/daveidmx/sys/tpost1.g similarity index 100% rename from Firmware/DuetWifi/V2.1/daveidmx/sys/tpost1.g rename to Firmware/Duet/V2.1/daveidmx/sys/tpost1.g