mirror of
https://github.com/synthetos/g2.git
synced 2026-09-22 11:29:24 +08:00
Testing
This commit is contained in:
+2
-2
@@ -196,7 +196,7 @@ stat_t cm_shutdown(const stat_t status, const char *msg)
|
||||
}
|
||||
cm_request_feedhold(FEEDHOLD_TYPE_SCRAM, FEEDHOLD_EXIT_SHUTDOWN); // fast stop and shutdown
|
||||
|
||||
// cm_halt_motion(); // halt motors (may have already been done from GPIO)
|
||||
//+++++ cm_halt_motion(); // halt motors (may have already been done from GPIO)
|
||||
// spindle_reset(); // stop spindle immediately and set speed to 0 RPM
|
||||
// coolant_reset(); // stop coolant immediately
|
||||
// temperature_reset(); // turn off heaters and fans
|
||||
@@ -235,7 +235,7 @@ stat_t cm_panic(const stat_t status, const char *msg)
|
||||
spindle_reset(); // stop spindle immediately and set speed to 0 RPM
|
||||
coolant_reset(); // stop coolant immediately
|
||||
temperature_reset(); // turn off heaters and fans
|
||||
cm_queue_flush(&cm1); // flush all queues and reset positions
|
||||
//+++++ cm_queue_flush(&cm1); // flush all queues and reset positions
|
||||
|
||||
cm1.machine_state = MACHINE_PANIC; // don't reset anything. Panics are not recoverable
|
||||
cm2.machine_state = MACHINE_PANIC; // don't reset anything. Panics are not recoverable
|
||||
|
||||
@@ -1579,6 +1579,7 @@ static void _exec_program_finalize(float *value, bool *flag)
|
||||
sr_request_status_report(SR_REQUEST_IMMEDIATE); // request a final and full status report (not filtered)
|
||||
}
|
||||
|
||||
// Will start a cycle regardless of whether the planner has moves or not
|
||||
void cm_cycle_start()
|
||||
{
|
||||
if (cm->cycle_type == CYCLE_NONE) { // don't (re)start homing, probe or other canned cycles
|
||||
|
||||
@@ -494,8 +494,6 @@ stat_t cm_feedhold_sequencing_callback(void); // process feedh
|
||||
stat_t cm_feedhold_command_blocker(void);
|
||||
|
||||
bool cm_has_hold(void); // has hold in primary planner
|
||||
//void cm_start_hold(void); // starts hold in primary planner
|
||||
void cm_queue_flush(cmMachine_t *_cm); // queue flush in either planner
|
||||
|
||||
// Homing cycles (cycle_homing.cpp)
|
||||
stat_t cm_homing_cycle_start(const float axes[], const bool flags[]); // G28.2
|
||||
|
||||
Reference in New Issue
Block a user