From 99e306f4a3427a5c6018147cba7af4c642a15649 Mon Sep 17 00:00:00 2001 From: gudnimg Date: Sat, 6 Jul 2024 17:24:40 +0000 Subject: [PATCH] MMU: minor formatting sync --- Firmware/mmu2_error_converter.h | 2 +- Firmware/mmu2_marlin.h | 4 ++-- Firmware/mmu2_progress_converter.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/mmu2_error_converter.h b/Firmware/mmu2_error_converter.h index fea2ba2a1..3b18ee1e6 100644 --- a/Firmware/mmu2_error_converter.h +++ b/Firmware/mmu2_error_converter.h @@ -6,7 +6,7 @@ #include "mmu2/error_codes.h" #else #include "buttons.h" - #include "../../../../../../Prusa-Error-Codes/04_MMU/button_operations.h" + #include "../../../../../../Prusa-Error-Codes/include/button_operations.h" #include "../../../../../../Prusa-Firmware-MMU/src/logic/error_codes.h" #endif diff --git a/Firmware/mmu2_marlin.h b/Firmware/mmu2_marlin.h index 2d4d84d04..4ce1ac244 100644 --- a/Firmware/mmu2_marlin.h +++ b/Firmware/mmu2_marlin.h @@ -43,8 +43,8 @@ void nozzle_park(); bool marlin_printingIsActive(); void marlin_manage_heater(); -void marlin_manage_inactivity(bool b); -void marlin_idle(bool b); +void marlin_manage_inactivity(bool ignore_stepper_queue); +void marlin_idle(bool ignore_stepper_queue); void marlin_refresh_print_state_in_ram(); void marlin_clear_print_state_in_ram(); void marlin_stop_and_save_print_to_ram(); diff --git a/Firmware/mmu2_progress_converter.cpp b/Firmware/mmu2_progress_converter.cpp index 29fd0d250..c5c14c84a 100644 --- a/Firmware/mmu2_progress_converter.cpp +++ b/Firmware/mmu2_progress_converter.cpp @@ -30,7 +30,7 @@ static const char MSG_PROGRESS_HOMING[] PROGMEM_I1 = ISTR("Homing"); / static const char MSG_PROGRESS_MOVING_SELECTOR[] PROGMEM_I1 = ISTR("Moving selector"); ////MSG_PROGRESS_MOVING_SELECTOR c=20 static const char MSG_PROGRESS_FEED_FSENSOR[] PROGMEM_I1 = ISTR("Feeding to FSensor"); ////MSG_PROGRESS_FEED_FSENSOR c=20 -static const char * const progressTexts[] PROGMEM = { +static const char *const progressTexts[] PROGMEM = { _R(MSG_PROGRESS_OK), _R(MSG_PROGRESS_ENGAGE_IDLER), _R(MSG_PROGRESS_DISENGAGE_IDLER), @@ -62,11 +62,11 @@ static const char * const progressTexts[] PROGMEM = { _R(MSG_PROGRESS_FEED_FSENSOR) }; -const char * ProgressCodeToText(ProgressCode pc){ +const char *ProgressCodeToText(ProgressCode pc) { // @@TODO ?? a better fallback option? - return ( (uint16_t)pc <= (sizeof(progressTexts) / sizeof(progressTexts[0])) ) - ? static_cast(pgm_read_ptr(&progressTexts[(uint16_t)pc])) - : static_cast(pgm_read_ptr(&progressTexts[0])); + return ((uint16_t)pc <= (sizeof(progressTexts) / sizeof(progressTexts[0]))) + ? static_cast(pgm_read_ptr(&progressTexts[(uint16_t)pc])) + : static_cast(pgm_read_ptr(&progressTexts[0])); } } // namespace MMU2