From cb07141e5d9357a3d03cbe90b0caee5bdcc45b9d Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sun, 13 Nov 2016 06:59:33 +0100 Subject: [PATCH 1/3] Add a gitignore file So that I don't accidentally stage output/ all the time... Signed-off-by: Gergely Nagy --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..09b121a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*~ +.#* +/output/ From c2b80f6f20bc8aab6453fcd71126ae87204a9d4e Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sun, 13 Nov 2016 07:29:45 +0100 Subject: [PATCH 2/3] Makefile: md5 is md5sum on Linux Do not hardcode the name of the tool that computes md5 sums, but make it platform-dependent: on at least Debian, the tool is called md5sum. Signed-off-by: Gergely Nagy --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 79781c09..b468ecd7 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ DEVICE_PORT_BOOTLOADER := `ls /dev/ttyACM*` ARDUINO_PATH=/usr/local/arduino ARDUINO_LOCAL_LIB_PATH=$(HOME)/Arduino +MD5 = md5sum + RESET_BOARD=stty -F $(DEVICE_PORT) 1200 ifeq ($(uname_S),Darwin) @@ -21,6 +23,9 @@ DEVICE_PORT_BOOTLOADER := `ls /dev/cu.usbmodem14*` ARDUINO_PATH=/Applications/Arduino.app/Contents/Java/ ARDUINO_LOCAL_LIB_PATH=$(HOME)/Documents/Arduino + +MD5 = md5 + RESET_BOARD=stty -f $(DEVICE_PORT) 1200 endif @@ -110,7 +115,7 @@ size: compile hex-with-bootloader: compile @cat $(HEX_FILE_PATH) | awk '/^:00000001FF/ == 0' > $(HEX_FILE_WITH_BOOTLOADER_PATH) @echo "Using $(BOOTLOADER_PATH)" - @md5 $(BOOTLOADER_PATH) + @$(MD5) $(BOOTLOADER_PATH) @cat $(BOOTLOADER_PATH) >> $(HEX_FILE_WITH_BOOTLOADER_PATH) @echo "Combined firmware and bootloader are now at $(HEX_FILE_WITH_BOOTLOADER_PATH)" @echo "Make sure you have the bootloader version you expect." From 9df42d9c758ce65aa3f960214869add323142bc6 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sun, 13 Nov 2016 07:49:59 +0100 Subject: [PATCH 3/3] library.properties: Drop the dot_a_linkage setting It only causes trouble when trying to use the library from another one, and for the KeyboardioFirmware, serves no useful purpose. Signed-off-by: Gergely Nagy --- library.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/library.properties b/library.properties index 2f1c8d32..8efecb1d 100644 --- a/library.properties +++ b/library.properties @@ -7,4 +7,3 @@ paragraph=... category=Communication url=https://github.com/keyboardio/KeyboardioFirmware architectures=avr -dot_a_linkage=true