WIP
This commit is contained in:
@@ -802,11 +802,11 @@ int ecmcGrbl::setReset(int reset) {
|
||||
}
|
||||
|
||||
int ecmcGrbl::getBusy() {
|
||||
return getEcmcEpicsIOCState()!=16 || writerBusy_ || stepperInterruptEnable;
|
||||
return getEcmcEpicsIOCState()!=16 || writerBusy_ || stepperInterruptEnable || !grblInitDone_;
|
||||
}
|
||||
|
||||
int ecmcGrbl::getParserBusy() {
|
||||
return getEcmcEpicsIOCState()!=16 || writerBusy_;
|
||||
return getEcmcEpicsIOCState()!=16 || writerBusy_ || !grblInitDone_;
|
||||
}
|
||||
|
||||
int ecmcGrbl::getCodeRowNum() {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
void spindle_init()
|
||||
{
|
||||
printf("%s:%s:%d Not supported yet..\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
//printf("%s:%s:%d Not supported yet..\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
|
||||
#ifdef VARIABLE_SPINDLE
|
||||
// Configure variable spindle PWM and enable pin, if requried. On the Uno, PWM and enable are
|
||||
@@ -107,7 +107,7 @@ uint8_t spindle_get_state()
|
||||
// Called by spindle_init(), spindle_set_speed(), spindle_set_state(), and mc_reset().
|
||||
void spindle_stop()
|
||||
{
|
||||
printf("%s:%s:%d Not supported yet..\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
//printf("%s:%s:%d Not supported yet..\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
|
||||
//#ifdef VARIABLE_SPINDLE
|
||||
// SPINDLE_TCCRA_REGISTER &= ~(1<<SPINDLE_COMB_BIT); // Disable PWM. Output voltage is zero.
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Test of GRBL plugin for g-code parsing
|
||||
#
|
||||
|
||||
println('GRBL busy:', grbl_get_busy());
|
||||
|
||||
if(not(grbl_get_busy())) {
|
||||
println('GRBL busy :', grbl_get_busy());
|
||||
println('Parser busy:', grbl_get_parser_busy());
|
||||
if(not(grbl_get_parser_busy())) {
|
||||
static.counter+=1;
|
||||
println('Retrigger g-code. Counter: ', static.counter);
|
||||
grbl_set_execute(0);
|
||||
|
||||
Reference in New Issue
Block a user