0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add U8glib as a dependency to platformio.ini for those who use PlatformIO; this makes compiling even easier as u8glib will be downloaded and included automatically.

Browse source 
Also added the new .pio-related directory to .gitignore, and a few ignores for those who use cmake.
This commit is contained in:
Brian 2017-04-30 15:07:01 -04:00
parent 3c0d5ba0a1
commit 627730948d
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -1,6 +1,6 @@
# #
# Marlin 3D Printer Firmware # Marlin 3D Printer Firmware
# Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] # Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
# #
# Based on Sprinter and grbl. # Based on Sprinter and grbl.
# Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm # Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@ -118,6 +118,7 @@ tags
#PlatformIO files/dirs #PlatformIO files/dirs
.pioenvs .pioenvs
.piolib .piolib
.piolibdeps
#Visual Studio #Visual Studio
*.sln *.sln
@ -127,3 +128,7 @@ Marlin/Release/
Marlin/Debug/ Marlin/Debug/
Marlin/__vm/ Marlin/__vm/
Marlin/.vs/ Marlin/.vs/
#cmake
CMakeLists.txt
Marlin/CMakeLists.txt

9
Marlin/platformio.ini
View file

@ -15,14 +15,19 @@
src_dir = ./ src_dir = ./
envs_dir = ../.pioenvs envs_dir = ../.pioenvs
lib_dir = ../.piolib lib_dir = ../.piolib
libdeps_dir = ../.piolibdeps
env_default = mega2560 env_default = mega2560
[common]
lib_deps = U8glib@1.19.1
[env:mega2560] [env:mega2560]
platform = atmelavr platform = atmelavr
framework = arduino framework = arduino
board = megaatmega2560 board = megaatmega2560
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps}
[env:mega1280] [env:mega1280]
platform = atmelavr platform = atmelavr
@ -30,6 +35,7 @@ framework = arduino
board = megaatmega1280 board = megaatmega1280
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps}
[env:printrboard] [env:printrboard]
platform = teensy platform = teensy
@ -38,12 +44,14 @@ board = teensy20pp
build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_PRINTRBOARD build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_PRINTRBOARD
# Bug in arduino framework does not allow boards running at 20Mhz # Bug in arduino framework does not allow boards running at 20Mhz
#board_f_cpu = 20000000L #board_f_cpu = 20000000L
lib_deps = ${common.lib_deps}
[env:brainwavepro] [env:brainwavepro]
platform = teensy platform = teensy
framework = arduino framework = arduino
board = teensy20pp board = teensy20pp
build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO -D AT90USBxx_TEENSYPP_ASSIGNMENTS build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO -D AT90USBxx_TEENSYPP_ASSIGNMENTS
lib_deps = ${common.lib_deps}
[env:rambo] [env:rambo]
platform = atmelavr platform = atmelavr
@ -51,3 +59,4 @@ framework = arduino
board = reprap_rambo board = reprap_rambo
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps}