zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pins/tests followup (#21268)

Browse source 
Missing commit from #21254
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
Keith Bennett 2021-03-06 01:50:26 -08:00 committed by GitHub
parent 4182cf3e9e
commit 2c5967925f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -27,6 +27,10 @@
#define BOARD_INFO_NAME "BTT SKR V1.4" #define BOARD_INFO_NAME "BTT SKR V1.4"
#endif #endif
#ifndef BOARD_CUSTOM_BUILD_FLAGS
#define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
#endif
// //
// SD Connection // SD Connection
// //

3
Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
View file

@ -43,6 +43,9 @@
#warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it." #warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
#endif #endif
// Custom flags and defines for the build
//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
#define BOARD_INFO_NAME "LGT KIT V1.0" #define BOARD_INFO_NAME "LGT KIT V1.0"
// //

3
Marlin/src/pins/ramps/pins_RAMPS.h
View file

@ -47,6 +47,9 @@
#include "env_validate.h" #include "env_validate.h"
// Custom flags and defines for the build
//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.4" #define BOARD_INFO_NAME "RAMPS 1.4"
#endif #endif

3
Marlin/src/pins/ramps/pins_RAMPS_S_12.h
View file

@ -36,6 +36,9 @@
#include "env_validate.h" #include "env_validate.h"
// Custom flags and defines for the build
//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS S 1.2" #define BOARD_INFO_NAME "RAMPS S 1.2"
#endif #endif

16
buildroot/share/PlatformIO/scripts/common-dependencies-post.py Normal file
View file

@ -0,0 +1,16 @@
#
# common-dependencies-post.py
# Convenience script to add build flags for Marlin Enabled Features
#
Import("env")
Import("projenv")
def apply_board_build_flags():
if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
return
projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
# We need to add the board build flags in a post script
# so the platform build script doesn't overwrite the custom CCFLAGS
apply_board_build_flags()

7
platformio.ini
View file

@ -215,6 +215,7 @@ extra_scripts =
pre:buildroot/share/PlatformIO/scripts/common-dependencies.py pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
pre:buildroot/share/PlatformIO/scripts/preflight-checks.py pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
build_flags = -fmax-errors=5 -g3 -D__MARLIN_FIRMWARE__ -fmerge-constants build_flags = -fmax-errors=5 -g3 -D__MARLIN_FIRMWARE__ -fmerge-constants
lib_deps = lib_deps =
@ -727,12 +728,6 @@ platform = ${common_LPC.platform}
extends = common_LPC extends = common_LPC
board = nxp_lpc1769 board = nxp_lpc1769
# BTT SKR 1.4 needs a UART3 tweak
[env:LPC1768_btt_skr_v1_4]
platform = ${env:LPC1768.platform}
extends = env:LPC1768
build_flags = ${env:LPC1768.build_flags} -DLPC_PINCFG_UART3_P4_28
################################# #################################
# # # #
# STM32 Architecture # # STM32 Architecture #