sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AutoReport class (Temperature, Cardreader) (#20913)

Browse Source
This commit is contained in:
Scott Lahteine
2021-01-28 20:40:20 -06:00
committed by GitHub
parent 9e004a9496
commit 9d0e64a725
16 changed files with 110 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/extui/ui_api.cpp
View File

@@ -123,7 +123,7 @@ namespace ExtUI {
// Machine was killed, reinit SysTick so we are able to compute time without ISRs
if (currTimeHI == 0) {
// Get the last time the Arduino time computed (from CMSIS) and convert it to SysTick
currTimeHI = (uint32_t)((GetTickCount() * (uint64_t)(F_CPU / 8000)) >> 24);
currTimeHI = uint32_t((GetTickCount() * uint64_t(F_CPU / 8000)) >> 24);
// Reinit the SysTick timer to maximize its period
SysTick->LOAD = SysTick_LOAD_RELOAD_Msk; // get the full range for the systick timer
@@ -148,9 +148,9 @@ namespace ExtUI {
}
#endif // __SAM3X8E__
void delay_us(unsigned long us) { DELAY_US(us); }
void delay_us(uint32_t us) { DELAY_US(us); }
void delay_ms(unsigned long ms) {
void delay_ms(uint32_t ms) {
if (flags.printer_killed)
DELAY_US(ms * 1000);
else