From 0082ecf1f3328eb45a865bf50d3f44ca632d9f7b Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 16 Dec 2019 11:26:02 -0800 Subject: [PATCH] Move kwerdenker's personal keymap from RGB (#7645) * Move kwerdenker's personal keymap from RGB Talked to Maartenwut about making RGB an actual template instead of kwerdenker's keymap. Free'd up B7 so it can be used for audio in agreement with MW. He's considering adding a speaker footprint to next rev of plain60, and only B7 can be used with Audio. RGB uses bitbang driver so it doesn't really make any difference if it's pin B0. - RGB should be a template for other people to modify, not a personal keymap - change default pin to B0 to free up B7 for audio use - rename RGB to kwerdenker * Add RGB keycodes to FN layer * don't use uppercase in keymap names - doesn't work properly on MacOS or Windows * Add an audio specific keymap * Enum instead of define * Suggested change to keymap - maintain compatibility with old keymap --- .../maartenwut/plain60/keymaps/audio/config.h | 3 +++ .../maartenwut/plain60/keymaps/audio/keymap.c | 27 +++++++++++++++++++ .../maartenwut/plain60/keymaps/audio/rules.mk | 4 +++ .../keymaps/{RGB => kwerdenker}/config.h | 0 .../keymaps/{RGB => kwerdenker}/keymap.c | 0 .../keymaps/{RGB => kwerdenker}/rules.mk | 0 .../maartenwut/plain60/keymaps/rgb/config.h | 8 ++++++ .../maartenwut/plain60/keymaps/rgb/keymap.c | 27 +++++++++++++++++++ .../maartenwut/plain60/keymaps/rgb/rules.mk | 3 +++ 9 files changed, 72 insertions(+) create mode 100644 keyboards/maartenwut/plain60/keymaps/audio/config.h create mode 100644 keyboards/maartenwut/plain60/keymaps/audio/keymap.c create mode 100644 keyboards/maartenwut/plain60/keymaps/audio/rules.mk rename keyboards/maartenwut/plain60/keymaps/{RGB => kwerdenker}/config.h (100%) rename keyboards/maartenwut/plain60/keymaps/{RGB => kwerdenker}/keymap.c (100%) rename keyboards/maartenwut/plain60/keymaps/{RGB => kwerdenker}/rules.mk (100%) create mode 100644 keyboards/maartenwut/plain60/keymaps/rgb/config.h create mode 100644 keyboards/maartenwut/plain60/keymaps/rgb/keymap.c create mode 100644 keyboards/maartenwut/plain60/keymaps/rgb/rules.mk diff --git a/keyboards/maartenwut/plain60/keymaps/audio/config.h b/keyboards/maartenwut/plain60/keymaps/audio/config.h new file mode 100644 index 000000000..9a43b7fbe --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/audio/config.h @@ -0,0 +1,3 @@ +#pragma once + +#define B7_AUDIO diff --git a/keyboards/maartenwut/plain60/keymaps/audio/keymap.c b/keyboards/maartenwut/plain60/keymaps/audio/keymap.c new file mode 100644 index 000000000..91ac37501 --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/audio/keymap.c @@ -0,0 +1,27 @@ +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum _layers { + _MA, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_MA] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, \ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(_FN, KC_UP), \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(_FN, KC_APP), KC_RCTRL), + +[_FN] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + AU_TOG, MU_TOG, MU_MOD, CK_TOGG, _______, _______, _______, _______) +}; diff --git a/keyboards/maartenwut/plain60/keymaps/audio/rules.mk b/keyboards/maartenwut/plain60/keymaps/audio/rules.mk new file mode 100644 index 000000000..600978d17 --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/audio/rules.mk @@ -0,0 +1,4 @@ +AUDIO_ENABLE = yes +RAW_ENABLE = no +DYNAMIC_KEYMAP_ENABLE = no + diff --git a/keyboards/maartenwut/plain60/keymaps/RGB/config.h b/keyboards/maartenwut/plain60/keymaps/kwerdenker/config.h similarity index 100% rename from keyboards/maartenwut/plain60/keymaps/RGB/config.h rename to keyboards/maartenwut/plain60/keymaps/kwerdenker/config.h diff --git a/keyboards/maartenwut/plain60/keymaps/RGB/keymap.c b/keyboards/maartenwut/plain60/keymaps/kwerdenker/keymap.c similarity index 100% rename from keyboards/maartenwut/plain60/keymaps/RGB/keymap.c rename to keyboards/maartenwut/plain60/keymaps/kwerdenker/keymap.c diff --git a/keyboards/maartenwut/plain60/keymaps/RGB/rules.mk b/keyboards/maartenwut/plain60/keymaps/kwerdenker/rules.mk similarity index 100% rename from keyboards/maartenwut/plain60/keymaps/RGB/rules.mk rename to keyboards/maartenwut/plain60/keymaps/kwerdenker/rules.mk diff --git a/keyboards/maartenwut/plain60/keymaps/rgb/config.h b/keyboards/maartenwut/plain60/keymaps/rgb/config.h new file mode 100644 index 000000000..842693812 --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/rgb/config.h @@ -0,0 +1,8 @@ +#pragma once + +#define RGB_DI_PIN B0 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 20 // limit to 20 otherwise brownouts +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/maartenwut/plain60/keymaps/rgb/keymap.c b/keyboards/maartenwut/plain60/keymaps/rgb/keymap.c new file mode 100644 index 000000000..abfb5f6b1 --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/rgb/keymap.c @@ -0,0 +1,27 @@ +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum _layers { + _MA, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_MA] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, \ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(_FN, KC_UP), \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(_FN, KC_APP), KC_RCTRL), + +[_FN] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/maartenwut/plain60/keymaps/rgb/rules.mk b/keyboards/maartenwut/plain60/keymaps/rgb/rules.mk new file mode 100644 index 000000000..b6cd87b7d --- /dev/null +++ b/keyboards/maartenwut/plain60/keymaps/rgb/rules.mk @@ -0,0 +1,3 @@ +RGBLIGHT_ENABLE = yes +RAW_ENABLE = no +DYNAMIC_KEYMAP_ENABLE = no