Undo numist's nicer code layout so we can build as a 'regular' arduino sketch

pull/19/head
Jesse Vincent 8 years ago
parent 1f39939b23
commit 446036d158

6
.gitmodules vendored

@ -1,6 +0,0 @@
[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

@ -2,7 +2,7 @@
#include "implementation/Model01.h"
#include "Model01.h"
// These global proxy functions are a cheap hack to avoid

@ -11,12 +11,12 @@ GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always)
ARDUINO_PATH=/Applications/Arduino.app/Contents/Java/
ARDUINO_TOOLS_PATH=$(ARDUINO_PATH)/hardware/tools
FQBN=arduino:avr:leonardo
FQBN=keyboardio:avr:model01
BUILD_PATH := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'build')
OUTPUT_PATH=../output
ARDUINO_LOCAL_LIB_PATH=../libraries
OUTPUT_PATH=./output
ARDUINO_LOCAL_LIB_PATH=$(HOME)/Documents/Arduino
ARDUINO_IDE_VERSION=100607
VERBOSE= #-verbose
VERBOSE= -verbose
SKETCH=KeyboardioFirmware.ino
@ -45,6 +45,7 @@ dirs:
compile: dirs
$(ARDUINO_PATH)/arduino-builder \
-hardware $(ARDUINO_PATH)/hardware \
-hardware $(ARDUINO_LOCAL_LIB_PATH)/hardware \
-tools $(ARDUINO_TOOLS_PATH) \
-tools $(ARDUINO_PATH)/tools-builder \
-fqbn $(FQBN) \

@ -6,8 +6,8 @@
#include "KeyboardioScanner.h"
#include <Wire.h>
#include "../keymaps.h"
#include "../key_events.h"
#include "keymaps.h"
#include "key_events.h"

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

@ -1 +0,0 @@
Subproject commit d8ca9f20791e7f69ce7d66726186f81401193288
Loading…
Cancel
Save