Move millis_t includes
This commit is contained in:
		| @@ -37,6 +37,7 @@ extern "C" { | ||||
|  | ||||
| #include "../../sd/cardreader.h" | ||||
| #include "../../inc/MarlinConfig.h" | ||||
| #include "../../core/millis_t.h" | ||||
| #include "HAL.h" | ||||
| #include "timers.h" | ||||
|  | ||||
|   | ||||
| @@ -24,6 +24,8 @@ | ||||
|  | ||||
| #include <Servo.h> | ||||
|  | ||||
| #include "../../core/millis_t.h" | ||||
|  | ||||
| // Inherit and expand on the official library | ||||
| class libServo : public Servo { | ||||
|   public: | ||||
|   | ||||
| @@ -29,7 +29,6 @@ | ||||
|  *  DELAY_US(count): Delay execution in microseconds | ||||
|  */ | ||||
|  | ||||
| #include "../../core/millis_t.h" | ||||
| #include "../../core/macros.h" | ||||
|  | ||||
| #if defined(__arm__) || defined(__thumb__) | ||||
|   | ||||
| @@ -24,7 +24,7 @@ | ||||
| #include <math.h> | ||||
| #include <stddef.h> | ||||
|  | ||||
| #include "millis_t.h" | ||||
| #include "../inc/MarlinConfigPre.h" | ||||
|  | ||||
| class __FlashStringHelper; | ||||
| typedef const __FlashStringHelper *progmem_str; | ||||
|   | ||||
| @@ -23,6 +23,7 @@ | ||||
|  | ||||
| #include "../inc/MarlinConfigPre.h" | ||||
| #include "../core/types.h" | ||||
| #include "../core/millis_t.h" | ||||
|  | ||||
| // Delay that ensures heaters and watchdog are kept alive | ||||
| void safe_delay(millis_t ms); | ||||
|   | ||||
| @@ -829,7 +829,7 @@ void MarlinUI::draw_status_screen() { | ||||
|                 && !printingIsActive() | ||||
|               #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); | ||||
|               lcd_put_wchar(' '); | ||||
|               _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user