Moved submodules to lib directory

This commit is contained in:
Christian Colglazier 2020-07-12 11:07:04 -04:00
parent acefe4c778
commit feee29ac7d
5 changed files with 5 additions and 5 deletions

4
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "libDaisy"] [submodule "libDaisy"]
path = libDaisy path = lib/libDaisy
url = git@github.com:electro-smith/libDaisy.git url = git@github.com:electro-smith/libDaisy.git
[submodule "daisySP"] [submodule "daisySP"]
path = daisySP path = lib/daisySP
url = git@github.com:electro-smith/DaisySP.git url = git@github.com:electro-smith/DaisySP.git

View File

@ -2,8 +2,8 @@ TARGET = Main
CPP_SOURCES = src/main.cpp CPP_SOURCES = src/main.cpp
LIBDAISY_DIR = ./libDaisy LIBDAISY_DIR = ./lib/libDaisy
DAISYSP_DIR = ./daisySP DAISYSP_DIR = ./lib/daisySP
SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
include $(SYSTEM_FILES_DIR)/Makefile include $(SYSTEM_FILES_DIR)/Makefile

View File

@ -11,7 +11,7 @@ git push
``` ```
2. Build project 2. Build project
```sh ```sh
cd daisySP && make && cd ../libDaisy && make && cd .. && make cd ./lib/daisySP && make && cd ../libDaisy && make && cd ../.. && make
``` ```
3. Plug usb into Daisy. Enter bootloader mode by holding the BOOT button down, and then pressing the RESET button. Once you release the RESET button, you can also let go of the BOOT button 3. Plug usb into Daisy. Enter bootloader mode by holding the BOOT button down, and then pressing the RESET button. Once you release the RESET button, you can also let go of the BOOT button
4. Write the binary to the Daisy 4. Write the binary to the Daisy