mirror of
https://github.com/felis/USB_Host_Shield_2.0.git
synced 2024-03-22 11:31:26 +01:00
Merge branch 'master' of github.com:felis/USB_Host_Shield_2.0
This commit is contained in:
commit
3f7d052b2e
4 changed files with 6 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
||||||
*.bak
|
*.bak
|
||||||
*.zip
|
*.zip
|
||||||
*.rar
|
*.rar
|
||||||
|
build/
|
|
@ -35,8 +35,8 @@ EXTRA_FLAGS += -D DISABLE_SERIAL3
|
||||||
# The following are the libraries used.
|
# The following are the libraries used.
|
||||||
LIB_DIRS =
|
LIB_DIRS =
|
||||||
LIB_DIRS += ../../
|
LIB_DIRS += ../../
|
||||||
LIB_DIRS += xmem2
|
LIB_DIRS += ../testusbhostFAT/xmem2
|
||||||
LIB_DIRS += generic_storage
|
LIB_DIRS += ../testusbhostFAT/generic_storage
|
||||||
|
|
||||||
# And finally, the part that brings everything together for you.
|
# And finally, the part that brings everything together for you.
|
||||||
include Arduino_Makefile_master/_Makefile.master
|
include Arduino_Makefile_master/_Makefile.master
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit b87902bf7a0934b62f43c2176fb11ea318da8629
|
Subproject commit 071b65b923b2656bb1e1b622de5272b4ed9a4996
|
|
@ -1 +1 @@
|
||||||
Subproject commit b2adf12413e93de01334efeed0e5d46a73eb17ae
|
Subproject commit 8bcf5f90f8bd967378b6eeebd7fd943f125fbc18
|
Loading…
Reference in a new issue