diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-10-14 23:32:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 23:32:19 +0200 |
| commit | 800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch) | |
| tree | 718e43d976bc71627558b5f9e1b657e8a64e4131 /keyboards/lets_split | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
| download | qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.xz | |
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/lets_split')
| -rw-r--r-- | keyboards/lets_split/lets_split.h | 6 | ||||
| -rw-r--r-- | keyboards/lets_split/readme.md | 8 | ||||
| -rw-r--r-- | keyboards/lets_split/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/lets_split/subproject.mk | 1 |
4 files changed, 12 insertions, 7 deletions
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 476e7fd2a..d9cfa35a2 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -3,7 +3,11 @@ #include "quantum.h" -#include QMK_SUBPROJECT_H +#ifdef KEYBOARD_lets_split_rev1 + #include "rev1.h" +#else + #include "rev2.h" +#endif // Used to create a keymap using only KC_ prefixed keys #define KC_KEYMAP( \ diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index 300722a1b..c9202de63 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -19,7 +19,7 @@ There is additional information there about flashing and adding RGB underglow. Download or clone the `qmk_firmware` repo and navigate to its top level directory. Once your build environment is setup, you'll be able to generate the default .hex using: ``` -$ make lets_split-rev2-default +$ make lets_split/rev2:default ``` You will see a lot of output and if everything worked correctly you will see the built hex file: @@ -32,7 +32,7 @@ If you would like to use one of the alternative keymaps, or create your own, cop ``` -$ make lets_split-rev2-YOUR_KEYMAP_NAME +$ make lets_split/rev2:YOUR_KEYMAP_NAME ``` If everything worked correctly you will see a file: @@ -115,8 +115,8 @@ not be very difficult to adapt it to support more if required. Flashing ------- -From the top level `qmk_firmware` directory run `make KEYBOARD-SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. -Example: `make lets_split-rev2-default-avrdude` +From the top level `qmk_firmware` directory run `make KEYBOARD:KEYMAP:avrdude` for automatic serial port resolution and flashing. +Example: `make lets_split/rev2:default:avrdude` Choosing which board to plug the USB cable into (choosing Master) diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 7b7224fd4..1bbc0367f 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -75,4 +75,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes -LAYOUTS = ortho_4x12
\ No newline at end of file +LAYOUTS = ortho_4x12 + +DEFAULT_FOLDER = lets_split/rev2
\ No newline at end of file diff --git a/keyboards/lets_split/subproject.mk b/keyboards/lets_split/subproject.mk deleted file mode 100644 index 7c9b39598..000000000 --- a/keyboards/lets_split/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 |