Rebase fix

Add documentation
Whitespace

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

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]
  *

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]
  *

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;