diff options
| author |  Jack Humbert <jack.humb@gmail.com> | 2017-10-14 11:32:19 -1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-14 11:32:19 -1000 |
| commit | 800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch) | |
| tree | 718e43d976bc71627558b5f9e1b657e8a64e4131 /keyboards/kinesis | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
| download | qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz | |
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
Diffstat (limited to 'keyboards/kinesis')
| -rw-r--r-- | keyboards/kinesis/kinesis.h | 4 | ||||
| -rw-r--r-- | keyboards/kinesis/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/kinesis/stapelberg/rules.mk | 5 | ||||
| -rw-r--r-- | keyboards/kinesis/subproject.mk | 1 |
4 files changed, 4 insertions, 8 deletions
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h index 66713731f..94e913ebd 100644 --- a/keyboards/kinesis/kinesis.h +++ b/keyboards/kinesis/kinesis.h @@ -1,10 +1,10 @@ #ifndef KINESIS_H #define KINESIS_H -#ifdef SUBPROJECT_alvicstep +#ifdef KEYBOARD_kinesis_alvicstep #include "alvicstep.h" #endif -#ifdef SUBPROJECT_stapelberg +#ifdef KEYBOARD_kinesis_stapelberg #include "stapelberg.h" #endif diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk index a7ff8da8b..c8646449b 100644 --- a/keyboards/kinesis/rules.mk +++ b/keyboards/kinesis/rules.mk @@ -71,3 +71,5 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming CUSTOM_MATRIX=yes # need to do our own thing with the matrix + +DEFAULT_FOLDER = kinesis/alvicstep
\ No newline at end of file diff --git a/keyboards/kinesis/stapelberg/rules.mk b/keyboards/kinesis/stapelberg/rules.mk index fb421a34f..3f2ff2d6c 100644 --- a/keyboards/kinesis/stapelberg/rules.mk +++ b/keyboards/kinesis/stapelberg/rules.mk @@ -1,9 +1,4 @@ -ifndef QUANTUM_DIR - include ../../../Makefile -endif -# just silently stop, since we need to upload with teensy uploader -upload: build diff --git a/keyboards/kinesis/subproject.mk b/keyboards/kinesis/subproject.mk deleted file mode 100644 index 63ee4cafb..000000000 --- a/keyboards/kinesis/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = alvicstep |