Skip to content

Commit

Permalink
prep
Browse files Browse the repository at this point in the history
  • Loading branch information
aldenhart committed Jun 1, 2015
1 parent 46bb5d9 commit 2429586
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 20 deletions.
21 changes: 3 additions & 18 deletions firmware/tinyg/cycle_homing.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,6 @@ static stat_t _homing_abort(int8_t axis);
static stat_t _homing_error_exit(int8_t axis, stat_t status);
static stat_t _homing_finalize_exit(int8_t axis);
static int8_t _get_next_axis(int8_t axis);
/*
static void _homing_debug_print(int8_t axis)
{
printf("axis:%d\n",axis);
printf("homing switch:%d\n", read_switch(hm.homing_switch));
printf("limit switch:%d\n", read_switch(hm.limit_switch));
printf("distance_mode:%d\n", cm_get_distance_mode(ACTIVE_MODEL));
printf("latch_backoff:%f\n", (double)hm.latch_backoff);
printf("search_travel:%f\n", (double)hm.search_travel);
printf("saved_units_mode:%d\n",hm.saved_units_mode);
printf("saved_coord_system:%d\n",hm.saved_coord_system);
printf("saved_distance_mode:%d\n",hm.saved_distance_mode);
printf("saved_feed_rate:%f\n",(double)hm.saved_feed_rate);
printf("saved_jerk:%f\n",(double)hm.saved_jerk);
}
*/

/***********************************************************************************
**** G28.2 Homing Cycle ***********************************************************
Expand Down Expand Up @@ -228,6 +211,8 @@ static stat_t _set_homing_func(stat_t (*func)(int8_t axis))
return (STAT_EAGAIN);
}

/* UNUSED
static void _trigger_feedhold(switch_t *s)
{
cm_request_feedhold();
Expand All @@ -243,7 +228,7 @@ static void _restore_switch_settings(switch_t *s)
{
s->on_trailing = hm.switch_saved_on_trailing;
}

*/
static stat_t _homing_axis_start(int8_t axis)
{
// get the first or next axis
Expand Down
5 changes: 3 additions & 2 deletions firmware/tinyg/plan_arc.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static stat_t _compute_arc(void);
static stat_t _compute_arc_offsets_from_radius(void);
static void _estimate_arc_time(void);
static float _get_theta(const float x, const float y);
static stat_t _test_arc_soft_limits(void);
//static stat_t _test_arc_soft_limits(void);

/*****************************************************************************
* Canonical Machining arc functions (arc prep for planning and runtime)
Expand Down Expand Up @@ -533,7 +533,7 @@ static float _get_theta(const float x, const float y)
* - arc angular travel in radians (arc.angular_travel)
* - max and min travel in axis 0 and axis 1 (in cm struct)
*/

/* UNUSED
static stat_t _test_arc_soft_limit_plane_axis(float center, uint8_t plane_axis)
{
if (center <= arc.position[plane_axis]) {
Expand Down Expand Up @@ -565,3 +565,4 @@ static stat_t _test_arc_soft_limits()
return(STAT_OK);
}
*/

0 comments on commit 2429586

Please sign in to comment.