Move LPC1768 framework out of Marlin source folder

This commit is contained in:
Thomas Moore 2017-09-19 19:25:59 -05:00
parent f37ed314e0
commit ddbd4b73e0
105 changed files with 38 additions and 10 deletions

View File

@ -1,6 +1,8 @@
import sys
#dynamic build flags for generic compile options #dynamic build flags for generic compile options
if __name__ == "__main__": if __name__ == "__main__":
print " ".join([ "-std=gnu11", args = " ".join([ "-std=gnu11",
"-std=gnu++11", "-std=gnu++11",
"-Os", "-Os",
"-mcpu=cortex-m3", "-mcpu=cortex-m3",
@ -10,13 +12,11 @@ if __name__ == "__main__":
"-fsigned-char", "-fsigned-char",
"-fno-move-loop-invariants", "-fno-move-loop-invariants",
"-Wall",
"--specs=nano.specs", "--specs=nano.specs",
"--specs=nosys.specs", "--specs=nosys.specs",
"-IMarlin/frameworks/CMSIS/LPC1768/include",
"-IMarlin/frameworks/CMSIS/LPC1768/lib",
"-IMarlin/src/HAL", "-IMarlin/src/HAL",
"-IMarlin/src/HAL/HAL_LPC1768/include",
"-MMD", "-MMD",
"-MP", "-MP",
@ -24,6 +24,11 @@ if __name__ == "__main__":
"-DIS_REARM" "-DIS_REARM"
]) ])
for i in range(1, len(sys.argv)):
args += " " + sys.argv[i]
print args
# extra script for linker options # extra script for linker options
else: else:
from SCons.Script import DefaultEnvironment from SCons.Script import DefaultEnvironment
@ -46,6 +51,5 @@ else:
"--specs=nano.specs", "--specs=nano.specs",
"--specs=nosys.specs", "--specs=nosys.specs",
"-u_printf_float", "-u_printf_float",
"-Wl,-TMarlin/frameworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections"
], ],
) )

View File

@ -46,6 +46,10 @@
#include "../module/delta.h" #include "../module/delta.h"
#endif #endif
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
#include "planner.h"
#endif
float zprobe_zoffset; // Initialized by settings.load() float zprobe_zoffset; // Initialized by settings.load()
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_ENDSTOP

View File

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <HAL_LPC1768/arduino.h> #include "arduino.h"
// When the display powers up, it is configured as follows: // When the display powers up, it is configured as follows:
// //

View File

@ -23,7 +23,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <HAL_LPC1768/arduino.h> #include <arduino.h>
#include "Stream.h" #include "Stream.h"

Some files were not shown because too many files have changed in this diff Show More