Pārlūkot izejas kodu

Dependency adjustments

Scott Lahteine 7 gadus atpakaļ
vecāks
revīzija
1d4571b88d

+ 6
- 1
Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h Parādīt failu

@@ -60,7 +60,10 @@
60 60
  * See the end of this file for details on the hardware/firmware interaction
61 61
  */
62 62
 
63
-#include "fastio.h"
63
+#ifndef _LPC1768_PWM_H_
64
+#define _LPC1768_PWM_H_
65
+
66
+#include "pinmapping.h"
64 67
 
65 68
 #define LPC_PWM1_MR0 19999  // base repetition rate minus one count - 20mS
66 69
 #define LPC_PWM1_PR 24      // prescaler value - prescaler divide by 24 + 1  -  1 MHz output
@@ -73,3 +76,5 @@ bool LPC1768_PWM_attach_pin(pin_t pin, uint32_t min=1, uint32_t max=(LPC_PWM1_MR
73 76
 bool LPC1768_PWM_write(pin_t pin, uint32_t value);
74 77
 bool LPC1768_PWM_detach_pin(pin_t pin);
75 78
 bool useable_hardware_PWM(pin_t pin);
79
+
80
+#endif // _LPC1768_PWM_H_

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/arduino.cpp Parādīt failu

@@ -22,11 +22,11 @@
22 22
 
23 23
 #ifdef TARGET_LPC1768
24 24
 
25
-#include "../../inc/MarlinConfig.h"
26 25
 #include "LPC1768_PWM.h"
27
-
28 26
 #include <lpc17xx_pinsel.h>
29 27
 
28
+#include "../../inc/MarlinConfig.h"
29
+
30 30
 // Interrupts
31 31
 void cli(void) { __disable_irq(); } // Disable
32 32
 void sei(void) { __enable_irq(); }  // Enable

+ 2
- 0
Marlin/src/HAL/HAL_LPC1768/pinmapping.h Parādīt failu

@@ -24,6 +24,8 @@
24 24
 #define __HAL_PINMAPPING_H__
25 25
 #include "../../core/macros.h"
26 26
 
27
+#include <stdint.h>
28
+
27 29
 typedef int16_t pin_t;
28 30
 
29 31
 #define PORT_0  000

+ 0
- 6
Marlin/src/HAL/SPI.h Parādīt failu

@@ -28,12 +28,8 @@
28 28
 #ifndef _SPI_H_
29 29
 #define _SPI_H_
30 30
 
31
-//#include "../inc/MarlinConfig.h"
32
-
33 31
 #include <stdint.h>
34 32
 
35
-#ifndef SPI_FULL_SPEED
36
-
37 33
 /**
38 34
  * SPI speed where 0 <= index <= 6
39 35
  *
@@ -73,6 +69,4 @@ void spiRead(uint8_t* buf, uint16_t nbyte);
73 69
 /** Write token and then write from 512 byte buffer to SPI (for SD card) */
74 70
 void spiSendBlock(uint8_t token, const uint8_t* buf);
75 71
 
76
-#endif // SPI_FULL_SPEED
77
-
78 72
 #endif // _SPI_H_

+ 4
- 4
Marlin/src/Marlin.h Parādīt failu

@@ -22,16 +22,16 @@
22 22
 #ifndef __MARLIN_H__
23 23
 #define __MARLIN_H__
24 24
 
25
-#include <math.h>
26
-#include <stdio.h>
27
-#include <stdlib.h>
28
-
29 25
 #include "inc/MarlinConfig.h"
30 26
 
31 27
 #ifdef DEBUG_GCODE_PARSER
32 28
   #include "gcode/parser.h"
33 29
 #endif
34 30
 
31
+#include <math.h>
32
+#include <stdio.h>
33
+#include <stdlib.h>
34
+
35 35
 void stop();
36 36
 
37 37
 void idle(

+ 0
- 1
Marlin/src/inc/MarlinConfig.h Parādīt failu

@@ -26,7 +26,6 @@
26 26
 #include "../core/boards.h"
27 27
 #include "../core/macros.h"
28 28
 #include "Version.h"
29
-#include "../HAL/SPI.h"
30 29
 #include "../../Configuration.h"
31 30
 #include "Conditionals_LCD.h"
32 31
 #include "../../Configuration_adv.h"

+ 2
- 3
Marlin/src/module/probe.h Parādīt failu

@@ -29,11 +29,10 @@
29 29
 
30 30
 #include "../inc/MarlinConfig.h"
31 31
 
32
-bool set_probe_deployed(const bool deploy);
33
-float probe_pt(const float &rx, const float &ry, const bool, const uint8_t, const bool printable=true);
34
-
35 32
 #if HAS_BED_PROBE
36 33
   extern float zprobe_zoffset;
34
+  bool set_probe_deployed(const bool deploy);
35
+  float probe_pt(const float &rx, const float &ry, const bool, const uint8_t, const bool printable=true);
37 36
   #define DEPLOY_PROBE() set_probe_deployed(true)
38 37
   #define STOW_PROBE() set_probe_deployed(false)
39 38
 #else

+ 1
- 1
Marlin/src/module/stepper.cpp Parādīt failu

@@ -54,12 +54,12 @@
54 54
 #include "planner.h"
55 55
 #include "motion.h"
56 56
 
57
-#include "../Marlin.h"
58 57
 #include "../module/temperature.h"
59 58
 #include "../lcd/ultralcd.h"
60 59
 #include "../core/language.h"
61 60
 #include "../gcode/queue.h"
62 61
 #include "../sd/cardreader.h"
62
+#include "../Marlin.h"
63 63
 
64 64
 #if MB(ALLIGATOR)
65 65
   #include "../feature/dac/dac_dac084s085.h"

Notiek ielāde…
Atcelt
Saglabāt