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

MMU: minor formatting sync

This commit is contained in:
gudnimg 2024-07-06 17:24:40 +00:00
parent d548bb68fd
commit 99e306f4a3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/mmu2_error_converter.h
View File

@ -6,7 +6,7 @@
#include "mmu2/error_codes.h" #include "mmu2/error_codes.h"
#else #else
#include "buttons.h" #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" #include "../../../../../../Prusa-Firmware-MMU/src/logic/error_codes.h"
#endif #endif

4
Firmware/mmu2_marlin.h
View File

@ -43,8 +43,8 @@ void nozzle_park();
bool marlin_printingIsActive(); bool marlin_printingIsActive();
void marlin_manage_heater(); void marlin_manage_heater();
void marlin_manage_inactivity(bool b); void marlin_manage_inactivity(bool ignore_stepper_queue);
void marlin_idle(bool b); void marlin_idle(bool ignore_stepper_queue);
void marlin_refresh_print_state_in_ram(); void marlin_refresh_print_state_in_ram();
void marlin_clear_print_state_in_ram(); void marlin_clear_print_state_in_ram();
void marlin_stop_and_save_print_to_ram(); void marlin_stop_and_save_print_to_ram();

6
Firmware/mmu2_progress_converter.cpp
View File

@ -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_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 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_OK),
_R(MSG_PROGRESS_ENGAGE_IDLER), _R(MSG_PROGRESS_ENGAGE_IDLER),
_R(MSG_PROGRESS_DISENGAGE_IDLER), _R(MSG_PROGRESS_DISENGAGE_IDLER),
@ -62,9 +62,9 @@ static const char * const progressTexts[] PROGMEM = {
_R(MSG_PROGRESS_FEED_FSENSOR) _R(MSG_PROGRESS_FEED_FSENSOR)
}; };
const char * ProgressCodeToText(ProgressCode pc){ const char *ProgressCodeToText(ProgressCode pc) {
// @@TODO ?? a better fallback option? // @@TODO ?? a better fallback option?
return ( (uint16_t)pc <= (sizeof(progressTexts) / sizeof(progressTexts[0])) ) return ((uint16_t)pc <= (sizeof(progressTexts) / sizeof(progressTexts[0])))
? static_cast<const char *>(pgm_read_ptr(&progressTexts[(uint16_t)pc])) ? static_cast<const char *>(pgm_read_ptr(&progressTexts[(uint16_t)pc]))
: static_cast<const char *>(pgm_read_ptr(&progressTexts[0])); : static_cast<const char *>(pgm_read_ptr(&progressTexts[0]));
} }