bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix warning in gcode_D

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-23 19:25:22 -05:00
parent 2fed3982d6
commit d3ee5d7dfe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/LINUX/HAL.h
View File

@@ -23,7 +23,7 @@
#define CPU_32_BIT #define CPU_32_BIT
#define F_CPU 100000000 #define F_CPU 100000000UL
#define SystemCoreClock F_CPU #define SystemCoreClock F_CPU
#include <iostream> #include <iostream>
#include <stdint.h> #include <stdint.h>

4
Marlin/src/HAL/shared/Delay.h
View File

@@ -155,7 +155,7 @@
#endif #endif
// Delay in nanoseconds // Delay in nanoseconds
#define DELAY_NS(x) DELAY_CYCLES( (x) * (F_CPU / 1000000UL) / 1000UL ) #define DELAY_NS(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL) / 1000UL)
// Delay in microseconds // Delay in microseconds
#define DELAY_US(x) DELAY_CYCLES( (x) * (F_CPU / 1000000UL) ) #define DELAY_US(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL))

2
Marlin/src/gcode/gcode_d.cpp
View File

@@ -181,7 +181,7 @@
// Use a low-level delay that does not rely on interrupts to function // Use a low-level delay that does not rely on interrupts to function
// Do not spin forever, to avoid thermal risks if heaters are enabled and // Do not spin forever, to avoid thermal risks if heaters are enabled and
// watchdog does not work. // watchdog does not work.
DELAY_US(10000000); for (int i = 10000; i--;) DELAY_US(1000UL);
ENABLE_ISRS(); ENABLE_ISRS();
SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset."); SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
} }