File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -734,22 +734,30 @@ static void process_probe_inputs(void)
734734 continue ;
735735 }
736736
737- // abort any homing
738- if (get_homing (i )) {
739- do_cancel_homing (i );
740- aborted = 1 ;
737+ // inhibit_probe_home_error is set by [TRAJ]->NO_PROBE_HOME_ERROR in the ini file
738+ if (!emcmotConfig -> inhibit_probe_home_error ) {
739+ // abort any homing
740+ if (get_homing (i )) {
741+ do_cancel_homing (i );
742+ aborted = 1 ;
743+ }
741744 }
742745
743- // abort any joint jogs
744- if (joint -> free_tp .enable == 1 ) {
745- joint -> free_tp .enable = 0 ;
746- // since homing uses free_tp, this protection of aborted
747- // is needed so the user gets the correct error.
748- if (!aborted ) aborted = 2 ;
746+ // inhibit_probe_jog_error is set by [TRAJ]->NO_PROBE_JOG_ERROR in the ini file
747+ if (!emcmotConfig -> inhibit_probe_jog_error ) {
748+ // abort any joint jogs
749+ if (joint -> free_tp .enable == 1 ) {
750+ joint -> free_tp .enable = 0 ;
751+ // since homing uses free_tp, this protection of aborted
752+ // is needed so the user gets the correct error.
753+ if (!aborted ) aborted = 2 ;
754+ }
749755 }
750756 }
751- if (axis_jog_abort_all (1 )) {
752- aborted = 3 ;
757+ if (!emcmotConfig -> inhibit_probe_jog_error ) {
758+ if (axis_jog_abort_all (1 )) {
759+ aborted = 3 ;
760+ }
753761 }
754762
755763 if (aborted == 1 ) {
You can’t perform that action at this time.
0 commit comments