mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-12-18 00:07:50 +00:00
Merge pull request #647 from shaggythesheep/newfeature-M226
Implement M226 - GCode Initiated Pause
This commit is contained in:
commit
24d1f480b6
@ -139,6 +139,7 @@
|
|||||||
// M218 - set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
|
// M218 - set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
|
||||||
// M220 S<factor in percent>- set speed factor override percentage
|
// M220 S<factor in percent>- set speed factor override percentage
|
||||||
// M221 S<factor in percent>- set extrude factor override percentage
|
// M221 S<factor in percent>- set extrude factor override percentage
|
||||||
|
// M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required
|
||||||
// M240 - Trigger a camera to take a photograph
|
// M240 - Trigger a camera to take a photograph
|
||||||
// M250 - Set LCD contrast C<contrast value> (value 0..63)
|
// M250 - Set LCD contrast C<contrast value> (value 0..63)
|
||||||
// M280 - set servo position absolute. P: servo index, S: angle or microseconds
|
// M280 - set servo position absolute. P: servo index, S: angle or microseconds
|
||||||
@ -2155,6 +2156,57 @@ void process_commands()
|
|||||||
extrudemultiply = code_value() ;
|
extrudemultiply = code_value() ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 226: // M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required
|
||||||
|
{
|
||||||
|
if(code_seen('P')){
|
||||||
|
int pin_number = code_value(); // pin number
|
||||||
|
int pin_state = -1; // required pin state - default is inverted
|
||||||
|
|
||||||
|
if(code_seen('S')) pin_state = code_value(); // required pin state
|
||||||
|
|
||||||
|
if(pin_state >= -1 && pin_state <= 1){
|
||||||
|
|
||||||
|
for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
|
||||||
|
{
|
||||||
|
if (sensitive_pins[i] == pin_number)
|
||||||
|
{
|
||||||
|
pin_number = -1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pin_number > -1)
|
||||||
|
{
|
||||||
|
st_synchronize();
|
||||||
|
|
||||||
|
pinMode(pin_number, INPUT);
|
||||||
|
|
||||||
|
int target;
|
||||||
|
switch(pin_state){
|
||||||
|
case 1:
|
||||||
|
target = HIGH;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 0:
|
||||||
|
target = LOW;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case -1:
|
||||||
|
target = !digitalRead(pin_number);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
while(digitalRead(pin_number) != target){
|
||||||
|
manage_heater();
|
||||||
|
manage_inactivity();
|
||||||
|
lcd_update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if NUM_SERVOS > 0
|
#if NUM_SERVOS > 0
|
||||||
|
Loading…
Reference in New Issue
Block a user