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

Rebase fix 

Add documentation
Whitespace
This commit is contained in:
3d-gussner 2023-11-22 08:21:52 +01:00
parent d394645b69
commit 02459edcb6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/printer_state.h
View File

@ -12,6 +12,8 @@
#pragma once #pragma once
#include "macros.h" #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 enum class PrinterState : uint8_t
{ {
NotReady = 0, //Lowest state to simplify queries NotReady = 0, //Lowest state to simplify queries

4
Firmware/stopwatch.cpp
View File

@ -1,7 +1,7 @@
/** /**
* *
* NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware * NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware
* *
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *

4
Firmware/stopwatch.h
View File

@ -1,7 +1,7 @@
/** /**
* *
* NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware * NOTE: this file has been changed in order to compile & run on Prusa-Firmware https://github.com/prusa3d/Prusa-Firmware
* *
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *

2
Firmware/ultralcd.cpp
View File

@ -2314,7 +2314,7 @@ void lcd_menu_statistics()
if (printJobOngoing()) if (printJobOngoing())
{ {
const float _met = ((float)total_filament_used) / (100000.f); const float _met = ((float)total_filament_used) / (100000.f);
const uint32_t _t = print_job_timer.duration(); const uint32_t _t = print_job_timer.duration();
const uint32_t _h = (_t / 60) / 60; const uint32_t _h = (_t / 60) / 60;
const uint8_t _m = (_t / 60) % 60; const uint8_t _m = (_t / 60) % 60;