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/levinson | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
| download | firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.bz2 firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.zip | |
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/levinson')
| -rw-r--r-- | keyboards/levinson/keymaps/bakingpy2u/config.h | 2 | ||||
| -rw-r--r-- | keyboards/levinson/keymaps/default/config.h | 2 | ||||
| -rw-r--r-- | keyboards/levinson/levinson.h | 2 | ||||
| -rw-r--r-- | keyboards/levinson/readme.md | 4 | ||||
| -rw-r--r-- | keyboards/levinson/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/levinson/subproject.mk | 1 |
6 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/levinson/keymaps/bakingpy2u/config.h b/keyboards/levinson/keymaps/bakingpy2u/config.h index 6b409bf0d..a2b1e089c 100644 --- a/keyboards/levinson/keymaps/bakingpy2u/config.h +++ b/keyboards/levinson/keymaps/bakingpy2u/config.h @@ -1,7 +1,7 @@ #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" /* Use I2C or Serial, not both */ diff --git a/keyboards/levinson/keymaps/default/config.h b/keyboards/levinson/keymaps/default/config.h index 7f33a4363..4c7e48dc0 100644 --- a/keyboards/levinson/keymaps/default/config.h +++ b/keyboards/levinson/keymaps/default/config.h @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" /* Use I2C or Serial, not both */ diff --git a/keyboards/levinson/levinson.h b/keyboards/levinson/levinson.h index c69a06fab..896c5232f 100644 --- a/keyboards/levinson/levinson.h +++ b/keyboards/levinson/levinson.h @@ -3,7 +3,7 @@ #include "quantum.h" -#include QMK_SUBPROJECT_H +#include "rev1.h" // Used to create a keymap using only KC_ prefixed keys #define KC_KEYMAP( \ diff --git a/keyboards/levinson/readme.md b/keyboards/levinson/readme.md index 1fcad3c1b..94dd7bf04 100644 --- a/keyboards/levinson/readme.md +++ b/keyboards/levinson/readme.md @@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io) Make example for this keyboard (after setting up your build environment): - make levinson-rev1-default + make levinson/rev1:default Example of flashing this keyboard: - make levinson-rev1-default-avrdude + make levinson/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/levinson/rules.mk b/keyboards/levinson/rules.mk index 7b7224fd4..ba0f5b91d 100644 --- a/keyboards/levinson/rules.mk +++ b/keyboards/levinson/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 = levinson/rev1
\ No newline at end of file diff --git a/keyboards/levinson/subproject.mk b/keyboards/levinson/subproject.mk deleted file mode 100644 index 928b1edd0..000000000 --- a/keyboards/levinson/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev1 |