From 829212d76afe56c2476a2a1ab4efad112f441848 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 26 May 2022 18:21:30 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20MMU2=20const=20types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/feature/mmu/mmu2.cpp | 7 ++++--- Marlin/src/feature/mmu/mmu2.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp index 562cc3303bcc..4f4bd961bd10 100644 --- a/Marlin/src/feature/mmu/mmu2.cpp +++ b/Marlin/src/feature/mmu/mmu2.cpp @@ -891,8 +891,8 @@ void MMU2::filament_runout() { } bool MMU2::can_load() { - static const E_Step can_load_sequence[] PROGMEM = { MMU2_CAN_LOAD_SEQUENCE }, - can_load_increment_sequence[] PROGMEM = { MMU2_CAN_LOAD_INCREMENT_SEQUENCE }; + static constexpr E_Step can_load_sequence[] PROGMEM = { MMU2_CAN_LOAD_SEQUENCE }, + can_load_increment_sequence[] PROGMEM = { MMU2_CAN_LOAD_INCREMENT_SEQUENCE }; execute_extruder_sequence(can_load_sequence, COUNT(can_load_sequence)); @@ -1041,7 +1041,8 @@ void MMU2::load_to_nozzle_sequence() { execute_extruder_sequence(sequence, COUNT(sequence)); } -void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) { +void MMU2::execute_extruder_sequence(const E_Step * const sequence, const uint8_t steps) { + planner.synchronize(); const E_Step *step = sequence; diff --git a/Marlin/src/feature/mmu/mmu2.h b/Marlin/src/feature/mmu/mmu2.h index 2c9fd3308d97..19190e46df0f 100644 --- a/Marlin/src/feature/mmu/mmu2.h +++ b/Marlin/src/feature/mmu/mmu2.h @@ -70,7 +70,7 @@ class MMU2 { static bool get_response(); static void manage_response(const bool move_axes, const bool turn_off_nozzle); - static void execute_extruder_sequence(const E_Step * sequence, int steps); + static void execute_extruder_sequence(const E_Step * const sequence, const uint8_t steps); static void ramming_sequence(); static void load_to_nozzle_sequence();