Merge branch 'algernon-f/lib/dir-rearrangement'

8 years ago · 3087163148
parent 432f3596bb cd9bfa4126
commit 3087163148
25 changed files with 14 additions and 3 deletions
--- a/7
+++ b/7
@ -38,8 +38,8 @@ astyle:
 		find . -type f -name \*.h |xargs -n 1 astyle --style=google

 generate-keymaps:
-	-rm generated/keymaps.h
-	cd layouts && ( find . -type f |xargs -n 1 -I % sh -c 'perl ../tools/generate_keymaps.pl < % >> ../generated/keymaps.h' )
+	-rm src/generated/keymaps.h
+	cd layouts && ( find . -type f |xargs -n 1 -I % sh -c 'perl ../tools/generate_keymaps.pl < % >> ../src/generated/keymaps.h' )

 dirs:
 	mkdir -p $(OUTPUT_PATH)
@ -52,10 +52,11 @@ compile: dirs
 		-tools $(ARDUINO_PATH)/tools-builder  \
 		-fqbn $(FQBN) \
 		-libraries $(ARDUINO_LOCAL_LIB_PATH) \
+		-libraries . \
 		$(VERBOSE) \
 		-build-path $(BUILD_PATH) \
 		-ide-version $(ARDUINO_IDE_VERSION) \
-		$(SKETCH)
+		examples/KeyboardioFirmware/$(SKETCH)
 	@cp $(BUILD_PATH)/$(SKETCH).hex $(HEX_FILE_PATH)
 	@cp $(BUILD_PATH)/$(SKETCH).elf $(ELF_FILE_PATH)
 	@echo "Firmware is available at $(HEX_FILE_PATH)"
--- a/examples/KeyboardioFirmware/KeyboardioFirmware.ino
+++ b/examples/KeyboardioFirmware/KeyboardioFirmware.ino
--- a/library.properties
+++ b/library.properties
@ -0,0 +1,10 @@
+name=KeyboardioFirmware
+version=0.0.1
+author=Jesse Vincent
+maintainer=Jesse Vincent <jesse@keyboard.io>
+sentence=Firmware for the Keyboardio Model 01.
+paragraph=...
+category=Communication
+url=https://github.com/keyboardio/KeyboardioFirmware
+architectures=avr
+dot_a_linkage=true
--- a/src/KeyboardConfig.cpp
+++ b/src/KeyboardConfig.cpp
--- a/src/KeyboardConfig.h
+++ b/src/KeyboardConfig.h
--- a/src/KeyboardioFirmware.h
+++ b/src/KeyboardioFirmware.h
--- a/src/LEDControl.cpp
+++ b/src/LEDControl.cpp
--- a/src/LEDControl.h
+++ b/src/LEDControl.h
--- a/src/Model01.cpp
+++ b/src/Model01.cpp
--- a/src/Model01.h
+++ b/src/Model01.h
--- a/src/MouseWrapper.cpp
+++ b/src/MouseWrapper.cpp
--- a/src/MouseWrapper.h
+++ b/src/MouseWrapper.h
--- a/src/Storage.cpp
+++ b/src/Storage.cpp
--- a/src/Storage.h
+++ b/src/Storage.h
--- a/src/TestMode.cpp
+++ b/src/TestMode.cpp
--- a/src/TestMode.h
+++ b/src/TestMode.h
--- a/src/generated/keymaps.h
+++ b/src/generated/keymaps.h
--- a/src/key_defs.h
+++ b/src/key_defs.h
--- a/src/key_events.cpp
+++ b/src/key_events.cpp
--- a/src/key_events.h
+++ b/src/key_events.h
--- a/src/keymap_metadata.h
+++ b/src/keymap_metadata.h
--- a/src/keyswitch_state.cpp
+++ b/src/keyswitch_state.cpp
--- a/src/keyswitch_state.h
+++ b/src/keyswitch_state.h
--- a/src/utils.cpp
+++ b/src/utils.cpp
--- a/src/utils.h
+++ b/src/utils.h