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 | |
| 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')
197 files changed, 298 insertions, 620 deletions
diff --git a/keyboards/9key/readme.md b/keyboards/9key/readme.md index 0aa0edf31f..8c66991293 100644 --- a/keyboards/9key/readme.md +++ b/keyboards/9key/readme.md @@ -12,6 +12,6 @@ Hardware Availability: [BishopKeyboards.com](http://bishopkeyboards.com/) Make example for this keyboard (after setting up your build environment): - make 9key-default + make 9key:default 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/alps64/readme.md b/keyboards/alps64/readme.md index f282730490..d6308ab190 100644 --- a/keyboards/alps64/readme.md +++ b/keyboards/alps64/readme.md @@ -3,12 +3,12 @@ Alps64 An Alps-only 60% board designed by Hasu. -Keyboard Maintainer: QMK Community -Hardware Supported: Alps64 PCB +Keyboard Maintainer: QMK Community +Hardware Supported: Alps64 PCB Hardware Availability: https://geekhack.org/index.php?topic=69666.0 Make example for this keyboard (after setting up your build environment): - make alps64-default + make alps64:default 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/amj40/readme.md b/keyboards/amj40/readme.md index e705f20fea..42c5374d52 100755 --- a/keyboards/amj40/readme.md +++ b/keyboards/amj40/readme.md @@ -1,35 +1,14 @@ -AMJ40 keyboard firmware -====================== -DIY/Assembled compact 40% keyboard. - -Ported by N.Hou from the original TMK firmware. - -*Supports both backlight LEDs as well as RGB underglow. - -*For reference, the AMJ40 uses pin D3 for underglow lighting. - -## Quantum MK Firmware - -For the full Quantum feature list, see [the parent readme.md](/readme.md). - -## Building - -Download or clone the whole firmware and navigate to the keyboards/amj40 -folder. Once your dev env is setup, you'll be able to type `make` to generate -your .hex - you can then use `make dfu` to program your PCB once you hit the -reset button. - -Depending on which keymap you would like to use, you will have to compile -slightly differently. - -### Default -To build with the default keymap, simply run `sudo make all`. -The .hex file will appear in the root of the qmk firmware folder. - +AMJ40 +=== +DIY/Assembled compact 40% keyboard. +Keyboard Maintainer: QMK Community +Hardware Supported: AMJ40 PCB +Hardware Availability: https://geekhack.org/index.php?topic=87961.0 -### Original tmk firmware -The original firmware that was used to port to qmk can be found [here](https://github.com/AMJKeyboard/AMJ40). +Make example for this keyboard (after setting up your build environment): + make amj40:default +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/amj60/readme.md b/keyboards/amj60/readme.md index b7107c7cfb..e87b1f9f82 100644 --- a/keyboards/amj60/readme.md +++ b/keyboards/amj60/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=77636.0 Make example for this keyboard (after setting up your build environment): - make amj60-maximized + make amj60:maximized 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/amjpad/readme.md b/keyboards/amjpad/readme.md index cf7c197ecd..27d5e09270 100644 --- a/keyboards/amjpad/readme.md +++ b/keyboards/amjpad/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83546.0 Make example for this keyboard (after setting up your build environment): - make amjpad-default + make amjpad:default 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/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h index ea5821ee76..e63a7340c7 100644 --- a/keyboards/atomic/keymaps/pvc/config.h +++ b/keyboards/atomic/keymaps/pvc/config.h @@ -15,37 +15,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#undef PRODUCT_ID #define PRODUCT_ID 0x0419 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ortholinear Keyboards -#define PRODUCT The Atomic Keyboard -#define DESCRIPTION A compact ortholinear keyboard /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D5, B5, B6, B3 } -#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } -#define UNUSED_PINS - #define BACKLIGHT_PIN B7 #define BACKLIGHT_BREATHING diff --git a/keyboards/atomic/readme.md b/keyboards/atomic/readme.md index 1224c415f0..54a6ee9b54 100644 --- a/keyboards/atomic/readme.md +++ b/keyboards/atomic/readme.md @@ -5,12 +5,12 @@ Atomic A compact 60% (15x5) ortholinear keyboard kit made and sold by OLKB. [More info on qmk.fm](http://qmk.fm/atomic/) -Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert) -Hardware Supported: Atomic PCB rev1, Teensy 2.0 +Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert) +Hardware Supported: Atomic PCB rev1, Teensy 2.0 Hardware Availability: no longer available Make example for this keyboard (after setting up your build environment): - make atomic-default + make atomic:default 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/atreus/keymaps/dvorak_42_key/README.md b/keyboards/atreus/keymaps/dvorak_42_key/README.md index 45e3ab75cc..86ce738023 100644 --- a/keyboards/atreus/keymaps/dvorak_42_key/README.md +++ b/keyboards/atreus/keymaps/dvorak_42_key/README.md @@ -7,7 +7,7 @@ How to build and flash ---------------------- to build; -make atreus-dvorak_42_key +make atreus:dvorak_42_key to flash: avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_dvorak_42_key.hex -P COM7 diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c index 8f8c319c54..02980378d4 100644 --- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c +++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c @@ -15,7 +15,7 @@ static bool mouse_lock = false; // building instructions: -// make atreus-dvorak_42_key +// make atreus:dvorak_42_key // flashing instructions: // avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_dvorak_42_key.hex -P COM7 diff --git a/keyboards/atreus/readme.md b/keyboards/atreus/readme.md index ef464a1b49..221c7fac4a 100644 --- a/keyboards/atreus/readme.md +++ b/keyboards/atreus/readme.md @@ -5,12 +5,12 @@ A small mechanical keyboard that is based around the shape of the human hand. These configuration files are specifically for the Atreus keyboards created by Phil Hagelberg (@technomancy). This keyboard is available in two variants: one powered by a Teensy 2, (usually hand-wired) one powered by an A-Star. (usually using a PCB) This repository currently assumes that you have an A-Star powered Atreus. If you are using a Teensy2, specify that by adding `TEENSY2=yes` to your `make` commands. -Keyboard Maintainer: QMK Community -Hardware Supported: Atreus PCB +Keyboard Maintainer: QMK Community +Hardware Supported: Atreus PCB Hardware Availability: https://atreus.technomancy.us Make example for this keyboard (after setting up your build environment): - make atreus-default-avrdude + make atreus: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/atreus62/readme.md b/keyboards/atreus62/readme.md index d68d1b615b..b2de90011c 100644 --- a/keyboards/atreus62/readme.md +++ b/keyboards/atreus62/readme.md @@ -5,12 +5,12 @@ A 62 key variant of the Atreus keyboard. https://github.com/profet23/atreus62 -Keyboard Maintainer: QMK Community -Hardware Supported: Atreus62 PCB +Keyboard Maintainer: QMK Community +Hardware Supported: Atreus62 PCB Hardware Availability: http://shop.profetkeyboards.com/product/atreus62-keyboard Make example for this keyboard (after setting up your build environment): - make atreus62-default + make atreus62:default 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/bananasplit/README.md b/keyboards/bananasplit/README.md index b059a0834d..cd1e15d775 100644 --- a/keyboards/bananasplit/README.md +++ b/keyboards/bananasplit/README.md @@ -1,29 +1,15 @@ -# BananaSplit60 keyboard firmware +BananaSplit60 +=== -Ported from evangs/tmk_keyboard +A 60% PCB featuring a split spacebar. -## Quantum MK Firmware +Keyboard Maintainer: QMK Community +Hardware Supported: BananaSplit60 PCB +Hardware Availability: https://thevankeyboards.com/products/gb-bananasplit-60-keyboard-kit?variant=42149104910 -For the full Quantum feature list, see [the parent readme](/). +Make example for this keyboard (after setting up your build environment): -## Building + make bananasplit:default -Download or clone the whole firmware and navigate to the keyboards/bananasplit folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +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. -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default - -To build with the default keymap, simply run `make default`. - -### Other Keymaps - -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. - -To build the firmware binary hex file with a keymap just do `make` with a keymap like this: - -``` -$ make [default|jack|<name>] -``` - -Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/bantam44/readme.md b/keyboards/bantam44/readme.md index 494800958e..0103c16472 100644 --- a/keyboards/bantam44/readme.md +++ b/keyboards/bantam44/readme.md @@ -3,12 +3,12 @@ Bantam-44 A small mechanical keyboard. -Keyboard Maintainer: QMK Community -Hardware Supported: Bantam-44 PCB +Keyboard Maintainer: QMK Community +Hardware Supported: Bantam-44 PCB Hardware Availability: http://www.bantamkeyboards.com Make example for this keyboard (after setting up your build environment): - make bantam44-default + make bantam44:default 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/chibios_test/boards/GENERIC_STM32_F103/board.mk b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk index 48e0e51fe6..6b8b312fd9 100644 --- a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk +++ b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103/board.c +BOARDSRC = $(BOARD_PATH)/boards/GENERIC_STM32_F103/board.c # Required include directories -BOARDINC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103 +BOARDINC = $(BOARD_PATH)/boards/GENERIC_STM32_F103 diff --git a/keyboards/chibios_test/rules.mk b/keyboards/chibios_test/rules.mk index f72e1ab69a..45f03be020 100644 --- a/keyboards/chibios_test/rules.mk +++ b/keyboards/chibios_test/rules.mk @@ -5,4 +5,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover -CUSTOM_MATRIX = yes # Custom matrix file
\ No newline at end of file +CUSTOM_MATRIX = yes # Custom matrix file + +DEFAULT_FOLDER = chibios_test/stm32_f072_onekey
\ No newline at end of file diff --git a/keyboards/chibios_test/subproject.mk b/keyboards/chibios_test/subproject.mk deleted file mode 100644 index 7ed203d681..0000000000 --- a/keyboards/chibios_test/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = stm32_f072_onekey diff --git a/keyboards/clueboard_17/Makefile b/keyboards/clueboard_17/Makefile deleted file mode 100644 index 4e2a6f00fd..0000000000 --- a/keyboards/clueboard_17/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../Makefile -endif
\ No newline at end of file diff --git a/keyboards/clueboard_17/readme.md b/keyboards/clueboard_17/readme.md index f79d6b5594..f3590fdbb5 100644 --- a/keyboards/clueboard_17/readme.md +++ b/keyboards/clueboard_17/readme.md @@ -10,6 +10,6 @@ A basic 17 key numpad PCB. Make example for this keyboard (after setting up your build environment): - make cluepad-default + make clueboard_17:default 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/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk b/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk index 9674228c36..43377629a3 100644 --- a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk +++ b/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F303XC/board.c +BOARDSRC = $(BOARD_PATH)/boards/GENERIC_STM32_F303XC/board.c # Required include directories -BOARDINC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F303XC +BOARDINC = $(BOARD_PATH)/boards/GENERIC_STM32_F303XC diff --git a/keyboards/clueboard_60/readme.md b/keyboards/clueboard_60/readme.md index b13c5336b0..7221c82039 100644 --- a/keyboards/clueboard_60/readme.md +++ b/keyboards/clueboard_60/readme.md @@ -9,6 +9,6 @@ A fully customizable 60% keyboard. Make example for this keyboard (after setting up your build environment): - make clueboard_60-default-dfu-util + make clueboard_60:default:dfu-util 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/clueboard_66/Makefile b/keyboards/clueboard_66/Makefile deleted file mode 100644 index b9bada8f8d..0000000000 --- a/keyboards/clueboard_66/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 - -ifndef MAKEFILE_INCLUDED - include ../../Makefile -endif
\ No newline at end of file diff --git a/keyboards/clueboard_66/clueboard_66.h b/keyboards/clueboard_66/clueboard_66.h index 295a596d5a..c8989983d0 100644 --- a/keyboards/clueboard_66/clueboard_66.h +++ b/keyboards/clueboard_66/clueboard_66.h @@ -1,16 +1,16 @@ #ifndef CLUEBOARD_H #define CLUEBOARD_H -#ifdef SUBPROJECT_rev1 +#include "quantum.h" + +#ifdef KEYBOARD_clueboard_66_rev1 #include "rev1.h" #endif -#ifdef SUBPROJECT_rev2 +#ifdef KEYBOARD_clueboard_66_rev2 #include "rev2.h" #endif -#ifdef SUBPROJECT_rev3 +#ifdef KEYBOARD_clueboard_66_rev3 #include "rev3.h" #endif -#include "quantum.h" - #endif diff --git a/keyboards/clueboard_66/config.h b/keyboards/clueboard_66/config.h index 0d4e6a8746..eaf3e073fb 100644 --- a/keyboards/clueboard_66/config.h +++ b/keyboards/clueboard_66/config.h @@ -60,15 +60,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "rev2/config.h" -#endif -#ifdef SUBPROJECT_rev3 - #include "rev3/config.h" -#endif - #endif diff --git a/keyboards/clueboard_66/readme.md b/keyboards/clueboard_66/readme.md index 13859bc242..c2423096ec 100644 --- a/keyboards/clueboard_66/readme.md +++ b/keyboards/clueboard_66/readme.md @@ -13,6 +13,6 @@ A fully customizable 66% keyboard. Make example for this keyboard (after setting up your build environment): - make clueboard-rev3-default + make clueboard/rev3:default 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/clueboard_66/rev1/Makefile b/keyboards/clueboard_66/rev1/Makefile deleted file mode 100644 index 191c6bb664..0000000000 --- a/keyboards/clueboard_66/rev1/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../../Makefile -endif
\ No newline at end of file diff --git a/keyboards/clueboard_66/rev1/config.h b/keyboards/clueboard_66/rev1/config.h index f40876ffbf..519e4d3ecb 100644 --- a/keyboards/clueboard_66/rev1/config.h +++ b/keyboards/clueboard_66/rev1/config.h @@ -1,7 +1,7 @@ #ifndef REV2_CONFIG_H #define REV2_CONFIG_H -#include "../config.h" +#include "config_common.h" #define PRODUCT_ID 0x2301 #define DEVICE_VER 0x0003 diff --git a/keyboards/clueboard_66/rev2/Makefile b/keyboards/clueboard_66/rev2/Makefile deleted file mode 100644 index 191c6bb664..0000000000 --- a/keyboards/clueboard_66/rev2/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../../Makefile -endif
\ No newline at end of file diff --git a/keyboards/clueboard_66/rev2/config.h b/keyboards/clueboard_66/rev2/config.h index bc34fc07bb..3c22c5b4a6 100644 --- a/keyboards/clueboard_66/rev2/config.h +++ b/keyboards/clueboard_66/rev2/config.h @@ -1,7 +1,7 @@ #ifndef REV2_CONFIG_H #define REV2_CONFIG_H -#include "../config.h" +#include "config_common.h" #define PRODUCT_ID 0x2320 #define DEVICE_VER 0x0001 diff --git a/keyboards/clueboard_66/rev2/rev2.h b/keyboards/clueboard_66/rev2/rev2.h index 75015ec024..da7ce500f9 100644 --- a/keyboards/clueboard_66/rev2/rev2.h +++ b/keyboards/clueboard_66/rev2/rev2.h @@ -1,7 +1,7 @@ #ifndef REV2_H #define REV2_H -#include "../clueboard_66.h" +#include "clueboard_66.h" /* Clueboard matrix layout * ,-----------------------------------------------------------. ,---. diff --git a/keyboards/clueboard_66/rev3/config.h b/keyboards/clueboard_66/rev3/config.h index cd12db22e1..5e645c78f0 100644 --- a/keyboards/clueboard_66/rev3/config.h +++ b/keyboards/clueboard_66/rev3/config.h @@ -1,7 +1,7 @@ #ifndef REV3_CONFIG_H #define REV3_CONFIG_H -#include "../config.h" +#include "config_common.h" #define PRODUCT_ID 0x2370 #define DEVICE_VER 0x0001 diff --git a/keyboards/clueboard_66/rev3/rev3.h b/keyboards/clueboard_66/rev3/rev3.h index fd6f983441..7fd243c809 100644 --- a/keyboards/clueboard_66/rev3/rev3.h +++ b/keyboards/clueboard_66/rev3/rev3.h @@ -1,7 +1,7 @@ #ifndef REV3_H #define REV3_H -#include "../clueboard_66.h" +#include "clueboard_66.h" /* Clueboard matrix layout * ,-----------------------------------------------------------. ,---. diff --git a/keyboards/clueboard_66/rules.mk b/keyboards/clueboard_66/rules.mk index afbb531a24..abab3bd5b7 100644 --- a/keyboards/clueboard_66/rules.mk +++ b/keyboards/clueboard_66/rules.mk @@ -19,3 +19,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality MIDI_ENABLE = no # MIDI controls UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +DEFAULT_FOLDER = clueboard_66/rev2 diff --git a/keyboards/clueboard_66/subproject.mk b/keyboards/clueboard_66/subproject.mk deleted file mode 100644 index 7c9b39598d..0000000000 --- a/keyboards/clueboard_66/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 diff --git a/keyboards/cluecard/readme.md b/keyboards/cluecard/readme.md index d9daa0b2b5..589eb57f37 100644 --- a/keyboards/cluecard/readme.md +++ b/keyboards/cluecard/readme.md @@ -8,6 +8,6 @@ A simple QMK dev kit. Make example for this keyboard (after setting up your build environment): - make cluecard-default + make cluecard:default 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/converter/converter.c b/keyboards/converter/converter.c deleted file mode 100644 index aa4bef63a9..0000000000 --- a/keyboards/converter/converter.c +++ /dev/null @@ -1 +0,0 @@ -#include "converter.h"
\ No newline at end of file diff --git a/keyboards/converter/converter.h b/keyboards/converter/converter.h deleted file mode 100644 index 7a4a4835e6..0000000000 --- a/keyboards/converter/converter.h +++ /dev/null @@ -1 +0,0 @@ -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/converter/rules.mk b/keyboards/converter/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/rules.mk +++ /dev/null diff --git a/keyboards/converter/usb_usb/README.md b/keyboards/converter/usb_usb/README.md index c1904a8122..2ed702695b 100644 --- a/keyboards/converter/usb_usb/README.md +++ b/keyboards/converter/usb_usb/README.md @@ -9,7 +9,7 @@ Hardware Availability: [GH thread](https://geekhack.org/index.php?topic=72052.0) Make example for this keyboard (after setting up your build environment): - make converter-usb_usb-default + make converter/usb_usb:default 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/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index 4ee6cdb1ce..81a393e8ab 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -1,5 +1,5 @@ # MCU name -MCU ?= atmega32u4 +MCU = atmega32u4 # Processor frequency. @@ -13,14 +13,14 @@ MCU ?= atmega32u4 # does not *change* the processor frequency - it should merely be updated to # reflect the processor speed set externally so that the code can use accurate # software delays. -F_CPU ?= 8000000 +F_CPU = 8000000 # # LUFA specific # # Target architecture (see library "Board Types" documentation). -ARCH ?= AVR8 +ARCH = AVR8 # Input clock frequency. # This will define a symbol, F_USB, in all source code files equal to the @@ -33,7 +33,7 @@ ARCH ?= AVR8 # # If no clock division is performed on the input clock inside the AVR (via the # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB ?= $(F_CPU) +F_USB = $(F_CPU) # Interrupt driven control endpoint task OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT @@ -51,16 +51,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options # comment out to disable the options. # -# BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -# MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -# CONSOLE_ENABLE ?= yes # Console for debug(+400) -# COMMAND_ENABLE ?= yes # Commands for debug and configuration -# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -# NKRO_ENABLE ?= yes # USB Nkey Rollover - not yet supported in LUFA -# BACKLIGHT_ENABLE ?= yes - +# BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +# MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +# CONSOLE_ENABLE = yes # Console for debug(+400) +# COMMAND_ENABLE = yes # Commands for debug and configuration +# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +# NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +# BACKLIGHT_ENABLE = yes +USB_HID_ENABLE = yes CUSTOM_MATRIX = yes -SRC = custom_matrix.cpp -include $(TMK_DIR)/protocol/usb_hid.mk +SRC = custom_matrix.cpp
\ No newline at end of file diff --git a/keyboards/deltasplit75/config.h b/keyboards/deltasplit75/config.h index 89d328be64..8a2fbb3b26 100644 --- a/keyboards/deltasplit75/config.h +++ b/keyboards/deltasplit75/config.h @@ -20,10 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#ifdef SUBPROJECT_protosplit - #include "protosplit/config.h" -#endif -#ifdef SUBPROJECT_v2 - #include "v2/config.h" -#endif #endif diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h index 9db16c78c2..79d018c912 100644 --- a/keyboards/deltasplit75/deltasplit75.h +++ b/keyboards/deltasplit75/deltasplit75.h @@ -1,12 +1,7 @@ #ifndef DELTASPLIT75_H #define DELTASPLIT75_H -#ifdef SUBPROJECT_v2 - #include "v2.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "protosplit.h" -#endif +#include "v2.h" #include "quantum.h" diff --git a/keyboards/deltasplit75/readme.md b/keyboards/deltasplit75/readme.md index a1e35e3378..f911f78714 100644 --- a/keyboards/deltasplit75/readme.md +++ b/keyboards/deltasplit75/readme.md @@ -9,7 +9,7 @@ Hardware Availability: Group Buy Make example for this keyboard (after setting up your build environment): - make deltasplit75-v2-default + make deltasplit75/v2:default 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/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index 1aee5313c1..e345d61f56 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/rules.mk @@ -55,21 +55,23 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SUBPROJECT_rev1 ?= yes -USE_I2C ?= yes +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SUBPROJECT_rev1 = yes +USE_I2C = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = deltasplit75/v2
\ No newline at end of file diff --git a/keyboards/deltasplit75/subproject.mk b/keyboards/deltasplit75/subproject.mk deleted file mode 100644 index 298067e5d8..0000000000 --- a/keyboards/deltasplit75/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = v2 diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h index 0f4b806e2d..b677d09aa9 100644 --- a/keyboards/deltasplit75/v2/config.h +++ b/keyboards/deltasplit75/v2/config.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_V2_H +#define CONFIG_V2_H #include "config_common.h" diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk index 80a942d06f..f845616741 100644 --- a/keyboards/deltasplit75/v2/rules.mk +++ b/keyboards/deltasplit75/v2/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/dk60/readme.md b/keyboards/dk60/readme.md index 5eba791504..bd99d4b61c 100644 --- a/keyboards/dk60/readme.md +++ b/keyboards/dk60/readme.md @@ -10,7 +10,7 @@ Another 60% keyboard with different HHKB layout made and sold by dbroqua. [More Make example for this keyboard (after setting up your build environment): - make dk60-default + make dk60:default 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/dz60/readme.md b/keyboards/dz60/readme.md index d14af7a5ca..78b290fbad 100644 --- a/keyboards/dz60/readme.md +++ b/keyboards/dz60/readme.md @@ -10,6 +10,6 @@ Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/collections/pcb/p Make example for this keyboard (after setting up your build environment): - make dz60-default + make dz60:default 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/eco/eco.h b/keyboards/eco/eco.h index 2cfb8df26b..4f8cfabd88 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h @@ -1,10 +1,10 @@ #ifndef ECO_H #define ECO_H -#ifdef SUBPROJECT_rev1 +#ifdef KEYBOARD_eco_rev1 #include "rev1.h" #endif -#ifdef SUBPROJECT_rev2 +#ifdef KEYBOARD_eco_rev2 #include "rev2.h" #endif diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md index d29aa8ece7..afa9d55598 100644 --- a/keyboards/eco/readme.md +++ b/keyboards/eco/readme.md @@ -10,6 +10,6 @@ Hardware Supported: ECO PCB rev1 Pro Micro Make example for this keyboard (after setting up your build environment): - make eco-rev2-that_canadian + make eco/rev2:that_canadian 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 cf26cdc0db..6f4b4fefc4 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk @@ -66,3 +66,5 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +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 7c9b39598d..0000000000 --- a/keyboards/eco/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 diff --git a/keyboards/ergodone/readme.md b/keyboards/ergodone/readme.md index 8e3123f4f2..207df789a6 100644 --- a/keyboards/ergodone/readme.md +++ b/keyboards/ergodone/readme.md @@ -18,7 +18,7 @@ The ErgoDone is a modified version of the ErgoDox, made by K.T.E.C., with pre-so In the root directory of the repository, build the firmware with a command like: - make ergodone-default + make ergodone:default For more information on the layout option and other ones, see the [`make` guide](https://docs.qmk.fm/getting_started_make_guide.html). diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c index 4223bc2d1a..5f0504beb7 100644 --- a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c +++ b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c @@ -98,7 +98,7 @@ enum { // on each tap, light up one led, from right to left -// on the forth tap, turn them off from right to leftmake ergodox-ez-drashna-custom-teensy +// on the forth tap, turn them off from right to left void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) { if (!skip_leds) { diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/README.md b/keyboards/ergodox_ez/keymaps/dvorak_42_key/README.md index 18af2cdeef..9d30c2e19c 100644 --- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/README.md +++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/README.md @@ -5,7 +5,7 @@ This is a dvorak based layout for the Ergodox EZ. Its basic key layout is simila How to build ------------ -make ergodox_ez-dvorak_42_key-teensy +make ergodox_ez:dvorak_42_key:teensy Layers ------ diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c index 55168e85d5..c1195ecc0d 100644 --- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c +++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c @@ -5,7 +5,7 @@ // to build this keymap -// make ergodox_ez-dvorak_42_key-teensy +// make ergodox_ez:dvorak_42_key:teensy static bool mouse_lock = false; diff --git a/keyboards/ergodox_infinity/keymaps/rask/README.md b/keyboards/ergodox_infinity/keymaps/rask/README.md index 99e3953234..8a13994301 100644 --- a/keyboards/ergodox_infinity/keymaps/rask/README.md +++ b/keyboards/ergodox_infinity/keymaps/rask/README.md @@ -17,4 +17,4 @@ makes sense. Follow the main Infinity ErgoDox guide but use the following layout: - $ sudo make ergodox_infinity-rask + $ sudo make ergodox_infinity:rask diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/ergodox_infinity/readme.md index 4ad5990b8a..7b8c1df3a5 100644 --- a/keyboards/ergodox_infinity/readme.md +++ b/keyboards/ergodox_infinity/readme.md @@ -5,15 +5,15 @@ for the left and right halves seperately. To flash them: - Make sure you are in the top-level qmk_firmware directory - - Build the firmware with `make ergodox_infinity-keymapname` + - Build the firmware with `make ergodox_infinity:keymapname` - Plug in the left hand keyboard only. - Press the program button (back of keyboard, above thumb pad). - - Install the firmware with `sudo make ergodox_infinity-keymapname-dfu-util` + - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util` - - Build right hand firmware with `make ergodox_infinity-keymapname MASTER=right` + - Build right hand firmware with `make ergodox_infinity:keymapname MASTER=right` - Plug in the right hand keyboard only. diff --git a/keyboards/felix/readme.md b/keyboards/felix/readme.md index 1b5f4b42e0..e41782c3cc 100644 --- a/keyboards/felix/readme.md +++ b/keyboards/felix/readme.md @@ -8,6 +8,6 @@ Hardware Availability: [Unikeyboard](https://unikeyboard.io/product/felix/) Make example for this keyboard (after setting up your build environment): - make felix-default + make felix:default 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/four_banger/readme.md b/keyboards/four_banger/readme.md index f2ab0ad870..ffb6091f95 100644 --- a/keyboards/four_banger/readme.md +++ b/keyboards/four_banger/readme.md @@ -9,6 +9,6 @@ Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) Make example for this keyboard (after setting up your build environment): - make four_banger-default + make four_banger:default 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/frosty_flake/readme.md b/keyboards/frosty_flake/readme.md index 4a933d0bd6..822377a719 100644 --- a/keyboards/frosty_flake/readme.md +++ b/keyboards/frosty_flake/readme.md @@ -25,19 +25,19 @@ Make example for this keyboard (after setting up your build environment): 104 key default layout: ``` -make frosty_flake-default +make frosty_flake:default ``` To directly flash the frosty_flake after compiling use ``` -make frosty_flake-default-dfu +make frosty_flake:default:dfu ``` 87 key tkl layout: ``` -make frosty_flake-tkl-dfu +make frosty_flake:tkl:dfu ``` See [build environment diff --git a/keyboards/gh60/keymaps/dbroqua/config.h b/keyboards/gh60/keymaps/dbroqua/config.h index 75ccec0973..0b8218d28a 100644 --- a/keyboards/gh60/keymaps/dbroqua/config.h +++ b/keyboards/gh60/keymaps/dbroqua/config.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" diff --git a/keyboards/gh60/keymaps/robotmaxtron/config.h b/keyboards/gh60/keymaps/robotmaxtron/config.h index bcd7534617..abaddb71f1 100644 --- a/keyboards/gh60/keymaps/robotmaxtron/config.h +++ b/keyboards/gh60/keymaps/robotmaxtron/config.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" diff --git a/keyboards/gh60/readme.md b/keyboards/gh60/readme.md index e477b279ce..400a81c410 100644 --- a/keyboards/gh60/readme.md +++ b/keyboards/gh60/readme.md @@ -11,7 +11,7 @@ Hardware Availability: http://blog.komar.be/projects/gh60-programmable-keyboard/ Make example for this keyboard (after setting up your build environment): - make gh60-default + make gh60:default 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/gherkin/README.md b/keyboards/gherkin/README.md index 210247af9a..5e0daeabf9 100644 --- a/keyboards/gherkin/README.md +++ b/keyboards/gherkin/README.md @@ -11,7 +11,7 @@ Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.c Make example for this keyboard (after setting up your build environment): - make gherkin-default + make gherkin:default 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. First pass at adding support for the gherkin keyboard. Compiles but completely diff --git a/keyboards/gonnerd/readme.md b/keyboards/gonnerd/readme.md index 388816abb0..26e4890d94 100644 --- a/keyboards/gonnerd/readme.md +++ b/keyboards/gonnerd/readme.md @@ -9,7 +9,7 @@ Hardware Availability: http://www.gonskeyboardworks.com/pcbs-and-controllers/60- Make example for this keyboard (after setting up your build environment): - make gonnerd-default + make gonnerd:default 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/hadron/out.txt b/keyboards/hadron/out.txt deleted file mode 100644 index 644a6a7774..0000000000 --- a/keyboards/hadron/out.txt +++ /dev/null @@ -1,66 +0,0 @@ --------- begin -------- -avr-gcc.exe (AVR_8_bit_GNU_Toolchain_3.5.0_1662) 4.9.2 -Copyright (C) 2014 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -Compiling: ../../keyboards/planck/planck.c [32;01m[OK][0m -Compiling: ../../keyboards/planck/keymaps/experimental/keymap.c [33;01m[WARNINGS][0m - | - | ../../keyboards/planck/keymaps/experimental/keymap.c: In function 'action_get_macro': - | ../../keyboards/planck/keymaps/experimental/keymap.c:227:17: warning: implicit declaration of function 'breathing_speed_set' [-Wimplicit-function-declaration] - | breathing_speed_set(2); - | ^ - | ../../keyboards/planck/keymaps/experimental/keymap.c:228:17: warning: implicit declaration of function 'breathing_pulse' [-Wimplicit-function-declaration] - | breathing_pulse(); - | ^ - | -Compiling: ../../quantum/quantum.c [32;01m[OK][0m -Compiling: ../../quantum/keymap.c [32;01m[OK][0m -Compiling: ../../quantum/keycode_config.c [32;01m[OK][0m -Compiling: ../../quantum/matrix.c [32;01m[OK][0m -Compiling: ../../quantum/audio/audio.c [32;01m[OK][0m -Compiling: ../../quantum/audio/voices.c [32;01m[OK][0m -Compiling: ../../quantum/audio/luts.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/lufa.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/descriptor.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Class/Common/HIDParser.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/ConfigDescriptors.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/DeviceStandardReq.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/Events.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/HostStandardReq.c [32;01m[OK][0m -Compiling: ../../tmk_core/protocol/lufa/LUFA-git/LUFA/Drivers/USB/Core/USBTask.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/host.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/keyboard.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/action.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/action_tapping.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/action_macro.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/action_layer.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/action_util.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/print.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/debug.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/util.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/avr/suspend.c [32;01m[OK][0m -Assembling: ../../tmk_core/common/avr/xprintf.S [32;01m[OK][0m -Compiling: ../../tmk_core/common/avr/timer.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/avr/bootloader.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/magic.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/avr/eeconfig.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/mousekey.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/command.c [32;01m[OK][0m -Compiling: ../../tmk_core/common/backlight.c [32;01m[OK][0m -Linking: .build/planck_experimental.elf [31;01m[ERRORS][0m - | - | .build/obj_planck_experimental/keyboards/planck/keymaps/experimental/keymap.o: In function `action_get_macro': - | C:\Users\Fred Wales\Documents\Programming\qmk_firmware\keyboards\planck/../../keyboards/planck/keymaps/experimental/keymap.c:240: undefined reference to `breathing_speed_set' - | C:\Users\Fred Wales\Documents\Programming\qmk_firmware\keyboards\planck/../../keyboards/planck/keymaps/experimental/keymap.c:241: undefined reference to `breathing_pulse' - | collect2.exe: error: ld returned 1 exit status - | diff --git a/keyboards/hadron/rules.mk b/keyboards/hadron/rules.mk index 78f86f982d..66a900825a 100644 --- a/keyboards/hadron/rules.mk +++ b/keyboards/hadron/rules.mk @@ -70,3 +70,4 @@ SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SRC = i2c.c \ ssd1306.c +DEFAULT_FOLDER = hadron/ver2
\ No newline at end of file diff --git a/keyboards/hadron/subproject.mk b/keyboards/hadron/subproject.mk deleted file mode 100644 index 546c88fefe..0000000000 --- a/keyboards/hadron/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = ver2 diff --git a/keyboards/handwired/handwired.c b/keyboards/handwired/handwired.c deleted file mode 100644 index feef8a919e..0000000000 --- a/keyboards/handwired/handwired.c +++ /dev/null @@ -1 +0,0 @@ -#include "handwired.h"
\ No newline at end of file diff --git a/keyboards/handwired/handwired.h b/keyboards/handwired/handwired.h deleted file mode 100644 index 7a4a4835e6..0000000000 --- a/keyboards/handwired/handwired.h +++ /dev/null @@ -1 +0,0 @@ -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md index 67bf711bee..d2f2c01ae8 100644 --- a/keyboards/handwired/kbod/readme.md +++ b/keyboards/handwired/kbod/readme.md @@ -9,7 +9,7 @@ For the full Quantum feature list, see [the parent readme](/). ## Building -Download or clone the whole firmware and use ```make handwired-kbod-default``` to generate the .hex file. You may flash it with avrdude +Download or clone the whole firmware and use ```make handwired/kbod:default``` to generate the .hex file. You may flash it with avrdude ## Flashing Something along this line: diff --git a/keyboards/handwired/magicforce61/README.md b/keyboards/handwired/magicforce61/README.md index 5a260f9ad1..cc86732627 100644 --- a/keyboards/handwired/magicforce61/README.md +++ b/keyboards/handwired/magicforce61/README.md @@ -19,6 +19,6 @@ The following pins are used: ## Compiling and loading the firmware -To build the firmware, run `make handwired-magicforce61`. +To build the firmware, run `make handwired/magicforce61`. Flash the firmware using the teensy loader or avrdude. diff --git a/keyboards/handwired/rules.mk b/keyboards/handwired/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/rules.mk +++ /dev/null diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk index a7f7fc230e..62f94b9452 100644 --- a/keyboards/handwired/traveller/rules.mk +++ b/keyboards/handwired/traveller/rules.mk @@ -80,10 +80,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 RGBLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../Makefile -endif - -upload: build - $(ATREUS_UPLOAD_COMMAND) - diff --git a/keyboards/hhkb/keymaps/blakedietz/README.md b/keyboards/hhkb/keymaps/blakedietz/README.md index c0f7fde7ad..4dff47a6e8 100644 --- a/keyboards/hhkb/keymaps/blakedietz/README.md +++ b/keyboards/hhkb/keymaps/blakedietz/README.md @@ -29,7 +29,7 @@ From the hhkb directory run the following: ```bash make clean -make hhkb-blakedietz-dfu +make hhkb:blakedietz:dfu ``` Press the button on the alternate controller to put the board into boot mode. @@ -37,7 +37,7 @@ Press the button on the alternate controller to put the board into boot mode. You'll see an output similar to the following: ```bash -make hhkb-blakedietz-dfu +make hhkb:blakedietz:dfu Making hhkb with keymap blakedietz and target dfu diff --git a/keyboards/hhkb/readme.md b/keyboards/hhkb/readme.md index ee64e037a6..8774a73f77 100644 --- a/keyboards/hhkb/readme.md +++ b/keyboards/hhkb/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=12047.0 Make example for this keyboard (after setting up your build environment): - make hhkb-default + make hhkb:default 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/infinity60/readme.md b/keyboards/infinity60/readme.md index bca26c69f9..94f65d370f 100644 --- a/keyboards/infinity60/readme.md +++ b/keyboards/infinity60/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://input.club/devices/infinity-keyboard/ Make example for this keyboard (after setting up your build environment): - make infinity60-default + make infinity60:default 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/jc65/readme.md b/keyboards/jc65/readme.md index 55ed72229c..e8955ec53d 100644 --- a/keyboards/jc65/readme.md +++ b/keyboards/jc65/readme.md @@ -13,10 +13,10 @@ Hardware Availability: [keyclack.com](https://keyclack.com/) Make example for this keyboard (after setting up your build environment): - make jc65-default + make jc65:default Or to make and flash: - make jc65-default-dfu + make jc65:default:dfu 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/jd40/readme.md b/keyboards/jd40/readme.md index 1684a562e0..6934e54d41 100644 --- a/keyboards/jd40/readme.md +++ b/keyboards/jd40/readme.md @@ -9,6 +9,6 @@ Hardware Availability: [1up](https://1upkeyboards.com/jd40-mkii-1up-keyboards-lo Make example for this keyboard (after setting up your build environment): - make atreus-default + make jd40:default 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/jd45/config.h b/keyboards/jd45/config.h index ee989b7b41..43d138f4ed 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -67,10 +67,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* disable debug print */ -#define NO_DEBUG +// #define NO_DEBUG /* disable print */ -#define NO_PRINT +// #define NO_PRINT /* disable action features */ //#define NO_ACTION_LAYER diff --git a/keyboards/jd45/keymaps/mjt/config.h b/keyboards/jd45/keymaps/mjt/config.h index 276639514b..a8c8e9d17e 100644 --- a/keyboards/jd45/keymaps/mjt/config.h +++ b/keyboards/jd45/keymaps/mjt/config.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" diff --git a/keyboards/jd45/readme.md b/keyboards/jd45/readme.md index 4bed1be416..a2e4cf6dd4 100644 --- a/keyboards/jd45/readme.md +++ b/keyboards/jd45/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://mechanicalkeyboards.com/shop/index.php?l=product_ Make example for this keyboard (after setting up your build environment): - make jd45-default + make jd45:default 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/jj40/README.md b/keyboards/jj40/README.md index 03b7533de0..0720366ad8 100644 --- a/keyboards/jj40/README.md +++ b/keyboards/jj40/README.md @@ -10,7 +10,7 @@ Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj4 Make example for this keyboard (after setting up your build environment): - make jj40-program + make jj40:default:program 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/jm60/boards/JM60_BOARD/board.mk b/keyboards/jm60/boards/JM60_BOARD/board.mk index 46df0ef334..e2f051c314 100644 --- a/keyboards/jm60/boards/JM60_BOARD/board.mk +++ b/keyboards/jm60/boards/JM60_BOARD/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = $(KEYBOARD_PATH)/boards/JM60_BOARD/board.c +BOARDSRC = $(BOARD_PATH)/boards/JM60_BOARD/board.c # Required include directories -BOARDINC = $(KEYBOARD_PATH)/boards/JM60_BOARD +BOARDINC = $(BOARD_PATH)/boards/JM60_BOARD diff --git a/keyboards/jm60/readme.md b/keyboards/jm60/readme.md index e4243716f6..3ba96ed603 100644 --- a/keyboards/jm60/readme.md +++ b/keyboards/jm60/readme.md @@ -9,7 +9,7 @@ Hardware Availability: https://kbdfans.myshopify.com/ (is no longer sold) Make example for this keyboard (after setting up your build environment): - make jm60-default-bin + make jm60:default:bin 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. @@ -17,7 +17,7 @@ See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) 1) from the `qmk_firmware` directory run: ``` -$ make jm60-default-bin +$ make jm60:default:bin ``` 2) rename 'jm60_default.bin' to 'jm60_default.firmware' diff --git a/keyboards/kbd75/readme.md b/keyboards/kbd75/readme.md index 42fdc0d386..6c67307d7d 100644 --- a/keyboards/kbd75/readme.md +++ b/keyboards/kbd75/readme.md @@ -7,6 +7,6 @@ Hardware Availability: https://kbdfans.myshopify.com/products/kbd75-keyboard-set Make example for this keyboard (after setting up your build environment): - make kbd75-default + make kbd75:default 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/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h index 66713731fa..94e913ebd9 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 a7ff8da8b5..c8646449bd 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 fb421a34fc..3f2ff2d6cc 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 63ee4cafbe..0000000000 --- a/keyboards/kinesis/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = alvicstep diff --git a/keyboards/kitten_paw/readme.md b/keyboards/kitten_paw/readme.md index 55fac2ba5b..b12165b32d 100644 --- a/keyboards/kitten_paw/readme.md +++ b/keyboards/kitten_paw/readme.md @@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0 Make example for this keyboard (after setting up your build environment): - make kitten_paw-default + make kitten_paw:default 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/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 476e7fd2aa..d9cfa35a21 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 300722a1bb..c9202de631 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 7b7224fd4d..1bbc0367fa 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 7c9b39598d..0000000000 --- a/keyboards/lets_split/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 diff --git a/keyboards/levinson/keymaps/bakingpy2u/config.h b/keyboards/levinson/keymaps/bakingpy2u/config.h index 6b409bf0d5..a2b1e089c7 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 7f33a43630..4c7e48dc04 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 c69a06faba..896c5232f6 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 1fcad3c1b7..94dd7bf04d 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 7b7224fd4d..ba0f5b91d5 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 928b1edd02..0000000000 --- a/keyboards/levinson/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev1 diff --git a/keyboards/mechmini/README.md b/keyboards/mechmini/README.md index ed590f3f1b..b95153051c 100644 --- a/keyboards/mechmini/README.md +++ b/keyboards/mechmini/README.md @@ -9,7 +9,7 @@ Hardware Availability: https://mechkeys.ca/collections/keyboards/products/mechmi Make example for this keyboard (after setting up your build environment): - make mechmini-default + make mechmini:default 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. @@ -40,7 +40,7 @@ Then, with the keyboard plugged in, simply run this command from the `qmk_firmware` directory: ``` -$ make mechmini-program +$ make mechmini:program ``` If you prefer, you can just build it and flash the firmware directly with diff --git a/keyboards/mf68/README.md b/keyboards/mf68/README.md index 74bbe9b579..7dd3a900a5 100644 --- a/keyboards/mf68/README.md +++ b/keyboards/mf68/README.md @@ -9,10 +9,10 @@ Hardware Availability: [PCB files](https://github.com/di0ib/tmk_keyboard/tree/ma Make example for this keyboard (after setting up your build environment): - make mf68-default + make mf68:default Example of flashing this keyboard: - make mf68-default-avrdude + make mf68: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/minidox/minidox.h b/keyboards/minidox/minidox.h index 479c7aec71..6e8add206b 100644 --- a/keyboards/minidox/minidox.h +++ b/keyboards/minidox/minidox.h @@ -1,7 +1,7 @@ #ifndef MINIDOX_H #define MINIDOX_H -#ifdef SUBPROJECT_rev1 +#ifdef KEYBOARD_minidox_rev1 #include "rev1.h" #endif diff --git a/keyboards/minidox/readme.md b/keyboards/minidox/readme.md index c15fd244a4..b44d66660b 100644 --- a/keyboards/minidox/readme.md +++ b/keyboards/minidox/readme.md @@ -10,7 +10,7 @@ Hardware Supported: MiniDox PCB rev1 Pro Micro Make example for this keyboard (after setting up your build environment): - make minidox-rev1-default + make minidox/rev1:default 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. @@ -22,8 +22,8 @@ Flashing ------- Note: Most of this is copied from the Let's Split readme, because it is awesome -From the `minidox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. -Example: `make rev1-default-avrdude` +From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing. +Example: `make minidox/rev1:default:avrdude` Choosing which board to plug the USB cable into (choosing Master) -------- diff --git a/keyboards/minidox/rev1/rules.mk b/keyboards/minidox/rev1/rules.mk index a0825b4ef6..f845616741 100644 --- a/keyboards/minidox/rev1/rules.mk +++ b/keyboards/minidox/rev1/rules.mk @@ -1,5 +1 @@ -BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../Makefile -endif
\ No newline at end of file +BACKLIGHT_ENABLE = no
\ No newline at end of file diff --git a/keyboards/minidox/rules.mk b/keyboards/minidox/rules.mk index 539456ae02..0f9d303105 100644 --- a/keyboards/minidox/rules.mk +++ b/keyboards/minidox/rules.mk @@ -72,3 +72,5 @@ USE_I2C ?= no SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = minidox/rev1
\ No newline at end of file diff --git a/keyboards/minidox/subproject.mk b/keyboards/minidox/subproject.mk deleted file mode 100644 index 928b1edd02..0000000000 --- a/keyboards/minidox/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev1 diff --git a/keyboards/mitosis/readme.md b/keyboards/mitosis/readme.md index ef1eb0d832..3cbdbae61a 100644 --- a/keyboards/mitosis/readme.md +++ b/keyboards/mitosis/readme.md @@ -9,7 +9,7 @@ Hardware Availability: https://www.reddit.com/r/MechanicalKeyboards/comments/665 Make example for this keyboard (after setting up your build environment): - make mitosis-default + make mitosis:default 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/nyquist/config.h b/keyboards/nyquist/config.h index 5e3dc91888..863722d7d0 100644 --- a/keyboards/nyquist/config.h +++ b/keyboards/nyquist/config.h @@ -20,6 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#include QMK_SUBPROJECT_CONFIG_H - #endif // CONFIG_H diff --git a/keyboards/nyquist/keymaps/default/config.h b/keyboards/nyquist/keymaps/default/config.h index 072d4a7ce2..a6246262e5 100644 --- a/keyboards/nyquist/keymaps/default/config.h +++ b/keyboards/nyquist/keymaps/default/config.h @@ -18,7 +18,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/nyquist/keymaps/hexwire/config.h b/keyboards/nyquist/keymaps/hexwire/config.h index 23abba0aa4..4a5b7513ae 100644 --- a/keyboards/nyquist/keymaps/hexwire/config.h +++ b/keyboards/nyquist/keymaps/hexwire/config.h @@ -18,7 +18,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/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h index dcc2a4ffd4..8d031b0505 100644 --- a/keyboards/nyquist/nyquist.h +++ b/keyboards/nyquist/nyquist.h @@ -1,7 +1,9 @@ #ifndef NYQUIST_H #define NYQUIST_H -#include QMK_SUBPROJECT_H +#ifdef KEYBOARD_nyquist_rev1 + #include "rev1.h" +#endif #include "quantum.h" diff --git a/keyboards/nyquist/readme.md b/keyboards/nyquist/readme.md index 16debb9870..1b417a6588 100644 --- a/keyboards/nyquist/readme.md +++ b/keyboards/nyquist/readme.md @@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io) Make example for this keyboard (after setting up your build environment): - make nyquist-rev1-default + make nyquist/rev1:default Example of flashing this keyboard: - make nyquist-rev1-default-avrdude + make nyquist/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/nyquist/rev1/rev1.c b/keyboards/nyquist/rev1/rev1.c index 7b3228fa65..99bd781d57 100644 --- a/keyboards/nyquist/rev1/rev1.c +++ b/keyboards/nyquist/rev1/rev1.c @@ -1,4 +1,4 @@ -#include QMK_SUBPROJECT_H +#include "rev1.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h index cf9bf80203..eeaf152728 100644 --- a/keyboards/nyquist/rev1/rev1.h +++ b/keyboards/nyquist/rev1/rev1.h @@ -1,7 +1,7 @@ #ifndef REV1_H #define REV1_H -#include QMK_KEYBOARD_H +#include "nyquist.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk index 07cdba4bf6..f2bc59cc5d 100644 --- a/keyboards/nyquist/rules.mk +++ b/keyboards/nyquist/rules.mk @@ -74,4 +74,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes -LAYOUTS = ortho_5x12
\ No newline at end of file +LAYOUTS = ortho_5x12 + +DEFAULT_FOLDER = nyquist/rev1
\ No newline at end of file diff --git a/keyboards/nyquist/subproject.mk b/keyboards/nyquist/subproject.mk deleted file mode 100644 index 928b1edd02..0000000000 --- a/keyboards/nyquist/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev1 diff --git a/keyboards/obelus/readme.md b/keyboards/obelus/readme.md index e08ed44ddd..a9d67b00e8 100644 --- a/keyboards/obelus/readme.md +++ b/keyboards/obelus/readme.md @@ -9,11 +9,11 @@ Hardware Availability: C-Keys soldering workshops, /u/MonkeyPlusPlus Make example for this keyboard (after setting up your build environment): - make obelus-default + make obelus:default Or to make and flash: - make obelus-default-dfu + make obelus:default:dfu See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) and [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/org60/readme.md b/keyboards/org60/readme.md index 8e02a40211..1a9599c8d8 100644 --- a/keyboards/org60/readme.md +++ b/keyboards/org60/readme.md @@ -18,4 +18,4 @@ Default keymap included, matching configuration on sale page. ## Build -To build the default keymap, simply run `make org60-default`.
\ No newline at end of file +To build the default keymap, simply run `make org60:default`.
\ No newline at end of file diff --git a/keyboards/orthodox/config.h b/keyboards/orthodox/config.h index b1a5b9cf9c..821cd7e29f 100644 --- a/keyboards/orthodox/config.h +++ b/keyboards/orthodox/config.h @@ -23,9 +23,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define CONFIG_H #include "config_common.h" - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif - + #endif diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h index f24c6db290..c2892b5e0c 100644 --- a/keyboards/orthodox/keymaps/default/config.h +++ b/keyboards/orthodox/keymaps/default/config.h @@ -22,7 +22,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/orthodox/keymaps/default/rules.mk b/keyboards/orthodox/keymaps/default/rules.mk index 457a3d01d4..e69de29bb2 100644 --- a/keyboards/orthodox/keymaps/default/rules.mk +++ b/keyboards/orthodox/keymaps/default/rules.mk @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index 7cbbf1025a..bcd14a22d1 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h @@ -22,7 +22,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/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk index e252a90449..2090afe9a5 100644 --- a/keyboards/orthodox/keymaps/drashna/rules.mk +++ b/keyboards/orthodox/keymaps/drashna/rules.mk @@ -1,6 +1,2 @@ CONSOLE_ENABLE = yes -TAP_DANCE_ENABLE = yes - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +TAP_DANCE_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h index b33356e5e5..89707467a6 100644 --- a/keyboards/orthodox/orthodox.h +++ b/keyboards/orthodox/orthodox.h @@ -1,7 +1,7 @@ #ifndef ORTHODOX_H #define ORTHODOX_H -#ifdef SUBPROJECT_rev1 +#ifdef KEYBOARD_orthodox_rev1 #include "rev1.h" #endif diff --git a/keyboards/orthodox/readme.md b/keyboards/orthodox/readme.md index e1fbf94baf..fb591b0070 100644 --- a/keyboards/orthodox/readme.md +++ b/keyboards/orthodox/readme.md @@ -34,10 +34,10 @@ For further reading on build- and flashing-procedures for split ortholinear skel ## First Time Setup -Download or clone the whole firmware and navigate to the keyboards/orthodox directory. Once your dev env is setup, you'll be able to generate the default .hex using: +Download or clone the whole firmware and navigate to the root directory. Once your dev env is setup, you'll be able to generate the default .hex using: ``` -$ make rev1-default +$ make orthodox/rev1:default ``` You will see a lot of output and if everything worked correctly you will see the built hex files in your *root qmk_firmware directory* two levels up: @@ -50,7 +50,7 @@ If you would like to use one of the alternative keymaps, or create your own, cop ``` -$ make rev1-YOUR_KEYMAP_NAME +$ make orthodox/rev1:YOUR_KEYMAP_NAME ``` If everything worked correctly you will see a file: @@ -96,8 +96,8 @@ the two halves, i.e. if your split keyboard has 3 rows in each half, then Flashing ------- -From the `orthodox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. -Example: `make rev2-default-avrdude` +From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing. +Example: `make orthodox/rev2:default:avrdude` Choosing which board to plug the USB cable into (choosing Master) diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h index 05f043b4c7..26715f4096 100644 --- a/keyboards/orthodox/rev1/config.h +++ b/keyboards/orthodox/rev1/config.h @@ -22,7 +22,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 0xFEED diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h index 06282b2349..ceaaaed287 100644 --- a/keyboards/orthodox/rev1/rev1.h +++ b/keyboards/orthodox/rev1/rev1.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef REV1_H #define REV1_H -#include "../orthodox.h" +#include "orthodox.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/orthodox/rev1/rules.mk b/keyboards/orthodox/rev1/rules.mk index a0825b4ef6..f845616741 100644 --- a/keyboards/orthodox/rev1/rules.mk +++ b/keyboards/orthodox/rev1/rules.mk @@ -1,5 +1 @@ -BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../Makefile -endif
\ No newline at end of file +BACKLIGHT_ENABLE = no
\ No newline at end of file diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index 3f40ff2f82..48d6551bc7 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -73,3 +73,5 @@ USE_I2C = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = orthodox/rev1 diff --git a/keyboards/pegasushoof/README.md b/keyboards/pegasushoof/README.md index c4c152d401..b57191c0f6 100644 --- a/keyboards/pegasushoof/README.md +++ b/keyboards/pegasushoof/README.md @@ -7,6 +7,6 @@ Hardware Availability: https://1upkeyboards.com/filco-pegasus-hoof-controller.ht Make example for this keyboard (after setting up your build environment): - make pegasus_hoof-default + make pegasus_hoof:default 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/phantom/readme.md b/keyboards/phantom/readme.md index 7a31d106e0..1ac1363270 100644 --- a/keyboards/phantom/readme.md +++ b/keyboards/phantom/readme.md @@ -11,6 +11,6 @@ Hardware Availability: https://mechanicalkeyboards.com/shop/index.php?l=product_ Make example for this keyboard (after setting up your build environment): - make phantom-default + make phantom:default 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/planck/config.h b/keyboards/planck/config.h index c8f4377f0a..bc7ec031ec 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -81,6 +81,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#include QMK_SUBPROJECT_CONFIG_H - #endif diff --git a/keyboards/planck/keymaps/impossible/rules.mk b/keyboards/planck/keymaps/impossible/rules.mk index cf2c31f0fb..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/impossible/rules.mk +++ b/keyboards/planck/keymaps/impossible/rules.mk @@ -1,7 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif
\ No newline at end of file +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/jeebak/rules.mk b/keyboards/planck/keymaps/jeebak/rules.mk index cf2c31f0fb..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/jeebak/rules.mk +++ b/keyboards/planck/keymaps/jeebak/rules.mk @@ -1,7 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif
\ No newline at end of file +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/jhenahan/rules.mk b/keyboards/planck/keymaps/jhenahan/rules.mk index 83da2a7f89..bb12dd865c 100644 --- a/keyboards/planck/keymaps/jhenahan/rules.mk +++ b/keyboards/planck/keymaps/jhenahan/rules.mk @@ -1,7 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/joe/rules.mk b/keyboards/planck/keymaps/joe/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/joe/rules.mk +++ b/keyboards/planck/keymaps/joe/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/leo/rules.mk b/keyboards/planck/keymaps/leo/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/leo/rules.mk +++ b/keyboards/planck/keymaps/leo/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/lucas/rules.mk b/keyboards/planck/keymaps/lucas/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/lucas/rules.mk +++ b/keyboards/planck/keymaps/lucas/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/mollat/rules.mk b/keyboards/planck/keymaps/mollat/rules.mk index b2ca419445..be3f692802 100644 --- a/keyboards/planck/keymaps/mollat/rules.mk +++ b/keyboards/planck/keymaps/mollat/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -22,7 +17,3 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/planck/keymaps/nico/rules.mk b/keyboards/planck/keymaps/nico/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/nico/rules.mk +++ b/keyboards/planck/keymaps/nico/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/phreed/readme.md b/keyboards/planck/keymaps/phreed/readme.md index 9080222e28..c8fd932438 100644 --- a/keyboards/planck/keymaps/phreed/readme.md +++ b/keyboards/planck/keymaps/phreed/readme.md @@ -28,11 +28,11 @@ Make example for this keyboard (after setting up your build environment): - make planck-rev3-phreed + make planck/rev3:phreed To flash the keyboard - make planck-rev3-phreed-dfu + make planck/rev3:phreed:dfu 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/planck/keymaps/premek/rules.mk b/keyboards/planck/keymaps/premek/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/premek/rules.mk +++ b/keyboards/planck/keymaps/premek/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h index 1004c8b99f..17f351756e 100644 --- a/keyboards/planck/keymaps/pvc/config.h +++ b/keyboards/planck/keymaps/pvc/config.h @@ -15,19 +15,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ortholinear Keyboards -#define PRODUCT The Planck Keyboard -#define DESCRIPTION A compact ortholinear keyboard - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/planck/keymaps/pvc/rules.mk b/keyboards/planck/keymaps/pvc/rules.mk index c92ca1bffa..8a73eab584 100644 --- a/keyboards/planck/keymaps/pvc/rules.mk +++ b/keyboards/planck/keymaps/pvc/rules.mk @@ -1,7 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/sgoodwin/rules.mk b/keyboards/planck/keymaps/sgoodwin/rules.mk index 9081c6d3ec..279e16eb72 100644 --- a/keyboards/planck/keymaps/sgoodwin/rules.mk +++ b/keyboards/planck/keymaps/sgoodwin/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -22,8 +17,4 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this API_SYSEX_ENABLE = no # Disable extra stuff for ergodoxen # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/tak3over/rules.mk b/keyboards/planck/keymaps/tak3over/rules.mk index b2ca419445..247a1fd2ae 100644 --- a/keyboards/planck/keymaps/tak3over/rules.mk +++ b/keyboards/planck/keymaps/tak3over/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file diff --git a/keyboards/planck/keymaps/thermal_printer/rules.mk b/keyboards/planck/keymaps/thermal_printer/rules.mk index 9477d1179a..7c50d87a0f 100644 --- a/keyboards/planck/keymaps/thermal_printer/rules.mk +++ b/keyboards/planck/keymaps/thermal_printer/rules.mk @@ -1,8 +1,3 @@ -# Please remove if no longer applicable -$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) -$(warning Please disable some options in the Makefile to resolve) - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically @@ -23,7 +18,3 @@ PRINTING_ENABLE = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index caef2fe5fa..3980b02f50 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "planck.h" #ifdef ONEHAND_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h index c055d73cb6..0ac4375d1d 100644 --- a/keyboards/planck/planck.h +++ b/keyboards/planck/planck.h @@ -1,8 +1,6 @@ #ifndef PLANCK_H #define PLANCK_H -#include QMK_SUBPROJECT_H - #include "quantum.h" #define PLANCK_MIT( \ @@ -34,4 +32,11 @@ #define KEYMAP PLANCK_GRID #define LAYOUT_ortho_4x12 PLANCK_GRID +#ifdef KEYBOARD_planck_rev3 + #include "rev3.h" +#endif +#ifdef KEYBOARD_planck_rev4 + #include "rev4.h" +#endif + #endif diff --git a/keyboards/planck/readme.md b/keyboards/planck/readme.md index b1a8c23b2e..2d76a312a0 100644 --- a/keyboards/planck/readme.md +++ b/keyboards/planck/readme.md @@ -11,6 +11,6 @@ Hardware Availability: [OLKB.com](https://olkb.com), [Massdrop](https://www.mass Make example for this keyboard (after setting up your build environment): - make planck-rev4-default + make planck/rev4:default 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/planck/rev3/config.h b/keyboards/planck/rev3/config.h index ade11ffe13..45e60962ba 100644 --- a/keyboards/planck/rev3/config.h +++ b/keyboards/planck/rev3/config.h @@ -1,7 +1,7 @@ #ifndef REV3_CONFIG_H #define REV3_CONFIG_H -#include QMK_KEYBOARD_CONFIG_H +#include "config_common.h" #define DEVICE_VER 0x0003 diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h index e5e05236c4..50a09741d5 100644 --- a/keyboards/planck/rev3/rev3.h +++ b/keyboards/planck/rev3/rev3.h @@ -1,6 +1,6 @@ #ifndef REV3_H #define REV3_H -#include QMK_KEYBOARD_H +#include "planck.h" #endif
\ No newline at end of file diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h index dcc76c11c9..4ff7649fb5 100644 --- a/keyboards/planck/rev4/config.h +++ b/keyboards/planck/rev4/config.h @@ -1,7 +1,7 @@ #ifndef REV4_CONFIG_H #define REV4_CONFIG_H -#include QMK_KEYBOARD_CONFIG_H +#include "config_common.h" #define DEVICE_VER 0x0004 diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h index 2d35df19d8..74ec05460a 100644 --- a/keyboards/planck/rev4/rev4.h +++ b/keyboards/planck/rev4/rev4.h @@ -1,6 +1,6 @@ #ifndef REV4_H #define REV4_H -#include QMK_KEYBOARD_H +#include "planck.h" #endif
\ No newline at end of file diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk index c4091f0117..bee5f87895 100644 --- a/keyboards/planck/rules.mk +++ b/keyboards/planck/rules.mk @@ -67,4 +67,6 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -LAYOUTS = ortho_4x12
\ No newline at end of file +LAYOUTS = ortho_4x12 + +DEFAULT_FOLDER = planck/rev4
\ No newline at end of file diff --git a/keyboards/planck/subproject.mk b/keyboards/planck/subproject.mk deleted file mode 100644 index ac79a33546..0000000000 --- a/keyboards/planck/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev4 diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c index cd765fe4af..d9c119b8da 100644 --- a/keyboards/preonic/preonic.c +++ b/keyboards/preonic/preonic.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "preonic.h" #ifdef ONEHAND_ENABLE __attribute__ ((weak)) diff --git a/keyboards/preonic/preonic.h b/keyboards/preonic/preonic.h index 02845a549c..c142825ba3 100644 --- a/keyboards/preonic/preonic.h +++ b/keyboards/preonic/preonic.h @@ -33,6 +33,7 @@ { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ } +#define KEYMAP PREONIC_MIT #define LAYOUT_ortho_5x12 PREONIC_GRID #endif diff --git a/keyboards/preonic/readme.md b/keyboards/preonic/readme.md index 2a4ccd84dc..80f27c7f7b 100644 --- a/keyboards/preonic/readme.md +++ b/keyboards/preonic/readme.md @@ -11,6 +11,6 @@ Hardware Availability: [OLKB.com](https://olkb.com/preonic/), [Massdrop](https:/ Make example for this keyboard (after setting up your build environment): - make preonic-default + make preonic:default 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/ps2avrGB/README.md b/keyboards/ps2avrGB/README.md index f8360aec0c..8fd2af00f4 100644 --- a/keyboards/ps2avrGB/README.md +++ b/keyboards/ps2avrGB/README.md @@ -37,7 +37,7 @@ Then, with the keyboard plugged in, simply run this command from the `qmk_firmware` directory: ``` -$ make ps2avrGB-program +$ make ps2avrGB:program ``` If you prefer, you can just build it and flash the firmware directly with diff --git a/keyboards/roadkit/readme.md b/keyboards/roadkit/readme.md index e99b385f37..fbc40a50fd 100644 --- a/keyboards/roadkit/readme.md +++ b/keyboards/roadkit/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://thevankeyboards.com/products/roadkit-r2?variant=3 Make example for this keyboard (after setting up your build environment): - make roadkit-default + make roadkit:default 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/s60_x/default/config.h b/keyboards/s60_x/default/config.h index 436c6fa8b6..25fc4ad2e0 100644 --- a/keyboards/s60_x/default/config.h +++ b/keyboards/s60_x/default/config.h @@ -1,7 +1,7 @@ #ifndef DEFAULT_CONFIG_H #define DEFAULT_CONFIG_H -#include "../config.h" +#include "config_common.h" #define PRODUCT S60-X #define DESCRIPTION q.m.k. keyboard firmware for S60-X diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h index 5c0d08833f..35754b5233 100644 --- a/keyboards/s60_x/keymaps/bluebear/config.h +++ b/keyboards/s60_x/keymaps/bluebear/config.h @@ -15,30 +15,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_USER_H +#define CONFIG_USER_H #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#undef DEVICE_VER #define DEVICE_VER 0x0003 -#define MANUFACTURER Sentraq -#define PRODUCT S60-RGB -#define DESCRIPTION QMK keyboard firmware for Sentraq S60-RGB - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } -#define UNUSED_PINS - -#define BACKLIGHT_PIN B7 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -65,10 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Underlight configuration */ - -#define RGB_DI_PIN F6 -#define RGBLIGHT_TIMER -#define RGBLED_NUM 10 // Number of LEDs +#undef RGBLIGHT_HUE_STEP +#undef RGBLIGHT_SAT_STEP +#undef RGBLIGHT_VAL_STEP #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/s60_x/keymaps/bluebear/rules.mk b/keyboards/s60_x/keymaps/bluebear/rules.mk index dfefad39da..78d770d262 100644 --- a/keyboards/s60_x/keymaps/bluebear/rules.mk +++ b/keyboards/s60_x/keymaps/bluebear/rules.mk @@ -11,8 +11,4 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -TAP_DANCE_ENABLE = no # Enable tap dancing keys - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +TAP_DANCE_ENABLE = no # Enable tap dancing keys
\ No newline at end of file diff --git a/keyboards/s60_x/readme.md b/keyboards/s60_x/readme.md index 9e1d06150f..cd7049536f 100644 --- a/keyboards/s60_x/readme.md +++ b/keyboards/s60_x/readme.md @@ -8,6 +8,6 @@ Hardware Availability: https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit? Make example for this keyboard (after setting up your build environment): - make s60_x-default + make s60_x:default 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/s60_x/rgb/config.h b/keyboards/s60_x/rgb/config.h index 81efc87d54..ec8b0f49e1 100644 --- a/keyboards/s60_x/rgb/config.h +++ b/keyboards/s60_x/rgb/config.h @@ -1,7 +1,7 @@ #ifndef RBG_CONFIG_H #define RBG_CONFIG_H -#include "../config.h" +#include "config_common.h" #define PRODUCT S60-X-RGB #define DESCRIPTION q.m.k. keyboard firmware for S60-X RGB diff --git a/keyboards/s60_x/rules.mk b/keyboards/s60_x/rules.mk index 5d4b281951..57f7a9a591 100644 --- a/keyboards/s60_x/rules.mk +++ b/keyboards/s60_x/rules.mk @@ -62,4 +62,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend MIDI_ENABLE = no # MIDI controls UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6
\ No newline at end of file +AUDIO_ENABLE = no # Audio output on port C6 + +DEFAULT_FOLDER = s60_x/default
\ No newline at end of file diff --git a/keyboards/s60_x/s60_x.h b/keyboards/s60_x/s60_x.h index 5bf8cfcefa..b70cb5864b 100644 --- a/keyboards/s60_x/s60_x.h +++ b/keyboards/s60_x/s60_x.h @@ -1,10 +1,10 @@ #ifndef S60X_H #define S60X_H -#ifdef SUBPROJECT_default +#ifdef KEYBOARD_s60_x_default #include "default.h" #endif -#ifdef SUBPROJECT_rgb +#ifdef KEYBOARD_s60_x_rgb #include "rgb.h" #endif diff --git a/keyboards/s60_x/subproject.mk b/keyboards/s60_x/subproject.mk deleted file mode 100644 index c20a317c14..0000000000 --- a/keyboards/s60_x/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = default diff --git a/keyboards/s65_x/readme.md b/keyboards/s65_x/readme.md index 9021af4dff..f647f9cb6f 100644 --- a/keyboards/s65_x/readme.md +++ b/keyboards/s65_x/readme.md @@ -8,6 +8,6 @@ Hardware Availability: https://sentraq.com/collections/group-buys/products/gb-s6 Make example for this keyboard (after setting up your build environment): - make s65_x-default + make s65_x:default 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/satan/readme.md b/keyboards/satan/readme.md index 33310ce251..cb887805ff 100644 --- a/keyboards/satan/readme.md +++ b/keyboards/satan/readme.md @@ -10,6 +10,6 @@ Hardware Availability: https://1upkeyboards.com/gh60-satan-pcb.html Make example for this keyboard (after setting up your build environment): - make satan-default + make satan:default 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/sixkeyboard/readme.md b/keyboards/sixkeyboard/readme.md index a2fc9eb46b..c0d87bc2c5 100644 --- a/keyboards/sixkeyboard/readme.md +++ b/keyboards/sixkeyboard/readme.md @@ -7,7 +7,7 @@ Hardware Availability: http://techkeys.us/collections/accessories/products/sixke Make example for this keyboard (after setting up your build environment): - make sixkeyboard-default + make sixkeyboard:default 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/sweet16/readme.md b/keyboards/sweet16/readme.md index 3bd986fc53..435aed68cd 100644 --- a/keyboards/sweet16/readme.md +++ b/keyboards/sweet16/readme.md @@ -9,6 +9,6 @@ Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) Make example for this keyboard (after setting up your build environment): - make sweet16-default + make sweet16:default 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/tada68/readme.md b/keyboards/tada68/readme.md index cc025cad4e..a18758ac94 100755 --- a/keyboards/tada68/readme.md +++ b/keyboards/tada68/readme.md @@ -9,7 +9,7 @@ Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/products/tada68-m Make example for this keyboard (after setting up your build environment): - make tada68-default-bin + make tada68:default:bin 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. @@ -19,7 +19,7 @@ See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) 1) from the `qmk_firmware\` directory run: ``` -$ make tada68-default-flashbin +$ make tada68:default:flashbin ``` 2) Connect your keyboard to Windows computer, hit the reset button on the TADA, the lights will start flashing. diff --git a/keyboards/tiger_lily/readme.md b/keyboards/tiger_lily/readme.md index b24c468366..99da94742b 100644 --- a/keyboards/tiger_lily/readme.md +++ b/keyboards/tiger_lily/readme.md @@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0 Make example for this keyboard (after setting up your build environment): - make tiger_lily-default + make tiger_lily:default 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/tomato/readme.md b/keyboards/tomato/readme.md index fb38089963..e3851f18ca 100644 --- a/keyboards/tomato/readme.md +++ b/keyboards/tomato/readme.md @@ -12,7 +12,7 @@ Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.c Make example for this keyboard (after setting up your build environment): - make tomato-default + make tomato:default 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/tv44/readme.md b/keyboards/tv44/readme.md index f0a277dec9..c2394c0313 100644 --- a/keyboards/tv44/readme.md +++ b/keyboards/tv44/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://thevankeyboards.com/products/minivan-r4-keyboard- Make example for this keyboard (after setting up your build environment): - make tv44-default + make tv44:default 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/uk78/keymaps/rask/README.md b/keyboards/uk78/keymaps/rask/README.md index 86eac4bf86..1fabd4d496 100644 --- a/keyboards/uk78/keymaps/rask/README.md +++ b/keyboards/uk78/keymaps/rask/README.md @@ -7,4 +7,4 @@ Plug the keyboard in and press the reset button, then in the main `qmk_firmware` directory run - $ sudo make uk78-rask-dfu + $ sudo make uk78:rask:dfu diff --git a/keyboards/uk78/readme.md b/keyboards/uk78/readme.md index 2f29ca48c0..eb4d1824c2 100644 --- a/keyboards/uk78/readme.md +++ b/keyboards/uk78/readme.md @@ -11,6 +11,6 @@ A fully customizable 60%+numpad keyboard. Make example for this keyboard (after setting up your build environment): - make uk78-default + make uk78:default 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/v60_type_r/readme.md b/keyboards/v60_type_r/readme.md index 685fcba938..c6be290913 100644 --- a/keyboards/v60_type_r/readme.md +++ b/keyboards/v60_type_r/readme.md @@ -23,7 +23,7 @@ Hardware Availability: [mechanicalkeyboards.com](https://mechanicalkeyboards.com Make example for this keyboard (after setting up your build environment): - make v60_type_r-default + make v60_type_r:default 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/vision_division/readme.md b/keyboards/vision_division/readme.md index 880c62f58d..058629db3e 100644 --- a/keyboards/vision_division/readme.md +++ b/keyboards/vision_division/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83692.msg2227856#msg Make example for this keyboard (after setting up your build environment): - make vision_division-default + make vision_division:default 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/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 diff --git a/keyboards/whitefox/readme.md b/keyboards/whitefox/readme.md index 2f1445d33d..c0fa7b4e33 100644 --- a/keyboards/whitefox/readme.md +++ b/keyboards/whitefox/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://input.club/whitefox/ Make example for this keyboard (after setting up your build environment): - make whitefox-default + make whitefox:default 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/xd60/keymaps/default/readme.md b/keyboards/xd60/keymaps/default/readme.md index d2a87bd722..248e0a6067 100644 --- a/keyboards/xd60/keymaps/default/readme.md +++ b/keyboards/xd60/keymaps/default/readme.md @@ -6,4 +6,4 @@ Default Keymap for XD60 as indicated on the original sale page. ## Build -To build the default keymap, simply run `make xd60-default`. +To build the default keymap, simply run `make xd60:default`. diff --git a/keyboards/xd60/keymaps/kmontag42/readme.md b/keyboards/xd60/keymaps/kmontag42/readme.md index 946ae56063..a23f6a8bec 100644 --- a/keyboards/xd60/keymaps/kmontag42/readme.md +++ b/keyboards/xd60/keymaps/kmontag42/readme.md @@ -15,4 +15,4 @@ This layout is WIP for me as I use my shiny new keyboard more and more. I will * I use emacs, which could account for some of the oddities in my layout and macros ## Build -To build the default keymap, simply run `make xd60-kmontag42`. +To build the default keymap, simply run `make xd60:kmontag42`. diff --git a/keyboards/xd60/keymaps/yuuki/README.md b/keyboards/xd60/keymaps/yuuki/README.md index 56b2c811c1..83fdbf2b70 100644 --- a/keyboards/xd60/keymaps/yuuki/README.md +++ b/keyboards/xd60/keymaps/yuuki/README.md @@ -4,7 +4,7 @@ Customized xd60 keymap with inspirations from HHKB and the layout I used on my V ## Programming Instructions -Change the layout in `keymap.c` then run `make xd60-yuuki`. The compiled file will be located in `.build/xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run: +Change the layout in `keymap.c` then run `make xd60:yuuki`. The compiled file will be located in `.build/xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run: * `sudo dfu-programmer atmega32u4 erase` * `sudo dfu-programmer atmega32u4 flash .build/xd60-yuuki.hex` diff --git a/keyboards/xd60/readme.md b/keyboards/xd60/readme.md index d7aa3d9b9e..389423ed0e 100644 --- a/keyboards/xd60/readme.md +++ b/keyboards/xd60/readme.md @@ -11,6 +11,6 @@ Hardware Availability: https://www.massdrop.com/buy/xd60-xd64-custom-mechanical- Make example for this keyboard (after setting up your build environment): - make xd60-default + make xd60:default 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/xd75/readme.md b/keyboards/xd75/readme.md index d5dbdef25f..5f4d2e85ff 100644 --- a/keyboards/xd75/readme.md +++ b/keyboards/xd75/readme.md @@ -17,13 +17,13 @@ it using DFU. ### Default -To build with the default keymap, simply run `make xd75-default` from the root directory (i.e. two levels above this file), and to install via DFU, `make xd75-default-dfu`, also from the root directory. +To build with the default keymap, simply run `make xd75:default` from the root directory (i.e. two levels above this file), and to install via DFU, `make xd75:default:dfu`, also from the root directory. Note that DFU is likely to require root permissions, so installing the firmware likely requires a command line like: ``` -$ sudo make xd75-default-dfu +$ sudo make xd75:default:dfu ``` ### Other Keymaps @@ -42,6 +42,6 @@ To build the firmware binary hex file for a specific keymap, and install it, using DFU, just do `make` with a keymap like this: ``` -$ make xd75-[default|<name>] +$ make xd75:[default|<name>] ``` diff --git a/keyboards/ymd96/README.md b/keyboards/ymd96/README.md index 869dfb1018..a60323ab95 100644 --- a/keyboards/ymd96/README.md +++ b/keyboards/ymd96/README.md @@ -46,7 +46,7 @@ $ pip install pyusb Build the keyboard with ``` -$ make ymd96-default +$ make ymd96:default ``` If you make your own layout, change the `default` word to whatever your layout is. |