From c72ae8a2f37ac4ae405bfe4ab5ded1b1fd034042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 18 Dec 2022 14:24:16 +0000 Subject: [PATCH] PFW-1439 Remove parameters from execute_load_to_nozzle_sequence --- Firmware/mmu2.cpp | 8 ++++---- Firmware/mmu2.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 2d5c03e38..70a217c6b 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -355,7 +355,7 @@ bool MMU2::tool_change(char code, uint8_t slot) { case 'c': { waitForHotendTargetTemp(100, []{}); - execute_load_to_nozzle_sequence((const E_Step *)load_to_nozzle_sequence, sizeof(load_to_nozzle_sequence) / sizeof (load_to_nozzle_sequence[0])); + execute_load_to_nozzle_sequence(); } break; } @@ -506,7 +506,7 @@ bool MMU2::load_filament_to_nozzle(uint8_t slot) { ToolChangeCommon(slot); // Finish loading to the nozzle with finely tuned steps. - execute_load_to_nozzle_sequence((const E_Step *)load_to_nozzle_sequence, sizeof(load_to_nozzle_sequence) / sizeof (load_to_nozzle_sequence[0])); + execute_load_to_nozzle_sequence(); Sound_MakeSound(e_SOUND_TYPE_StandardConfirm); } lcd_update_enable(true); @@ -837,11 +837,11 @@ void MMU2::execute_extruder_sequence(const E_Step *sequence, uint8_t steps) { } } -void MMU2::execute_load_to_nozzle_sequence(const E_Step *sequence, uint8_t steps) { +void MMU2::execute_load_to_nozzle_sequence() { st_synchronize(); // Compensate for configurable Extra Loading Distance current_position[E_AXIS] -= logic.ExtraLoadDistance(); - execute_extruder_sequence(sequence, steps); + execute_extruder_sequence((const E_Step *)load_to_nozzle_sequence, sizeof(load_to_nozzle_sequence) / sizeof (load_to_nozzle_sequence[0])); } void MMU2::ReportError(ErrorCode ec, ErrorSource res) { diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index 30a7f4fc7..cf5a1aa15 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -239,7 +239,7 @@ private: void filament_ramming(); void execute_extruder_sequence(const E_Step *sequence, uint8_t steps); - void execute_load_to_nozzle_sequence(const E_Step *sequence, uint8_t steps); + void execute_load_to_nozzle_sequence(); /// Reports an error into attached ExtUIs /// @param ec error code, see ErrorCode