// Get config
void Endstops::on_config_reload(void* argument){
- this->pins[0].from_string( this->kernel->config->value(alpha_min_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
- this->pins[1].from_string( this->kernel->config->value(beta_min_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
- this->pins[2].from_string( this->kernel->config->value(gamma_min_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
- this->pins[3].from_string( this->kernel->config->value(alpha_max_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
- this->pins[4].from_string( this->kernel->config->value(beta_max_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
- this->pins[5].from_string( this->kernel->config->value(gamma_max_endstop_checksum )->by_default("nc" )->as_string())->as_input()->pull_up();
+ this->pins[0].from_string( this->kernel->config->value(alpha_min_endstop_checksum )->by_default("nc" )->as_string())->as_input();
+ this->pins[1].from_string( this->kernel->config->value(beta_min_endstop_checksum )->by_default("nc" )->as_string())->as_input();
+ this->pins[2].from_string( this->kernel->config->value(gamma_min_endstop_checksum )->by_default("nc" )->as_string())->as_input();
+ this->pins[3].from_string( this->kernel->config->value(alpha_max_endstop_checksum )->by_default("nc" )->as_string())->as_input();
+ this->pins[4].from_string( this->kernel->config->value(beta_max_endstop_checksum )->by_default("nc" )->as_string())->as_input();
+ this->pins[5].from_string( this->kernel->config->value(gamma_max_endstop_checksum )->by_default("nc" )->as_string())->as_input();
this->fast_rates[0] = this->kernel->config->value(alpha_fast_homing_rate_checksum )->by_default(500 )->as_number();
this->fast_rates[1] = this->kernel->config->value(beta_fast_homing_rate_checksum )->by_default(500 )->as_number();
this->fast_rates[2] = this->kernel->config->value(gamma_fast_homing_rate_checksum )->by_default(5 )->as_number();
this->retract_steps[0] = this->kernel->config->value(alpha_homing_retract_checksum )->by_default(30 )->as_number();
this->retract_steps[1] = this->kernel->config->value(beta_homing_retract_checksum )->by_default(30 )->as_number();
this->retract_steps[2] = this->kernel->config->value(gamma_homing_retract_checksum )->by_default(10 )->as_number();
+ this->trim[0] = this->kernel->config->value(alpha_trim_checksum )->by_default(0 )->as_number();
+ this->trim[1] = this->kernel->config->value(beta_trim_checksum )->by_default(0 )->as_number();
+ this->trim[2] = this->kernel->config->value(gamma_trim_checksum )->by_default(0 )->as_number();
this->debounce_count = this->kernel->config->value(endstop_debounce_count_checksum )->by_default(100 )->as_number();
- this->direction[0] = this->kernel->config->value(alpha_homing_direction_checksum )->by_default(1 )->as_number();
- this->direction[1] = this->kernel->config->value(beta_homing_direction_checksum )->by_default(1 )->as_number();
- this->direction[2] = this->kernel->config->value(gamma_homing_direction_checksum )->by_default(1 )->as_number();
- for (int i=0; i<3; i++) direction[i] = direction[i] > 0;
- this->homing_position[0] = this->direction[0]?this->kernel->config->value(alpha_min_checksum)->by_default(0)->as_number():this->kernel->config->value(alpha_max_checksum)->by_default(200)->as_number();
- this->homing_position[1] = this->direction[1]?this->kernel->config->value(beta_min_checksum )->by_default(0)->as_number():this->kernel->config->value(beta_max_checksum )->by_default(200)->as_number();;
- this->homing_position[2] = this->direction[2]?this->kernel->config->value(gamma_min_checksum)->by_default(0)->as_number():this->kernel->config->value(gamma_max_checksum)->by_default(200)->as_number();;
+
+ // get homing direction and convert to boolean where true is home to min, and false is home to max
+ int home_dir = get_checksum(this->kernel->config->value(alpha_homing_direction_checksum)->by_default("home_to_min")->as_string());
+ this->home_direction[0] = home_dir != home_to_max_checksum;
+
+ home_dir = get_checksum(this->kernel->config->value(beta_homing_direction_checksum)->by_default("home_to_min")->as_string());
+ this->home_direction[1] = home_dir != home_to_max_checksum;
+
+ home_dir = get_checksum(this->kernel->config->value(gamma_homing_direction_checksum)->by_default("home_to_min")->as_string());
+ this->home_direction[2] = home_dir != home_to_max_checksum;
+
+ this->homing_position[0] = this->home_direction[0]?this->kernel->config->value(alpha_min_checksum)->by_default(0)->as_number():this->kernel->config->value(alpha_max_checksum)->by_default(200)->as_number();
+ this->homing_position[1] = this->home_direction[1]?this->kernel->config->value(beta_min_checksum )->by_default(0)->as_number():this->kernel->config->value(beta_max_checksum )->by_default(200)->as_number();;
+ this->homing_position[2] = this->home_direction[2]?this->kernel->config->value(gamma_min_checksum)->by_default(0)->as_number():this->kernel->config->value(gamma_max_checksum)->by_default(200)->as_number();;
}
//#pragma GCC pop_options
this->kernel->call_event(ON_IDLE);
for( char c = 'X'; c <= 'Z'; c++ ){
if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
- if( this->pins[c - 'X' + (this->direction[c - 'X']?0:3)].get() ){
+ if( this->pins[c - 'X' + (this->home_direction[c - 'X']?0:3)].get() ){
if( debounce[c - 'X'] < debounce_count ) {
debounce[c - 'X'] ++;
running = true;
{
if( gcode->g == 28 )
{
+ gcode->mark_as_taken();
// G28 is received, we have homing to do
// First wait for the queue to be empty
bool home_all= !( gcode->has_letter('X') || gcode->has_letter('Y') || gcode->has_letter('Z') );
for( char c = 'X'; c <= 'Z'; c++ ){
- if( (home_all || gcode->has_letter(c)) && this->pins[c - 'X' + (this->direction[c - 'X']?0:3)].connected() ){ axes_to_move += ( 1 << (c - 'X' ) ); }
+ if( (home_all || gcode->has_letter(c)) && this->pins[c - 'X' + (this->home_direction[c - 'X']?0:3)].connected() ){ axes_to_move += ( 1 << (c - 'X' ) ); }
}
// Enable the motors
if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
gcode->stream->printf("homing axis %c\r\n", c);
this->steppers[c - 'X']->set_speed(this->fast_rates[c - 'X']);
- this->steppers[c - 'X']->move(this->direction[c - 'X'],10000000);
+ this->steppers[c - 'X']->move(this->home_direction[c - 'X'],10000000);
}
}
int inverted_dir;
for( char c = 'X'; c <= 'Z'; c++ ){
if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
- inverted_dir = -(this->direction[c - 'X'] - 1);
+ inverted_dir = -(this->home_direction[c - 'X'] - 1);
this->steppers[c - 'X']->set_speed(this->slow_rates[c - 'X']);
this->steppers[c - 'X']->move(inverted_dir,this->retract_steps[c - 'X']);
}
for( char c = 'X'; c <= 'Z'; c++ ){
if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
this->steppers[c - 'X']->set_speed(this->slow_rates[c -'X']);
- this->steppers[c - 'X']->move(this->direction[c - 'X'],10000000);
+ this->steppers[c - 'X']->move(this->home_direction[c - 'X'],10000000);
}
}
// Wait for all axes to have homed
this->wait_for_homed(axes_to_move);
+ // move for soft trim
+ this->status = MOVING_BACK;
+ for( char c = 'X'; c <= 'Z'; c++ ){
+ if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
+ inverted_dir = -(this->home_direction[c - 'X'] - 1);
+ this->steppers[c - 'X']->set_speed(this->slow_rates[c - 'X']);
+ this->steppers[c - 'X']->move(inverted_dir,this->trim[c - 'X']);
+ }
+ }
+
+ // Wait for moves to be done
+ for( char c = 'X'; c <= 'Z'; c++ ){
+ if( ( axes_to_move >> ( c - 'X' ) ) & 1 ){
+ this->kernel->streams->printf("axis %c \r\n", c );
+ while( this->steppers[c - 'X']->moving ){
+ this->kernel->call_event(ON_IDLE);
+ }
+ }
+ }
+
// Homing is done
this->status = NOT_HOMING;
switch(gcode->m){
case 119:
gcode->stream->printf("X min:%d max:%d Y min:%d max:%d Z min:%d max:%d\n", this->pins[0].get(), this->pins[3].get(), this->pins[1].get(), this->pins[4].get(), this->pins[2].get(), this->pins[5].get() );
+ gcode->mark_as_taken();
break;
}
}
HCoop / clinton / Smoothieware.git / blobdiff