CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move millis_t includes

Browse Source
This commit is contained in:
Scott Lahteine 2020-03-01 09:50:53 -06:00
parent 5e9a10dbae
commit 3473b21710
6 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/HAL/HAL_LPC1768/main.cpp
View File

@ -37,6 +37,7 @@ extern "C" {
#include "../../sd/cardreader.h" #include "../../sd/cardreader.h"
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#include "../../core/millis_t.h"
#include "HAL.h" #include "HAL.h"
#include "timers.h" #include "timers.h"

2
Marlin/src/HAL/HAL_STM32/Servo.h
View File

@ -24,6 +24,8 @@
#include <Servo.h> #include <Servo.h>
#include "../../core/millis_t.h"
// Inherit and expand on the official library // Inherit and expand on the official library
class libServo : public Servo { class libServo : public Servo {
public: public:

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

@ -29,7 +29,6 @@
* DELAY_US(count): Delay execution in microseconds * DELAY_US(count): Delay execution in microseconds
*/ */
#include "../../core/millis_t.h"
#include "../../core/macros.h" #include "../../core/macros.h"
#if defined(__arm__) || defined(__thumb__) #if defined(__arm__) || defined(__thumb__)

2
Marlin/src/core/types.h
View File

@ -24,7 +24,7 @@
#include <math.h> #include <math.h>
#include <stddef.h> #include <stddef.h>
#include "millis_t.h" #include "../inc/MarlinConfigPre.h"
class __FlashStringHelper; class __FlashStringHelper;
typedef const __FlashStringHelper *progmem_str; typedef const __FlashStringHelper *progmem_str;

1
Marlin/src/core/utility.h
View File

@ -23,6 +23,7 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
#include "../core/types.h" #include "../core/types.h"
#include "../core/millis_t.h"
// Delay that ensures heaters and watchdog are kept alive // Delay that ensures heaters and watchdog are kept alive
void safe_delay(millis_t ms); void safe_delay(millis_t ms);

2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View File

@ -829,7 +829,7 @@ void MarlinUI::draw_status_screen() {
&& !printingIsActive() && !printingIsActive()
#endif #endif
) { ) {
xy_pos_t lpos = current_position; toLogical(lpos); const xy_pos_t lpos = current_position.asLogical();
_draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink); _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
lcd_put_wchar(' '); lcd_put_wchar(' ');
_draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink); _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);