diff --git a/Firmware/printer_state.h b/Firmware/printer_state.h index a94b0f742..22b9fe5bd 100644 --- a/Firmware/printer_state.h +++ b/Firmware/printer_state.h @@ -12,6 +12,8 @@ #pragma once #include "macros.h" +// The order of the states is important as we check +// - LCD menu only shown when lower than "IsSDPrinting" enum class PrinterState : uint8_t { NotReady = 0, //Lowest state to simplify queries diff --git a/Firmware/stopwatch.cpp b/Firmware/stopwatch.cpp index 2e34b66e4..4701090e2 100644 --- a/Firmware/stopwatch.cpp +++ b/Firmware/stopwatch.cpp @@ -1,7 +1,7 @@ /** - * + * * NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware - * + * * Marlin 3D Printer Firmware * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * diff --git a/Firmware/stopwatch.h b/Firmware/stopwatch.h index d2ea277b1..de861d323 100644 --- a/Firmware/stopwatch.h +++ b/Firmware/stopwatch.h @@ -1,7 +1,7 @@ /** - * + * * NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware - * + * * Marlin 3D Printer Firmware * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1d51fd7ea..9162a4cc4 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2314,7 +2314,7 @@ void lcd_menu_statistics() if (printJobOngoing()) { const float _met = ((float)total_filament_used) / (100000.f); - + const uint32_t _t = print_job_timer.duration(); const uint32_t _h = (_t / 60) / 60; const uint8_t _m = (_t / 60) % 60;