jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase and catchup

Browse Source
This commit is contained in:
InsanityAutomation
2020-06-06 11:21:59 -04:00
parent 1c3dcae659
commit 4fdcae6677
4 changed files with 71 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio.ini
+2 -349
View File
@@ -12,7 +12,6 @@
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
default_envs =
mega2560
10SPro_BIL
10SPro_BLT_BIL
CRX_BLT_UBL_NoFil
@@ -277,40 +276,6 @@ default_envs =
S5_AC_ME_NF
S5_BLT_AC_ME_NF
S5_BLT_AC_UBL_ME_NF
CR20_LR
CR20_BLT_LR
CR20_BLT_UBL_LR
CR20_Pro_LR
CR20_Pro_UBL_LR
CR10S_LR
CR10S_BLT_LR
S4_LR
S4_BLT_UBL_LR
S4_BLT_LR
S4_AC_LR
S4_BLT_AC_LR
S4_BLT_AC_UBL_LR
S5_LR
S5_BLT_LR
S5_BLT_UBL_LR
S5_AC_LR
S5_BLT_AC_LR
S5_BLT_AC_UBL_LR
CR10S_NF_LR
CR10S_BLT_NF_LR
CR10S_BLT_UBL_NF_LR
S4_NF_LR
S4_BLT_UBL_NF_LR
S4_BLT_NF_LR
S4_AC_NF_LR
S4_BLT_AC_NF_LR
S4_BLT_AC_UBL_NF_LR
S5_NF_LR
S5_BLT_NF_LR
S5_BLT_UBL_NF_LR
S5_AC_NF_LR
S5_BLT_AC_NF_LR
S5_BLT_AC_UBL_NF_LR
[common]
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
@@ -319,9 +284,9 @@ build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
lib_deps =
LiquidCrystal
TMCStepper@>=0.6.2,<1.0.0
;Adafruit NeoPixel
Adafruit NeoPixel
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
;Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip
SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
@@ -2767,318 +2732,6 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DHotendMosquito -DHotendE3D -DCableExtensionNoiseFilter
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR20_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR20 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR20_BLT_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR20 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR20_BLT_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR20 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR20_Pro_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR20Pro -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR20_Pro_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR20Pro -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR10S_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR10S -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR10S_BLT_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_AC_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_AC_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_AC_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_AC_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_AC_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_AC_UBL_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR10S_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR10S -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR10S_BLT_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:CR10S_BLT_UBL_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_UBL_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_AC_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_AC_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S4_BLT_AC_UBL_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_UBL_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_AC_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_AC_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:S5_BLT_AC_UBL_NF_LR]
platform = atmelavr
board = megaatmega2560
board_build.f_cpu = 16000000L
lib_deps = ${common.lib_deps}
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor
src_filter = ${common.default_src_filter} +<src/HAL/AVR>
[env:mega1280]
platform = atmelavr
board = megaatmega1280