#define retract_zlift_length_checksum CHECKSUM("retract_zlift_length")
#define retract_zlift_feedrate_checksum CHECKSUM("retract_zlift_feedrate")
+#define save_state_checksum CHECKSUM("save_state")
+#define restore_state_checksum CHECKSUM("restore_state")
+
#define X_AXIS 0
#define Y_AXIS 1
#define Z_AXIS 2
this->register_for_event(ON_HALT);
this->register_for_event(ON_SPEED_CHANGE);
this->register_for_event(ON_GET_PUBLIC_DATA);
+ this->register_for_event(ON_SET_PUBLIC_DATA);
// Update speed every *acceleration_ticks_per_second*
THEKERNEL->step_ticker->register_acceleration_tick_handler([this](){acceleration_tick(); });
}
}
+void Extruder::on_set_public_data(void *argument)
+{
+ PublicDataRequest *pdr = static_cast<PublicDataRequest *>(argument);
+
+ if(!pdr->starts_with(extruder_checksum)) return;
+
+ // save or restore state
+ if(pdr->second_element_is(save_state_checksum)) {
+ this->saved_current_position= this->current_position;
+ this->saved_absolute_mode= this->absolute_mode;
+ pdr->set_taken();
+ }else if(pdr->second_element_is(restore_state_checksum)) {
+ this->current_position= this->saved_current_position;
+ this->absolute_mode= this->saved_absolute_mode;
+ pdr->set_taken();
+ }
+}
+
// When the play/pause button is set to pause, or a module calls the ON_PAUSE event
void Extruder::on_pause(void *argument)
{
private:
void on_get_public_data(void* argument);
+ void on_set_public_data(void* argument);
uint32_t rate_increase() const;
StepperMotor* stepper_motor;
float current_position; // Current point ( in mm ) for the current move, incremented every time a move is executed
};
- float volumetric_multiplier;
- float feed_rate; // mm/sec for SOLO moves only
+ float saved_current_position;
+ float volumetric_multiplier;
+ float feed_rate; // mm/sec for SOLO moves only
- float travel_ratio;
- float travel_distance;
+ float travel_ratio;
+ float travel_distance;
// for firmware retract
- float retract_feedrate;
- float retract_recover_feedrate;
- float retract_recover_length;
- float retract_zlift_length;
- float retract_zlift_feedrate;
+ float retract_feedrate;
+ float retract_recover_feedrate;
+ float retract_recover_length;
+ float retract_zlift_length;
+ float retract_zlift_feedrate;
struct {
char mode:3; // extruder motion mode, OFF, SOLO, or FOLLOW
bool absolute_mode:1; // absolute/relative coordinate mode switch
+ bool saved_absolute_mode:1;
bool paused:1;
bool single_config:1;
bool retracted:1;
#include <cstddef>
#include <cmath>
+#include <algorithm>
#include "mbed.h"
#define on_boot_gcode_checksum CHECKSUM("on_boot_gcode")
#define on_boot_gcode_enable_checksum CHECKSUM("on_boot_gcode_enable")
+#define after_suspend_gcode_checksum CHECKSUM("after_suspend_gcode")
+#define before_resume_gcode_checksum CHECKSUM("before_resume_gcode")
#define extruder_checksum CHECKSUM("extruder")
+#define save_state_checksum CHECKSUM("save_state")
+#define restore_state_checksum CHECKSUM("restore_state")
extern SDFAT mounter;
this->on_boot_gcode = THEKERNEL->config->value(on_boot_gcode_checksum)->by_default("/sd/on_boot.gcode")->as_string();
this->on_boot_gcode_enable = THEKERNEL->config->value(on_boot_gcode_enable_checksum)->by_default(true)->as_bool();
+
+ this->after_suspend_gcode = THEKERNEL->config->value(after_suspend_gcode_checksum)->by_default("")->as_string();
+ this->before_resume_gcode = THEKERNEL->config->value(before_resume_gcode_checksum)->by_default("")->as_string();
+ std::replace( this->after_suspend_gcode.begin(), this->after_suspend_gcode.end(), '_', ' '); // replace _ with space
+ std::replace( this->before_resume_gcode.begin(), this->before_resume_gcode.end(), '_', ' '); // replace _ with space
}
void Player::on_halt(void *arg)
void Player::on_second_tick(void *)
{
- if (!THEKERNEL->pauser->paused()) this->elapsed_secs++;
+ if(this->playing_file) this->elapsed_secs++;
}
// extract any options found on line, terminates args at the space before the first option (-v)
3. save the current position, extruder position, temperatures - any state that would need to be restored
4. retract by specifed amount either on command line or in config
5. turn off heaters.
-6. optionally move to safe position if enabled and specified (either in config or on command line)
+6. optionally run after_suspend gcode (either in config or on command line)
User may jog or remove and insert filament at this point, extruding or retracting as needed
// save current XYZ position
THEKERNEL->robot->get_axis_position(this->saved_position);
- // save current extruder position
- float *rd;
- if(PublicData::get_value( extruder_checksum, (void **)&rd )) {
- this->saved_position_e= *(rd+5);
- }else {
- this->saved_position_e= NAN;
- }
+ // save current extruder state
+ PublicData::set_value( extruder_checksum, save_state_checksum, nullptr );
// save state
this->saved_inch_mode= THEKERNEL->robot->inch_mode;
PublicData::set_value( temperature_control_checksum, h.first, &t );
}
- // TODO Move to safe position if defined....
+ // execute optional gcode if defined
+ if(!after_suspend_gcode.empty()) {
+ struct SerialMessage message;
+ message.message = after_suspend_gcode;
+ message.stream = &(StreamOutput::NullStream);
+ THEKERNEL->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
+ }
stream->printf("Print Suspended, enter resume to continue printing\n");
}
/**
resume the suspended print
1. restore the temperatures and wait for them to get up to temp
-2. restore the position it was at and E and any other saved state
-3. resume sd print or send resume upstream
+2. optionally run before_resume gcode if specified
+3. restore the position it was at and E and any other saved state
+4. resume sd print or send resume upstream
*/
void Player::resume_command(string parameters, StreamOutput *stream )
{
}
}
+ // execute optional gcode if defined
+ if(!before_resume_gcode.empty()) {
+ stream->printf("Executing before resume gcode...\n");
+ struct SerialMessage message;
+ message.message = before_resume_gcode;
+ message.stream = &(StreamOutput::NullStream);
+ THEKERNEL->call_event(ON_CONSOLE_LINE_RECEIVED, &message );
+ }
+
// Restore position
stream->printf("Restoring saved XYZ positions and state...\n");
THEKERNEL->robot->inch_mode= saved_inch_mode;
THEKERNEL->call_event(ON_GCODE_RECEIVED, &gcode );
}
- if(!isnan(saved_position_e)) {
- // we just set E to the position it was at as the user will have extruded manually
- int n = snprintf(buf, sizeof(buf), "G92 E%f", saved_position_e);
- string g(buf, n);
- Gcode gcode(g, &(StreamOutput::NullStream));
- THEKERNEL->call_event(ON_GCODE_RECEIVED, &gcode );
- }
-
- // TODO restore e absolute mode
+ // restore extruder state
+ PublicData::set_value( extruder_checksum, restore_state_checksum, nullptr );
stream->printf("Resuming print\n");
if(this->was_playing_file) {
this->playing_file = true;
}else{
+ // Send resume to host
THEKERNEL->streams->printf("// action:resume\r\n");
}
HCoop / clinton / Smoothieware.git / commitdiff