Merge branch 'dependency-integration'

* dependency-integration:
  Add some notes to the README about how to get a working build environment
  installed arduino toolchain is another level up now as well
  Travis needs to `cd` into `/source` before invoking make
  Roll back local changes
  Default action for `make` should be `build`
  Move firmware into /source, deps as submodules in /libraries
pull/18/head
Jesse Vincent 8 years ago
commit b9748f204f

6
.gitmodules vendored

@ -0,0 +1,6 @@
[submodule "libraries/KeyboardioScanner"]
path = libraries/KeyboardioScanner
url = https://github.com/keyboardio/KeyboardioScanner.git
[submodule "libraries/HID"]
path = libraries/HID
url = https://github.com/keyboardio/HID.git

@ -5,15 +5,12 @@ before_install:
- tar xf arduino-1.6.7-linux64.tar.xz
- popd
install:
- mkdir ../libs
- pushd ../libs
- git clone https://github.com/keyboardio/KeyboardioScanner.git
- git clone https://github.com/keyboardio/KeyboardioWS2812.git
- git clone https://github.com/keyboardio/HID.git
- git clone https://github.com/keyboardio/KeyboardioSX1509.git
- popd
- git submodule sync --recursive
- git submodule update --init --recursive
script:
- make compile size ARDUINO_PATH=../arduino-1.6.7 ARDUINO_LOCAL_LIB_PATH=../libs
- pushd source
- make ARDUINO_PATH=../../arduino-1.6.7
- popd
notifications:
irc:
channels:

@ -2,6 +2,18 @@ We're in the midst of refactoring our really bad prototype firmware into a more
Right now, the code is really ugly. It'll be nicer soon. Please don't judge us too harshly.
# Getting Started
Once you have a git checkout, you'll need to pull in the libraries we
depend on. To do that:
$ cd KeyboardioFirmware
$ git submodule init
$ git submodule update
$ cd source
$ make
<3 jesse
[![Build

@ -0,0 +1 @@
Subproject commit 490350650f9b9bf859ae8d16a0a77eab1d362637

@ -0,0 +1 @@
Subproject commit 9810df50b2f66da02510707126181982692a41b8

@ -6,7 +6,7 @@ HARDWARE_IMPLEMENTATION KeyboardHardware;
void led_set_crgb_at(uint8_t i, cRGB crgb) {
KeyboardHardware.led_set_crgb_at(i,crgb);
}
cRGB led_get_crgb_at(uint8_t i){
cRGB led_get_crgb_at(uint8_t i) {
KeyboardHardware.led_get_crgb_at(i);
}
void led_sync(void) {

@ -14,8 +14,8 @@ ARDUINO_PATH=/Applications/Arduino.app/Contents/Java/
ARDUINO_TOOLS_PATH=$(ARDUINO_PATH)/hardware/tools
FQBN=arduino:avr:leonardo
BUILD_PATH := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'build')
OUTPUT_PATH=./output
ARDUINO_LOCAL_LIB_PATH=~/Documents/Arduino/libraries
OUTPUT_PATH=../output
ARDUINO_LOCAL_LIB_PATH=../libraries
ARDUINO_IDE_VERSION=100607
VERBOSE= #-verbose
SKETCH=KeyboardioFirmware.ino
@ -28,7 +28,8 @@ HEX_FILE_PATH=$(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX).hex
ELF_FILE_PATH=$(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX).elf
# default action for `make` is `build`
build: compile size
astyle:
find . -type f -name \*.cpp |xargs -n 1 astyle --style=google
@ -42,8 +43,6 @@ generate-keymaps:
dirs:
mkdir -p $(OUTPUT_PATH)
build: compile size
compile: dirs
$(ARDUINO_PATH)/arduino-builder \
-hardware $(ARDUINO_PATH)/hardware \
Loading…
Cancel
Save