Browse Source

Move millis_t includes

Scott Lahteine 4 years ago
parent
commit
3473b21710

+ 1
- 0
Marlin/src/HAL/HAL_LPC1768/main.cpp View File

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

+ 2
- 0
Marlin/src/HAL/HAL_STM32/Servo.h View File

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

+ 0
- 1
Marlin/src/HAL/shared/Delay.h View File

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

+ 1
- 1
Marlin/src/core/types.h View File

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

+ 1
- 0
Marlin/src/core/utility.h View File

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

+ 1
- 1
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp View File

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

Loading…
Cancel
Save