Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-06 02:51:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolved merge conflicts between edge marlin-compatibility and dev-p24

Browse Source
This commit is contained in:
Alden Hart
2017-03-23 11:07:12 -04:00
parent 5031f4c8c6 39c398668d
commit c60dc581f7
41 changed files with 2457 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
g2core/stepper.cpp
View File

@@ -116,11 +116,11 @@ void stepper_init()
dda_timer.setInterrupts(kInterruptOnOverflow | kInterruptPriorityHighest);
// setup software interrupt exec timer & initial condition
exec_timer.setInterrupts(kInterruptOnSoftwareTrigger | kInterruptPriorityMedium);
exec_timer.setInterrupts(kInterruptOnSoftwareTrigger | kInterruptPriorityHigh);
st_pre.buffer_state = PREP_BUFFER_OWNED_BY_EXEC;
// setup software interrupt forward plan timer & initial condition
fwd_plan_timer.setInterrupts(kInterruptOnSoftwareTrigger | kInterruptPriorityLow);
fwd_plan_timer.setInterrupts(kInterruptOnSoftwareTrigger | kInterruptPriorityMedium);
// setup motor power levels and apply power level to stepper drivers
for (uint8_t motor=0; motor<MOTORS; motor++) {
@@ -203,6 +203,7 @@ stat_t st_clc(nvObj_t *nv) // clear diagnostic counters, reset stepper prep
*
* Handles motor power-down timing, low-power idle, and adaptive motor power
*/
stat_t st_motor_power_callback() // called by controller
{
if (!mp_is_phat_city_time()) { // don't process this if you are time constrained in the planner
@@ -210,7 +211,10 @@ stat_t st_motor_power_callback() // called by controller
}
bool have_actually_stopped = false;
if ((!st_runtime_isbusy()) && (st_pre.buffer_state != PREP_BUFFER_OWNED_BY_LOADER)) { // if there are no moves to load...
if ((!st_runtime_isbusy()) &&
(st_pre.buffer_state != PREP_BUFFER_OWNED_BY_LOADER) &&
// (cm_get_cycle_state() == CYCLE_OFF)
(cm_get_machine_state() != MACHINE_CYCLE)) { // if there are no moves to load...
have_actually_stopped = true;
}