Browse Source

Add needed platform defined gaurds to compile with Arduino IDE

Also removed explicit platform HAL directory inclusion from platformio.ini to make sure these errors are caught by Travis in the future
Christopher Pepper 8 years ago
parent
commit
b908e38d08

+ 4
- 0
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#ifdef TARGET_LPC1768
24
+
23
 #include "../../../macros.h"
25
 #include "../../../macros.h"
24
 #include "../HAL.h"
26
 #include "../HAL.h"
25
 #include "HardwareSerial.h"
27
 #include "HardwareSerial.h"
634
 #ifdef __cplusplus
636
 #ifdef __cplusplus
635
 }
637
 }
636
 #endif
638
 #endif
639
+
640
+#endif // TARGET_LPC1768

+ 2
- 1
Marlin/src/HAL/HAL_LPC1768/LPC1768_Servo.cpp View File

61
  *
61
  *
62
  */
62
  */
63
 
63
 
64
+#ifdef TARGET_LPC1768
64
 
65
 
65
 #if HAS_SERVOS
66
 #if HAS_SERVOS
66
 
67
 
166
 
167
 
167
 #endif // HAS_SERVOS
168
 #endif // HAS_SERVOS
168
 
169
 
169
-
170
+#endif // TARGET_LPC1768
170
 
171
 

+ 3
- 0
Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.cpp View File

29
 http://arduiniana.org.
29
 http://arduiniana.org.
30
 */
30
 */
31
 
31
 
32
+#ifdef TARGET_LPC1768
32
 
33
 
33
 //
34
 //
34
 // Includes
35
 // Includes
396
   // Read from "head"
397
   // Read from "head"
397
   return _receive_buffer[_receive_buffer_head];
398
   return _receive_buffer[_receive_buffer_head];
398
 }
399
 }
400
+
401
+#endif // TARGET_LPC1768

+ 4
- 0
Marlin/src/HAL/HAL_LPC1768/WInterrupts.cpp View File

16
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
16
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
17
 */
17
 */
18
 
18
 
19
+#ifdef TARGET_LPC1768
20
+
19
 #include "../../../macros.h"
21
 #include "../../../macros.h"
20
 #include "../HAL.h"
22
 #include "../HAL.h"
21
 #include "arduino.h"
23
 #include "arduino.h"
222
 }
224
 }
223
 }
225
 }
224
 #endif
226
 #endif
227
+
228
+#endif // TARGET_LPC1768

+ 9
- 9
platformio.ini View File

25
   https://github.com/lincomatic/LiquidTWI2.git
25
   https://github.com/lincomatic/LiquidTWI2.git
26
   https://github.com/teemuatlut/TMC2130Stepper.git
26
   https://github.com/teemuatlut/TMC2130Stepper.git
27
   https://github.com/adafruit/Adafruit_NeoPixel.git
27
   https://github.com/adafruit/Adafruit_NeoPixel.git
28
-default_src_filter = +<*> -<example_configurations> -<src/HAL/HAL_*> -<frameworks>
28
+default_src_filter = +<*> -<example_configurations> -<frameworks>
29
 
29
 
30
 [env:megaatmega2560]
30
 [env:megaatmega2560]
31
 platform = atmelavr
31
 platform = atmelavr
34
 build_flags = -I $BUILDSRC_DIR
34
 build_flags = -I $BUILDSRC_DIR
35
 board_f_cpu = 16000000L
35
 board_f_cpu = 16000000L
36
 lib_deps = ${common.lib_deps}
36
 lib_deps = ${common.lib_deps}
37
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
37
+src_filter = ${common.default_src_filter}
38
 
38
 
39
 [env:megaatmega1280]
39
 [env:megaatmega1280]
40
 platform = atmelavr
40
 platform = atmelavr
43
 build_flags = -I $BUILDSRC_DIR
43
 build_flags = -I $BUILDSRC_DIR
44
 board_f_cpu = 16000000L
44
 board_f_cpu = 16000000L
45
 lib_deps = ${common.lib_deps}
45
 lib_deps = ${common.lib_deps}
46
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
46
+src_filter = ${common.default_src_filter}
47
 
47
 
48
 [env:printrboard]
48
 [env:printrboard]
49
 platform = teensy
49
 platform = teensy
53
 # Bug in arduino framework does not allow boards running at 20Mhz
53
 # Bug in arduino framework does not allow boards running at 20Mhz
54
 #board_f_cpu = 20000000L
54
 #board_f_cpu = 20000000L
55
 lib_deps = ${common.lib_deps}
55
 lib_deps = ${common.lib_deps}
56
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
56
+src_filter = ${common.default_src_filter}
57
 
57
 
58
 [env:printrboard_revf]
58
 [env:printrboard_revf]
59
 platform = teensy
59
 platform = teensy
68
 board = teensy20pp
68
 board = teensy20pp
69
 build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO
69
 build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO
70
 lib_deps = ${common.lib_deps}
70
 lib_deps = ${common.lib_deps}
71
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
71
+src_filter = ${common.default_src_filter}
72
 
72
 
73
 [env:rambo]
73
 [env:rambo]
74
 platform = atmelavr
74
 platform = atmelavr
77
 build_flags = -I $BUILDSRC_DIR
77
 build_flags = -I $BUILDSRC_DIR
78
 board_f_cpu = 16000000L
78
 board_f_cpu = 16000000L
79
 lib_deps = ${common.lib_deps}
79
 lib_deps = ${common.lib_deps}
80
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
80
+src_filter = ${common.default_src_filter}
81
 
81
 
82
 [env:anet10]
82
 [env:anet10]
83
 platform = atmelavr
83
 platform = atmelavr
98
 board = due
98
 board = due
99
 build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_RAMPS4DUE_EFB
99
 build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_RAMPS4DUE_EFB
100
 lib_deps = ${common.lib_deps}
100
 lib_deps = ${common.lib_deps}
101
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_DUE>
101
+src_filter = ${common.default_src_filter}
102
 
102
 
103
 [env:teensy35]
103
 [env:teensy35]
104
 platform = teensy
104
 platform = teensy
107
 build_flags = -I $BUILDSRC_DIR
107
 build_flags = -I $BUILDSRC_DIR
108
 lib_deps = ${common.lib_deps}
108
 lib_deps = ${common.lib_deps}
109
 lib_ignore = Adafruit NeoPixel
109
 lib_ignore = Adafruit NeoPixel
110
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
110
+src_filter = ${common.default_src_filter}
111
 
111
 
112
 [env:Re-ARM]
112
 [env:Re-ARM]
113
 platform = nxplpc
113
 platform = nxplpc
115
 build_flags = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
115
 build_flags = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
116
 lib_ldf_mode = off
116
 lib_ldf_mode = off
117
 lib_deps = U8glib-ARM
117
 lib_deps = U8glib-ARM
118
-src_filter = ${common.default_src_filter} +<src/HAL/HAL_LPC1768> +<frameworks/CMSIS/LPC1768>
118
+src_filter = ${common.default_src_filter} +<frameworks/CMSIS/LPC1768>
119
 extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
119
 extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py

Loading…
Cancel
Save