diff options
Diffstat (limited to 'keyboards/planck')
25 files changed, 31 insertions, 148 deletions
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index c8f4377f0..bc7ec031e 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/>. | |||
| 81 | //#define NO_ACTION_MACRO | 81 | //#define NO_ACTION_MACRO |
| 82 | //#define NO_ACTION_FUNCTION | 82 | //#define NO_ACTION_FUNCTION |
| 83 | 83 | ||
| 84 | #include QMK_SUBPROJECT_CONFIG_H | ||
| 85 | |||
| 86 | #endif | 84 | #endif |
diff --git a/keyboards/planck/keymaps/impossible/rules.mk b/keyboards/planck/keymaps/impossible/rules.mk index cf2c31f0f..247a1fd2a 100644 --- a/keyboards/planck/keymaps/impossible/rules.mk +++ b/keyboards/planck/keymaps/impossible/rules.mk | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | # Build Options | 1 | # Build Options |
| 6 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 7 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 20 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 21 | 17 | ||
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 24 | |||
| 25 | ifndef QUANTUM_DIR | ||
| 26 | include ../../../../Makefile | ||
| 27 | endif \ No newline at end of file | ||
diff --git a/keyboards/planck/keymaps/jeebak/rules.mk b/keyboards/planck/keymaps/jeebak/rules.mk index cf2c31f0f..247a1fd2a 100644 --- a/keyboards/planck/keymaps/jeebak/rules.mk +++ b/keyboards/planck/keymaps/jeebak/rules.mk | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | # Build Options | 1 | # Build Options |
| 6 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 7 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 20 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 21 | 17 | ||
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 24 | |||
| 25 | ifndef QUANTUM_DIR | ||
| 26 | include ../../../../Makefile | ||
| 27 | endif \ No newline at end of file | ||
diff --git a/keyboards/planck/keymaps/jhenahan/rules.mk b/keyboards/planck/keymaps/jhenahan/rules.mk index 83da2a7f8..bb12dd865 100644 --- a/keyboards/planck/keymaps/jhenahan/rules.mk +++ b/keyboards/planck/keymaps/jhenahan/rules.mk | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | # Build Options | 1 | # Build Options |
| 6 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 7 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 20 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 21 | 17 | ||
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 24 | |||
| 25 | ifndef QUANTUM_DIR | ||
| 26 | include ../../../../Makefile | ||
| 27 | endif | ||
diff --git a/keyboards/planck/keymaps/joe/rules.mk b/keyboards/planck/keymaps/joe/rules.mk index b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/joe/rules.mk +++ b/keyboards/planck/keymaps/joe/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/leo/rules.mk b/keyboards/planck/keymaps/leo/rules.mk index b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/leo/rules.mk +++ b/keyboards/planck/keymaps/leo/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/lucas/rules.mk b/keyboards/planck/keymaps/lucas/rules.mk index b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/lucas/rules.mk +++ b/keyboards/planck/keymaps/lucas/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/mollat/rules.mk b/keyboards/planck/keymaps/mollat/rules.mk index b2ca41944..be3f69280 100644 --- a/keyboards/planck/keymaps/mollat/rules.mk +++ b/keyboards/planck/keymaps/mollat/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -22,7 +17,3 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this | |||
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/nico/rules.mk b/keyboards/planck/keymaps/nico/rules.mk index b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/nico/rules.mk +++ b/keyboards/planck/keymaps/nico/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/phreed/readme.md b/keyboards/planck/keymaps/phreed/readme.md index 9080222e2..c8fd93243 100644 --- a/keyboards/planck/keymaps/phreed/readme.md +++ b/keyboards/planck/keymaps/phreed/readme.md | |||
| @@ -28,11 +28,11 @@ | |||
| 28 | 28 | ||
| 29 | Make example for this keyboard (after setting up your build environment): | 29 | Make example for this keyboard (after setting up your build environment): |
| 30 | 30 | ||
| 31 | make planck-rev3-phreed | 31 | make planck/rev3:phreed |
| 32 | 32 | ||
| 33 | To flash the keyboard | 33 | To flash the keyboard |
| 34 | 34 | ||
| 35 | make planck-rev3-phreed-dfu | 35 | make planck/rev3:phreed:dfu |
| 36 | 36 | ||
| 37 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the | 37 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the |
| 38 | [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 38 | [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 b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/premek/rules.mk +++ b/keyboards/planck/keymaps/premek/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h index 1004c8b99..17f351756 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 | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef CONFIG_H | 18 | #ifndef CONFIG_USER_H |
| 19 | #define CONFIG_H | 19 | #define CONFIG_USER_H |
| 20 | 20 | ||
| 21 | #include "config_common.h" | 21 | #include "config_common.h" |
| 22 | 22 | ||
| 23 | /* USB Device descriptor parameter */ | ||
| 24 | #define VENDOR_ID 0xFEED | ||
| 25 | #define PRODUCT_ID 0x6060 | ||
| 26 | #define DEVICE_VER 0x0001 | ||
| 27 | #define MANUFACTURER Ortholinear Keyboards | ||
| 28 | #define PRODUCT The Planck Keyboard | ||
| 29 | #define DESCRIPTION A compact ortholinear keyboard | ||
| 30 | |||
| 31 | /* key matrix size */ | 23 | /* key matrix size */ |
| 32 | #define MATRIX_ROWS 4 | 24 | #define MATRIX_ROWS 4 |
| 33 | #define MATRIX_COLS 12 | 25 | #define MATRIX_COLS 12 |
diff --git a/keyboards/planck/keymaps/pvc/rules.mk b/keyboards/planck/keymaps/pvc/rules.mk index c92ca1bff..8a73eab58 100644 --- a/keyboards/planck/keymaps/pvc/rules.mk +++ b/keyboards/planck/keymaps/pvc/rules.mk | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | # Build Options | 1 | # Build Options |
| 6 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 7 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -20,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 20 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 21 | 17 | ||
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 24 | |||
| 25 | ifndef QUANTUM_DIR | ||
| 26 | include ../../../../Makefile | ||
| 27 | endif | ||
diff --git a/keyboards/planck/keymaps/sgoodwin/rules.mk b/keyboards/planck/keymaps/sgoodwin/rules.mk index 9081c6d3e..279e16eb7 100644 --- a/keyboards/planck/keymaps/sgoodwin/rules.mk +++ b/keyboards/planck/keymaps/sgoodwin/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -22,8 +17,4 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this | |||
| 22 | API_SYSEX_ENABLE = no # Disable extra stuff for ergodoxen | 17 | API_SYSEX_ENABLE = no # Disable extra stuff for ergodoxen |
| 23 | 18 | ||
| 24 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 25 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 26 | |||
| 27 | ifndef QUANTUM_DIR | ||
| 28 | include ../../../../Makefile | ||
| 29 | endif | ||
diff --git a/keyboards/planck/keymaps/tak3over/rules.mk b/keyboards/planck/keymaps/tak3over/rules.mk index b2ca41944..247a1fd2a 100644 --- a/keyboards/planck/keymaps/tak3over/rules.mk +++ b/keyboards/planck/keymaps/tak3over/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -21,8 +16,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 21 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 22 | 17 | ||
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 24 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 19 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file |
| 25 | |||
| 26 | ifndef QUANTUM_DIR | ||
| 27 | include ../../../../Makefile | ||
| 28 | endif | ||
diff --git a/keyboards/planck/keymaps/thermal_printer/rules.mk b/keyboards/planck/keymaps/thermal_printer/rules.mk index 9477d1179..7c50d87a0 100644 --- a/keyboards/planck/keymaps/thermal_printer/rules.mk +++ b/keyboards/planck/keymaps/thermal_printer/rules.mk | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # Please remove if no longer applicable | ||
| 2 | $(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD) | ||
| 3 | $(warning Please disable some options in the Makefile to resolve) | ||
| 4 | |||
| 5 | |||
| 6 | # Build Options | 1 | # Build Options |
| 7 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 8 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| @@ -23,7 +18,3 @@ PRINTING_ENABLE = yes | |||
| 23 | 18 | ||
| 24 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 25 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 26 | |||
| 27 | ifndef QUANTUM_DIR | ||
| 28 | include ../../../../Makefile | ||
| 29 | endif | ||
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index caef2fe5f..3980b02f5 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include "planck.h" |
| 2 | 2 | ||
| 3 | #ifdef ONEHAND_ENABLE | 3 | #ifdef ONEHAND_ENABLE |
| 4 | __attribute__ ((weak)) | 4 | __attribute__ ((weak)) |
diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h index c055d73cb..0ac4375d1 100644 --- a/keyboards/planck/planck.h +++ b/keyboards/planck/planck.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef PLANCK_H | 1 | #ifndef PLANCK_H |
| 2 | #define PLANCK_H | 2 | #define PLANCK_H |
| 3 | 3 | ||
| 4 | #include QMK_SUBPROJECT_H | ||
| 5 | |||
| 6 | #include "quantum.h" | 4 | #include "quantum.h" |
| 7 | 5 | ||
| 8 | #define PLANCK_MIT( \ | 6 | #define PLANCK_MIT( \ |
| @@ -34,4 +32,11 @@ | |||
| 34 | #define KEYMAP PLANCK_GRID | 32 | #define KEYMAP PLANCK_GRID |
| 35 | #define LAYOUT_ortho_4x12 PLANCK_GRID | 33 | #define LAYOUT_ortho_4x12 PLANCK_GRID |
| 36 | 34 | ||
| 35 | #ifdef KEYBOARD_planck_rev3 | ||
| 36 | #include "rev3.h" | ||
| 37 | #endif | ||
| 38 | #ifdef KEYBOARD_planck_rev4 | ||
| 39 | #include "rev4.h" | ||
| 40 | #endif | ||
| 41 | |||
| 37 | #endif | 42 | #endif |
diff --git a/keyboards/planck/readme.md b/keyboards/planck/readme.md index b1a8c23b2..2d76a312a 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 | |||
| 11 | 11 | ||
| 12 | Make example for this keyboard (after setting up your build environment): | 12 | Make example for this keyboard (after setting up your build environment): |
| 13 | 13 | ||
| 14 | make planck-rev4-default | 14 | make planck/rev4:default |
| 15 | 15 | ||
| 16 | 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 | 16 | 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 ade11ffe1..45e60962b 100644 --- a/keyboards/planck/rev3/config.h +++ b/keyboards/planck/rev3/config.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef REV3_CONFIG_H | 1 | #ifndef REV3_CONFIG_H |
| 2 | #define REV3_CONFIG_H | 2 | #define REV3_CONFIG_H |
| 3 | 3 | ||
| 4 | #include QMK_KEYBOARD_CONFIG_H | 4 | #include "config_common.h" |
| 5 | 5 | ||
| 6 | #define DEVICE_VER 0x0003 | 6 | #define DEVICE_VER 0x0003 |
| 7 | 7 | ||
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h index e5e05236c..50a09741d 100644 --- a/keyboards/planck/rev3/rev3.h +++ b/keyboards/planck/rev3/rev3.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #ifndef REV3_H | 1 | #ifndef REV3_H |
| 2 | #define REV3_H | 2 | #define REV3_H |
| 3 | 3 | ||
| 4 | #include QMK_KEYBOARD_H | 4 | #include "planck.h" |
| 5 | 5 | ||
| 6 | #endif \ No newline at end of file | 6 | #endif \ No newline at end of file |
diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h index dcc76c11c..4ff7649fb 100644 --- a/keyboards/planck/rev4/config.h +++ b/keyboards/planck/rev4/config.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef REV4_CONFIG_H | 1 | #ifndef REV4_CONFIG_H |
| 2 | #define REV4_CONFIG_H | 2 | #define REV4_CONFIG_H |
| 3 | 3 | ||
| 4 | #include QMK_KEYBOARD_CONFIG_H | 4 | #include "config_common.h" |
| 5 | 5 | ||
| 6 | #define DEVICE_VER 0x0004 | 6 | #define DEVICE_VER 0x0004 |
| 7 | 7 | ||
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h index 2d35df19d..74ec05460 100644 --- a/keyboards/planck/rev4/rev4.h +++ b/keyboards/planck/rev4/rev4.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #ifndef REV4_H | 1 | #ifndef REV4_H |
| 2 | #define REV4_H | 2 | #define REV4_H |
| 3 | 3 | ||
| 4 | #include QMK_KEYBOARD_H | 4 | #include "planck.h" |
| 5 | 5 | ||
| 6 | #endif \ No newline at end of file | 6 | #endif \ No newline at end of file |
diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk index c4091f011..bee5f8789 100644 --- a/keyboards/planck/rules.mk +++ b/keyboards/planck/rules.mk | |||
| @@ -67,4 +67,6 @@ API_SYSEX_ENABLE = no | |||
| 67 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 67 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 68 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 68 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 69 | 69 | ||
| 70 | LAYOUTS = ortho_4x12 \ No newline at end of file | 70 | LAYOUTS = ortho_4x12 |
| 71 | |||
| 72 | 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 ac79a3354..000000000 --- a/keyboards/planck/subproject.mk +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | SUBPROJECT_DEFAULT = rev4 | ||
