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

Intercept M708 A0xb: set ExtraLoadDistance on the printer side too

This commit is contained in:
D.R.racer 2022-10-11 12:57:16 +02:00 committed by DRracer
parent b0466ae20f
commit 0aeb74e5b1
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Firmware/mmu2.cpp
View File

@ -39,7 +39,9 @@ static constexpr float MMU2_LOAD_TO_NOZZLE_LENGTH = 87.0F + 5.0F;
// - ToolChange shall not try to push filament into the very tip of the nozzle // - ToolChange shall not try to push filament into the very tip of the nozzle
// to have some space for additional G-code to tune the extruded filament length // to have some space for additional G-code to tune the extruded filament length
// in the profile // in the profile
// Beware - this value is sent to the MMU upon line up, it is written into its 8bit register 0x0b // Beware - this value is used to initialize the MMU logic layer - it will be sent to the MMU upon line up (written into its 8bit register 0x0b)
// However - in the G-code we can get a request to set the extra load distance at runtime to something else (M708 A0xb Xsomething).
// The printer intercepts such a call and sets its extra load distance to match the new value as well.
static constexpr uint8_t MMU2_TOOL_CHANGE_LOAD_LENGTH = 5; // mm static constexpr uint8_t MMU2_TOOL_CHANGE_LOAD_LENGTH = 5; // mm
static constexpr float MMU2_LOAD_TO_NOZZLE_FEED_RATE = 20.0F; // mm/s static constexpr float MMU2_LOAD_TO_NOZZLE_FEED_RATE = 20.0F; // mm/s
@ -198,6 +200,12 @@ bool MMU2::ReadRegister(uint8_t address){
bool MMU2::WriteRegister(uint8_t address, uint16_t data){ bool MMU2::WriteRegister(uint8_t address, uint16_t data){
if( ! WaitForMMUReady()) if( ! WaitForMMUReady())
return false; return false;
// special case - intercept requests of extra loading distance and perform the change even on the printer's side
if( address == 0x0b ){
logic.PlanExtraLoadDistance(data);
}
logic.WriteRegister(address, data); // we may signal the accepted/rejected status of the response as return value of this function logic.WriteRegister(address, data); // we may signal the accepted/rejected status of the response as return value of this function
manage_response(false, false); manage_response(false, false);
return true; return true;
@ -907,8 +915,8 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc){
loadFilamentStarted = false; loadFilamentStarted = false;
// After the MMU knows the FSENSOR is triggered it will: // After the MMU knows the FSENSOR is triggered it will:
// 1. Push the filament by additional 30mm (see fsensorToNozzle) // 1. Push the filament by additional 30mm (see fsensorToNozzle)
// 2. Disengage the idler and push another 5mm. // 2. Disengage the idler and push another 2mm.
current_position[E_AXIS] += MMU2_TOOL_CHANGE_LOAD_LENGTH + 2.0f; current_position[E_AXIS] += logic.ExtraLoadDistance() + 2;
plan_buffer_line_curposXYZE(MMU2_LOAD_TO_NOZZLE_FEED_RATE); plan_buffer_line_curposXYZE(MMU2_LOAD_TO_NOZZLE_FEED_RATE);
break; break;
case FilamentState::NOT_PRESENT: case FilamentState::NOT_PRESENT:

11
Firmware/mmu2_protocol_logic.h
View File

@ -92,6 +92,17 @@ public:
void ReadRegister(uint8_t address); void ReadRegister(uint8_t address);
void WriteRegister(uint8_t address, uint16_t data); void WriteRegister(uint8_t address, uint16_t data);
/// Sets the extra load distance to be reported to the MMU.
/// Beware - this call doesn't send anything to the MMU.
/// The MMU gets the newly set value either by a communication restart or via an explicit WriteRegister call
inline void PlanExtraLoadDistance(uint8_t eld_mm){
initRegs8[0] = eld_mm;
}
/// @returns the currently preset extra load distance
inline uint8_t ExtraLoadDistance()const {
return initRegs8[0];
}
/// Step the state machine /// Step the state machine
StepStatus Step(); StepStatus Step();