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/eco | |
parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
download | qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz qmk_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/eco')
-rw-r--r-- | keyboards/eco/eco.h | 4 | ||||
-rw-r--r-- | keyboards/eco/readme.md | 2 | ||||
-rw-r--r-- | keyboards/eco/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/eco/subproject.mk | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 2cfb8df26..4f8cfabd8 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h | |||
@@ -1,10 +1,10 @@ | |||
1 | #ifndef ECO_H | 1 | #ifndef ECO_H |
2 | #define ECO_H | 2 | #define ECO_H |
3 | 3 | ||
4 | #ifdef SUBPROJECT_rev1 | 4 | #ifdef KEYBOARD_eco_rev1 |
5 | #include "rev1.h" | 5 | #include "rev1.h" |
6 | #endif | 6 | #endif |
7 | #ifdef SUBPROJECT_rev2 | 7 | #ifdef KEYBOARD_eco_rev2 |
8 | #include "rev2.h" | 8 | #include "rev2.h" |
9 | #endif | 9 | #endif |
10 | 10 | ||
diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md index d29aa8ece..afa9d5559 100644 --- a/keyboards/eco/readme.md +++ b/keyboards/eco/readme.md | |||
@@ -10,6 +10,6 @@ Hardware Supported: ECO PCB rev1 Pro Micro | |||
10 | 10 | ||
11 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
12 | 12 | ||
13 | make eco-rev2-that_canadian | 13 | make eco/rev2:that_canadian |
14 | 14 | ||
15 | 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. \ No newline at end of file | 15 | 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. \ No newline at end of file |
diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk index cf26cdc0d..6f4b4fefc 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk | |||
@@ -66,3 +66,5 @@ API_SYSEX_ENABLE = no | |||
66 | 66 | ||
67 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 67 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
68 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 68 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
69 | |||
70 | DEFAULT_FOLDER = eco/rev2 \ No newline at end of file | ||
diff --git a/keyboards/eco/subproject.mk b/keyboards/eco/subproject.mk deleted file mode 100644 index 7c9b39598..000000000 --- a/keyboards/eco/subproject.mk +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | SUBPROJECT_DEFAULT = rev2 | ||