CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libraries from the registry

Browse Source
This commit is contained in:
Scott Lahteine 2020-06-22 21:28:04 -05:00 committed by Scott Lahteine
parent 40fce56585
commit a0bbdde421
4 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-builds.yml vendored
View File

@ -106,6 +106,6 @@ jobs:
# Inline tests script # Inline tests script
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0 [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
chmod +x buildroot/bin/* chmod +x buildroot/bin/*
chmod +x buildroot/share/tests/* chmod +x buildroot/tests/*
export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH} export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
run_tests . ${{ matrix.test-platform }} run_tests . ${{ matrix.test-platform }}

3
buildroot/share/git/mftest
View File

@ -9,7 +9,8 @@
MFINFO=$(mfinfo) || exit 1 MFINFO=$(mfinfo) || exit 1
[[ -d Marlin/src ]] || { echo "Please 'cd' up to repo root." ; exit 1 ; } [[ -d Marlin/src ]] || { echo "Please 'cd' up to repo root." ; exit 1 ; }
TESTPATH=buildroot/share/tests TESTPATH=buildroot/tests
STATE_FILE=$( echo ./.pio/.mftestrc ) STATE_FILE=$( echo ./.pio/.mftestrc )
SED=$(which gsed || which sed) SED=$(which gsed || which sed)

1
buildroot/share/tests/.gitattributes vendored
View File

@ -1 +0,0 @@
* text=auto eol=lf

60
platformio.ini
View File

@ -25,18 +25,18 @@ default_envs = mega2560
# #
[common] [common]
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
lib_deps = lib_deps =
LiquidCrystal LiquidCrystal@1.5.0
TMCStepper@>=0.7.0 TMCStepper@~0.7.0
Adafruit MAX31865 library@>=1.1,<1.2 Adafruit MAX31865 library@~1.1.0
Adafruit NeoPixel Adafruit NeoPixel@1.5.0
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip U8glib-HAL@0.4.1
LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip Arduino-L6470@0.8.0
Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip SlowSoftI2CMaster
LiquidTWI2@1.2.7
SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
# #
# Default values apply to all 'env:' prefixed environments # Default values apply to all 'env:' prefixed environments
@ -283,20 +283,20 @@ debug_tool = jlink
[common_LPC] [common_LPC]
platform = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip platform = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
board = nxp_lpc1768 board = nxp_lpc1768
build_flags = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
lib_ldf_mode = off lib_ldf_mode = off
lib_compat_mode = strict lib_compat_mode = strict
extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py
src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> src_filter = ${common.default_src_filter} +<src/HAL/LPC1768>
lib_deps = Servo lib_deps = Servo
LiquidCrystal LiquidCrystal@1.0.0
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip U8glib-HAL@0.4.1
TMCStepper@>=0.6.2 TMCStepper@~0.7.0
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
# debug options for backtrace build_flags = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
# -funwind-tables # debug options for backtrace
# -mpoke-function-name #-funwind-tables
#-mpoke-function-name
# #
# NXP LPC176x ARM Cortex-M3 # NXP LPC176x ARM Cortex-M3
@ -376,10 +376,18 @@ build_flags = ${common_stm32f1.build_flags}
-DGENERIC_BOOTLOADER -DGENERIC_BOOTLOADER
extra_scripts = pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py extra_scripts = pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
lib_deps = ${common_stm32f1.lib_deps} lib_deps =
USBComposite for STM32F1@==0.91 TMCStepper@~0.7.0
Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use Adafruit MAX31865 library@~1.1.0
lib_ignore = SPI, LiquidCrystal U8glib-HAL@0.4.1
Arduino-L6470@0.8.0
SlowSoftI2CMaster
LiquidTWI2@1.2.7
Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
USBComposite for STM32F1@0.91
lib_ignore = SPI
debug_tool = stlink debug_tool = stlink
upload_protocol = dfu upload_protocol = dfu
@ -417,7 +425,7 @@ platform = ${common_stm32f1.platform}
extends = env:STM32F103RC_btt extends = env:STM32F103RC_btt
build_flags = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE build_flags = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE
lib_deps = ${env:STM32F103RC_btt.lib_deps} lib_deps = ${env:STM32F103RC_btt.lib_deps}
USBComposite for STM32F1@==0.91 USBComposite for STM32F1@0.91
[env:STM32F103RC_btt_512K] [env:STM32F103RC_btt_512K]
platform = ${common_stm32f1.platform} platform = ${common_stm32f1.platform}
@ -430,7 +438,7 @@ platform = ${common_stm32f1.platform}
extends = env:STM32F103RC_btt_512K extends = env:STM32F103RC_btt_512K
build_flags = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE build_flags = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE
lib_deps = ${env:STM32F103RC_btt_512K.lib_deps} lib_deps = ${env:STM32F103RC_btt_512K.lib_deps}
USBComposite for STM32F1@==0.91 USBComposite for STM32F1@0.91
# #
# STM32F103RE # STM32F103RE
@ -459,7 +467,7 @@ platform = ${common_stm32f1.platform}
extends = env:STM32F103RE_btt extends = env:STM32F103RE_btt
build_flags = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE build_flags = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
lib_deps = ${common_stm32f1.lib_deps} lib_deps = ${common_stm32f1.lib_deps}
USBComposite for STM32F1@==0.91 USBComposite for STM32F1@0.91
# #
# STM32F4 with STM32GENERIC # STM32F4 with STM32GENERIC