From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 14 Oct 2017 11:32:19 -1000 Subject: Make arguments redo, subproject elimination (#1784) * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now --- keyboards/handwired/handwired.c | 1 - keyboards/handwired/handwired.h | 1 - keyboards/handwired/kbod/readme.md | 2 +- keyboards/handwired/magicforce61/README.md | 2 +- keyboards/handwired/rules.mk | 0 keyboards/handwired/traveller/rules.mk | 7 ------- 6 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 keyboards/handwired/handwired.c delete mode 100644 keyboards/handwired/handwired.h delete mode 100644 keyboards/handwired/rules.mk (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/handwired.c b/keyboards/handwired/handwired.c deleted file mode 100644 index feef8a919..000000000 --- a/keyboards/handwired/handwired.c +++ /dev/null @@ -1 +0,0 @@ -#include "handwired.h" \ No newline at end of file diff --git a/keyboards/handwired/handwired.h b/keyboards/handwired/handwired.h deleted file mode 100644 index 7a4a4835e..000000000 --- a/keyboards/handwired/handwired.h +++ /dev/null @@ -1 +0,0 @@ -#include "quantum.h" \ No newline at end of file diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md index 67bf711be..d2f2c01ae 100644 --- a/keyboards/handwired/kbod/readme.md +++ b/keyboards/handwired/kbod/readme.md @@ -9,7 +9,7 @@ For the full Quantum feature list, see [the parent readme](/). ## Building -Download or clone the whole firmware and use ```make handwired-kbod-default``` to generate the .hex file. You may flash it with avrdude +Download or clone the whole firmware and use ```make handwired/kbod:default``` to generate the .hex file. You may flash it with avrdude ## Flashing Something along this line: diff --git a/keyboards/handwired/magicforce61/README.md b/keyboards/handwired/magicforce61/README.md index 5a260f9ad..cc8673262 100644 --- a/keyboards/handwired/magicforce61/README.md +++ b/keyboards/handwired/magicforce61/README.md @@ -19,6 +19,6 @@ The following pins are used: ## Compiling and loading the firmware -To build the firmware, run `make handwired-magicforce61`. +To build the firmware, run `make handwired/magicforce61`. Flash the firmware using the teensy loader or avrdude. diff --git a/keyboards/handwired/rules.mk b/keyboards/handwired/rules.mk deleted file mode 100644 index e69de29bb..000000000 diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk index a7f7fc230..62f94b945 100644 --- a/keyboards/handwired/traveller/rules.mk +++ b/keyboards/handwired/traveller/rules.mk @@ -80,10 +80,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 RGBLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../Makefile -endif - -upload: build - $(ATREUS_UPLOAD_COMMAND) - -- cgit v1.2.3-24-g4f1b