Merge pull request #7695 from tcm0116/move_framework

Move LPC1768 framework out of Marlin source folder

Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py

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

Marlin/src/module/probe.cpp

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

frameworks/CMSIS/LPC1768/lib/LiquidCrystal.cpp

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

frameworks/CMSIS/LPC1768/lib/Stream.cpp

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

frameworks/CMSIS/library.json

@@ -0,0 +1,18 @@
+{
+  "name": "CMSIS-LPC1768", 
+  "version": "0.0.0",
+  "frameworks": [], 
+  "platforms": [
+      "nxplpc", 
+      "ststm32"
+  ],
+  "description": "CMSIS library for LPC1768",
+  "build": {
+      "src_filter": "+<LPC1768/*>",
+      "flags": [
+        "-ILPC1768/include",
+        "-ILPC1768/lib",
+        "-Wl,-Tframeworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections"
+    ]
+  }
+}

platformio.ini

@@ -27,7 +27,7 @@ lib_deps =
   https://github.com/trinamic/TMC26XStepper.git
   https://github.com/adafruit/Adafruit_NeoPixel.git
   https://github.com/ameyer/Arduino-L6470.git
-default_src_filter = +<*> -<src/config/examples> -<frameworks>
+default_src_filter = +<*> -<src/config/examples>
 
 [env:megaatmega2560]
 platform = atmelavr
@@ -115,7 +115,9 @@ src_filter = ${common.default_src_filter}
 platform = nxplpc
 board_f_cpu = 100000000L
 build_flags = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
+src_build_flags = -Wall
+build_unflags = -Wall
 lib_ldf_mode = off
-lib_deps = U8glib-ARM
+lib_extra_dirs = frameworks
-src_filter = ${common.default_src_filter} +<frameworks/CMSIS/LPC1768>
+lib_deps = U8glib-ARM, CMSIS-LPC1768
 extra_scripts = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py