josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PFW-1386 Implement changes to M701

This commit is contained in:
Guðni Már Gilbert 2022-08-27 09:13:05 +00:00 committed by D.R.racer
parent fb087fc535
commit 5bb36546b4
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Firmware/Marlin_main.cpp
View File

@ -8547,22 +8547,42 @@ Sigma_Exit:
/*! /*!
### M701 - Load filament <a href="https://reprap.org/wiki/G-code#M701:_Load_filament">M701: Load filament</a> ### M701 - Load filament <a href="https://reprap.org/wiki/G-code#M701:_Load_filament">M701: Load filament</a>
Load filament into the active extruder.
#### Usage #### Usage
M701 [ E | T ] M701 [ P | T | L | Z ]
#### Parameters #### Parameters
- `E` - ID of filament to load, ranges from 0 to 4 - `P` - n index of MMU slot (zero based, so 0-4 like T0 and T4)
- `T` - Alias of `E`. Used for compatibility with Marlin - `T` - Alias of `P`. Used for compatibility with Marlin
- `L` - Extrude distance for insertion (positive value)(manual reload)
- `Z` - Move the Z axis by this distance. Default value MIN_Z_FOR_LOAD
*/ */
case 701: case 701:
{ {
uint8_t mmuSlotIndex = 0xffU; uint8_t mmuSlotIndex = 0xffU;
if (MMU2::mmu2.Enabled() && code_seen('E')) if( MMU2::mmu2.Enabled() )
mmuSlotIndex = code_value_uint8(); {
gcode_M701(mmuSlotIndex); if( code_seen('P') || code_seen('T') ) {
} mmuSlotIndex = code_value_uint8();
break; }
}
// TODO: Implement L parameter
enable_z();
if (code_seen('Z'))
{
float z_target = code_value();
raise_z_above(z_target, false);
} else {
raise_z_above(MIN_Z_FOR_LOAD, false);
}
disable_z();
gcode_M701(mmuSlotIndex);
}
break;
/*! /*!
### M702 - Unload filament <a href="https://reprap.org/wiki/G-code#M702:_Unload_filament">G32: Undock Z Probe sled</a> ### M702 - Unload filament <a href="https://reprap.org/wiki/G-code#M702:_Unload_filament">G32: Undock Z Probe sled</a>