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/viterbi | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
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/viterbi')
| -rw-r--r-- | keyboards/viterbi/config.h | 4 | ||||
| -rw-r--r-- | keyboards/viterbi/readme.md | 4 | ||||
| -rw-r--r-- | keyboards/viterbi/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/viterbi/rev1/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/viterbi/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/viterbi/viterbi.h | 2 |
6 files changed, 7 insertions, 13 deletions
diff --git a/keyboards/viterbi/config.h b/keyboards/viterbi/config.h index 55500df79b..863722d7d0 100644 --- a/keyboards/viterbi/config.h +++ b/keyboards/viterbi/config.h @@ -20,8 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif - #endif // CONFIG_H diff --git a/keyboards/viterbi/readme.md b/keyboards/viterbi/readme.md index bc8451ba30..13f3e60566 100644 --- a/keyboards/viterbi/readme.md +++ b/keyboards/viterbi/readme.md @@ -9,12 +9,12 @@ Hardware Availability: [Keebio](https://keeb.io) Make example for this keyboard (after setting up your build environment): - make viterbi-rev1-default + make viterbi/rev1:default Example of flashing this keyboard: - make viterbi-rev1-default-avrdude + make viterbi/rev1:default:avrdude See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/viterbi/rev1/config.h b/keyboards/viterbi/rev1/config.h index d48075198d..68ca5f3626 100644 --- a/keyboards/viterbi/rev1/config.h +++ b/keyboards/viterbi/rev1/config.h @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef REV1_CONFIG_H #define REV1_CONFIG_H -#include "../config.h" +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xCEEB diff --git a/keyboards/viterbi/rev1/rules.mk b/keyboards/viterbi/rev1/rules.mk index 80a942d06f..f845616741 100644 --- a/keyboards/viterbi/rev1/rules.mk +++ b/keyboards/viterbi/rev1/rules.mk @@ -1,5 +1 @@ -BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../Makefile -endif +BACKLIGHT_ENABLE = no
\ No newline at end of file diff --git a/keyboards/viterbi/rules.mk b/keyboards/viterbi/rules.mk index 3f40ff2f82..8a1b94013e 100644 --- a/keyboards/viterbi/rules.mk +++ b/keyboards/viterbi/rules.mk @@ -73,3 +73,5 @@ USE_I2C = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = viterbi/rev1
\ No newline at end of file diff --git a/keyboards/viterbi/viterbi.h b/keyboards/viterbi/viterbi.h index d3d0f64eb7..3474239104 100644 --- a/keyboards/viterbi/viterbi.h +++ b/keyboards/viterbi/viterbi.h @@ -1,7 +1,7 @@ #ifndef VITERBI_H #define VITERBI_H -#ifdef SUBPROJECT_rev1 +#ifdef KEYBOARD_viterbi_rev1 #include "rev1.h" #endif |