Merge pull request Smoothieware#1266 from wolfmanjm/upstreamedge

some convenience features
milo1988 · Feb 8, 2018 · d5f5df7 · d5f5df7
2 parents 45d39d3 + 954a6ef
commit d5f5df7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/ConfigSamples/Snippets/six-axis.config b/ConfigSamples/Snippets/six-axis.config
@@ -0,0 +1,26 @@
+# A axis
+delta_steps_per_mm                    100     # may be steps per degree for example
+delta_step_pin                        2.3     # Pin for delta stepper step signal
+delta_dir_pin                         0.22    # Pin for delta stepper direction
+delta_en_pin                          0.21    # Pin for delta enable
+delta_current                         1.5     # Z stepper motor current
+delta_max_rate                        300.0   # mm/min
+delta_acceleration                    500.0   # mm/sec²
+
+# B axis
+epsilon_steps_per_mm                  100     # may be steps per degree for example
+epsilon_step_pin                      2.8     # Pin for delta stepper step signal
+epsilon_dir_pin                       2.13    # Pin for delta stepper direction
+epsilon_en_pin                        4.29    # Pin for delta enable
+epsilon_current                       1.5     # Z stepper motor current
+epsilon_max_rate                      300.0   # mm/min
+epsilon_acceleration                  500.0   # mm/sec²
+
+# C axis
+zeta_steps_per_mm                     100     # may be steps per degree for example
+zeta_step_pin                         xx      # Pin for delta stepper step signal
+zeta_dir_pin                          xx      # Pin for delta stepper direction
+zeta_en_pin                           xx      # Pin for delta enable
+zeta_current                          1.5     # Z stepper motor current
+zeta_max_rate                         300.0   # mm/min
+zeta_acceleration                     500.0   # mm/sec²
diff --git a/src/modules/tools/endstops/Endstops.cpp b/src/modules/tools/endstops/Endstops.cpp
@@ -821,7 +821,7 @@ void Endstops::process_home_command(Gcode* gcode)
     // check if on_halt (eg kill or fail)
     if(THEKERNEL->is_halted()) {
         if(!THEKERNEL->is_grbl_mode()) {
-            THEKERNEL->streams->printf("ERROR: Homing cycle failed\n");
+            THEKERNEL->streams->printf("ERROR: Homing cycle failed - check the max_travel settings\n");
         }else{
             THEKERNEL->streams->printf("ALARM: Homing fail\n");
         }

diff --git a/src/modules/tools/zprobe/DeltaGridStrategy.cpp b/src/modules/tools/zprobe/DeltaGridStrategy.cpp
@@ -323,7 +323,7 @@ bool DeltaGridStrategy::handleGcode(Gcode *gcode)
             if(!doProbe(gcode)) {
                 gcode->stream->printf("Probe failed to complete, check the initial probe height and/or initial_height settings\n");
             } else {
-                gcode->stream->printf("Probe completed\n");
+                gcode->stream->printf("Probe completed - Enter M374 to save this grid\n");
             }
             return true;
         }