summaryrefslogtreecommitdiff
path: root/keyboards/maple_computing
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maple_computing')
-rw-r--r--keyboards/maple_computing/6ball/config.h11
-rw-r--r--keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h2
-rw-r--r--keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c6
-rw-r--r--keyboards/maple_computing/christmas_tree/V2017/V2017.c1
-rw-r--r--keyboards/maple_computing/christmas_tree/readme.md2
-rw-r--r--keyboards/maple_computing/christmas_tree/rules.mk2
-rw-r--r--keyboards/maple_computing/christmas_tree/v2017/info.json (renamed from keyboards/maple_computing/christmas_tree/V2017/info.json)0
-rw-r--r--keyboards/maple_computing/christmas_tree/v2017/rules.mk (renamed from keyboards/maple_computing/christmas_tree/V2017/rules.mk)0
-rw-r--r--keyboards/maple_computing/christmas_tree/v2017/v2017.c1
-rw-r--r--keyboards/maple_computing/christmas_tree/v2017/v2017.h (renamed from keyboards/maple_computing/christmas_tree/V2017/V2017.h)0
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h13
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/drashna/config.h13
-rw-r--r--keyboards/maple_computing/launchpad/rev1/config.h11
-rw-r--r--keyboards/maple_computing/lets_split_eh/eh/config.h12
-rw-r--r--keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c6
-rw-r--r--keyboards/maple_computing/minidox/keymaps/alairock/config.h13
-rw-r--r--keyboards/maple_computing/minidox/keymaps/alairock/keymap.c2
-rw-r--r--keyboards/maple_computing/minidox/keymaps/bepo/config.h2
-rw-r--r--keyboards/maple_computing/minidox/keymaps/bepo/keymap.c2
-rw-r--r--keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c14
-rw-r--r--keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c2
-rw-r--r--keyboards/maple_computing/minidox/keymaps/that_canadian/config.h15
-rw-r--r--keyboards/maple_computing/minidox/keymaps/tomb0y/README.md49
-rw-r--r--keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c142
-rw-r--r--keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c4
-rw-r--r--keyboards/maple_computing/minidox/keymaps/xyverz/config.h13
-rw-r--r--keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c2
-rw-r--r--keyboards/maple_computing/minidox/rev1/config.h2
-rw-r--r--keyboards/maple_computing/the_ruler/config.h11
31 files changed, 117 insertions, 238 deletions
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 40fb44e7a7..326b5096c4 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -30,7 +30,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGB_DI_PIN F7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6 // Number of LEDs
/* COL2ROW or ROW2COL */
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
index d67935a9fd..33bb381a4e 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for magic key command */
#undef IS_COMMAND
#define IS_COMMAND() ( \
- get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \
+ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT)) \
)
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
index 231e3cf44d..3c6328a02a 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
LAYOUT_wrapper( \
MT(MOD_LALT,KC_TAB), K01, K02, K03, K04, K05, LT(RAISE,KC_PGUP), K06, K07, K08, K09, K0A, KC_BSPC, \
SFT_T(KC_ESC), K11, K12, K13, K14, K15, LT(LOWER,KC_PGDN), K16, K17, K18, K19, K1A, SFT_T(KC_ENT), \
- MT(MOD_LCTL,KC_DEL), K21, K22, K23, K24, K25, KC_SPACE, K26, K27, K28, K29, K2A, KC_LEAD \
+ MT(MOD_LCTL,KC_DEL), K21, K22, K23, K24, K25, KC_SPACE, K26, K27, K28, K29, K2A, QK_LEAD \
)
/*
@@ -114,8 +114,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_wrapper(\
KC_MAKE, _________________ADJUST_L1_________________, _______, _________________ADJUST_R1_________________, KC_RESET,
- VRSN, _________________ADJUST_L2_________________, _______, _________________ADJUST_R2_________________, EEP_RST,
- DEBUG, _________________ADJUST_L3_________________, _______, _________________ADJUST_R3_________________, _______
+ VRSN, _________________ADJUST_L2_________________, _______, _________________ADJUST_R2_________________, EE_CLR,
+ DB_TOGG, _________________ADJUST_L3_________________, _______, _________________ADJUST_R3_________________, _______
)
};
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.c b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
deleted file mode 100644
index e367270592..0000000000
--- a/keyboards/maple_computing/christmas_tree/V2017/V2017.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "V2017.h" \ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/readme.md b/keyboards/maple_computing/christmas_tree/readme.md
index 3ba255a18c..2ede444ce4 100644
--- a/keyboards/maple_computing/christmas_tree/readme.md
+++ b/keyboards/maple_computing/christmas_tree/readme.md
@@ -9,6 +9,6 @@ Keyboard Maintainer: [That-Canadian](https://github.com/That-Canadian)
Make example for this keyboard (after setting up your build environment):
- make maple_computing/christmas_tree/V2017:default
+ make maple_computing/christmas_tree/v2017:default
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
index 45ac883163..ed78c6fabe 100644
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-DEFAULT_FOLDER = maple_computing/christmas_tree/V2017
+DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json
index 6d00c2519f..6d00c2519f 100644
--- a/keyboards/maple_computing/christmas_tree/V2017/info.json
+++ b/keyboards/maple_computing/christmas_tree/v2017/info.json
diff --git a/keyboards/maple_computing/christmas_tree/V2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk
index 184a1f2247..184a1f2247 100644
--- a/keyboards/maple_computing/christmas_tree/V2017/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/v2017/rules.mk
diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
new file mode 100644
index 0000000000..22067e5367
--- /dev/null
+++ b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
@@ -0,0 +1 @@
+#include "v2017.h" \ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h
index f779c0ed47..f779c0ed47 100644
--- a/keyboards/maple_computing/christmas_tree/V2017/V2017.h
+++ b/keyboards/maple_computing/christmas_tree/v2017/v2017.h
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
index cae1450c15..3ee1ec3013 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
@@ -2,8 +2,17 @@
/* Underlight Configuration */
#define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 2 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17 \ No newline at end of file
+#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
index b14becc25b..7329440ee1 100644
--- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
@@ -19,13 +19,22 @@
/* Underlight Configuration */
#undef RGB_DI_PIN
#define RGB_DI_PIN F5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#undef RGBLED_NUM
#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define AUDIO_PIN B7
#define AUDIO_CLICKY
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index 427e04618c..cd0ea962c2 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -27,4 +27,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 10
#define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index b9e6da535d..c2f92b7274 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -35,7 +35,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN B2
#define RGBLED_NUM 12 // Number of LEDs (each hand)
#define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
/* Split Defines */
#define SPLIT_HAND_PIN D3
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
index 552ed7b183..e24ad18320 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = LAYOUT( \
KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_TAB, KC_BSPC, KC_F, KC_G, KC_C, KC_R, KC_L, \
KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, KC_ENT, KC_D, KC_H, KC_T, KC_N, KC_S, \
- KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, OSM(MOD_LSFT), OSM(MOD_RSFT), KC_B, KC_M, KC_W, KC_V, KC_Z, \
+ KC_SCLN, KC_Q, KC_J, KC_K, KC_X, OSM(MOD_LSFT), OSM(MOD_RSFT), KC_B, KC_M, KC_W, KC_V, KC_Z, \
KC_LCTL, KC_LGUI, KC_LALT, OSM(MOD_LSFT), KC_SPC, LOWER, RAISE, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
),
/*[BASE] = LAYOUT(
* KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
* KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
- * KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
- * OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
+ * KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
+ * OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
* ),
*KC_GRV,
*/
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
index 6b0069f4b2..e51d11b241 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
@@ -24,15 +24,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-#define USE_SERIAL
-
#define EE_HANDS
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLED_NUM 8 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
index c25c0b00d0..2bcad47722 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
KC_TAB, KC_VOLD, KC_VOLU, KC_MPLY, KC_MFFD, KC_MUTE, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, \
_______, KC_GRV, KC_LGUI, KC_LALT, KC_MRWD, _______, _______, _______, KC_BSLS, KC_QUOT, \
- KC_LCTRL, KC_BSPC, KC_ENT, _______, _______, _______ \
+ KC_LCTL, KC_BSPC, KC_ENT, _______, _______, _______ \
),
/* Lower
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
index 7338c24c68..f2a669ec94 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
@@ -1,6 +1,4 @@
#pragma once
-#define USE_SERIAL
-
#define EE_HANDS
#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
index 331a22314d..699822ffc0 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_LOWER] = LAYOUT(
ALGR(BP_B), BP_EACU, ALGR(BP_P), ALGR(BP_O), BP_EGRV, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_MS_WH_UP,
- ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E), BP_DLR, KC_PGDOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MS_WH_DOWN,
+ ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E), BP_DLR, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MS_WH_DOWN,
BP_AGRV, KC_LALT, KC_LCTL, KC_LSFT, BP_CCED, _______, KC_LSFT, KC_LCTL, KC_LALT, _______,
_______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
index b2169947b7..0cd6c2b994 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
@@ -6,7 +6,6 @@
#define IGNORE_MOD_TAP_INTERRUPT
#define ONESHOT_TIMEOUT 1000
#define TAPPING_TERM 200
-#define USE_SERIAL
// optional configuration:
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
index c665e955a3..aec8c56b18 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
@@ -96,8 +96,8 @@ void sftpls_reset (qk_tap_dance_state_t *state, void *user_data);
#define SFT_QOT LSFT_T(KC_QUOT)
#define SYM_OS OSL(_SYM)
#define SYS_Z LT(_SYS, KC_Z)
-#define VOL_DN S(LALT(KC__VOLDOWN))
-#define VOL_UP S(LALT(KC__VOLUP))
+#define VOL_DN S(LALT(KC_VOLD))
+#define VOL_UP S(LALT(KC_VOLU))
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* If you use QWERTY + the Vanilla numbers primarily, change NUMLK_E to NUMLK_N here.
*
* ,----------------------------------. ,----------------------------------.
- * | QK_BOOT|DEBUG |QWERTY|CMKDHM| | | | VOL--| VOL++|BRITE-|BRITE+|
+ * | Boot |Debug |QWERTY|CMKDHM| | | | VOL--| VOL++|BRITE-|BRITE+|
* |------+------+------+------+------| |------+------+------+------+------|
* | SHIFT| CTRL | ALT | GUI |NAV LK| | POWER| VOL- | VOL+ | MUTE | MPLY |
* |------+------+------+------+------| |------+------+------+------+------|
@@ -162,10 +162,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `------' `------'
*/
[_SYS] = LAYOUT( \
- QK_BOOT, DEBUG, QWERTY, CMK_DHM, _______, _______, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
- KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK, KC_POWER, VOL_DN, VOL_UP, KC__MUTE, KC_MPLY, \
- _______, _______, AU_OFF, AU_ON, _______, _______, NUMLK_E, KC_MRWD, KC_MFFD, _______, \
- _______, _______, _______, _______, _______, _______ \
+ QK_BOOT, DB_TOGG, QWERTY, CMK_DHM, _______, _______, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
+ KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK, KC_PWR, VOL_DN, VOL_UP, KC_MUTE, KC_MPLY, \
+ _______, _______, AU_OFF, AU_ON, _______, _______, NUMLK_E, KC_MRWD, KC_MFFD, _______, \
+ _______, _______, _______, _______, _______, _______ \
),
/* Navigation + mouse keys
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
index 1106412b59..37602b9163 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define USE_SERIAL
#define EE_HANDS
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
index 7d6b211379..e795e76207 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LOWER] = LAYOUT(
_______, KC_LBRC, KC_QUES, KC_RBRC, KC_BRMU, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_VOLU,
KC_ESC, KC_LPRN, KC_EXLM, KC_RPRN, KC_BRMD, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_VOLD,
- _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__MUTE,
+ _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,
_______, _______, _______, KC_DEL, MO(_ADJUST), _______
),
[_ADJUST] = LAYOUT(
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
index b85609127e..91ef94841e 100644
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
@@ -23,17 +23,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-#define USE_SERIAL
-
#define EE_HANDS
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLED_NUM 8 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md b/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
deleted file mode 100644
index c00cca1c5b..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-```
-/* Base layer - workman
- *
- * ,----------------------------------. ,----------------------------------.
- * | q | d | r | w | b | | j | f | u | p | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | s | h | t | g | | y | n | e | o | i |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | m | c | v | | k | l | dead | . | / |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | esc | enter| |bckspc| space| tab |
- * | shift | ctrl | alt | | gui | fn | shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
-
-/* Dead key layer
- *
- * ,----------------------------------. ,----------------------------------.
- * | % | & | ? | + | @ | | $ | _ | [ | ] | ! |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | # | ( | = | 0 | { | | } | 1 | * | ) | - |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | 6 | 7 | 8 | 9 | | | | \ | 2 | 3 | 4 | 5 |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | esc | comma| |bckspc| comma| tab |
- * | shift | ctrl |+enter| | gui |+space| shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
-
-/* Function layer
- *
- * ,----------------------------------. ,---------------------------------.
- * | | del |⌃← | ⌃→ | | | mute | vol- | vol+ | ⌘⌃p | |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ` | end | pgup | pgdn | home | | ← | ↓ | ↑ | → | ' |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ⌥⇥ | |⇧⌃⇥| ⌃⇥ | | | | br- | , | br+ | ^ |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | | enter| |bckspc| | tab |
- * | shift | | alt | | gui | | shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
-```
diff --git a/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c b/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
deleted file mode 100644
index cb7cd4d0a5..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _WM 0
-#define _DK 1
-#define _FUN 2
-
-#define _DK_ACT 0
-#define _DK_REL 1
-#define _KC_COMS 2
-#define _KC_CENT 3
-
-#define DK_ACT M(_DK_ACT) // activate dead key layer
-#define DK_REL M(_DK_REL) // release dead key layer
-#define KC_COMS M(_KC_COMS) // comma + space
-#define KC_CENT M(_KC_CENT) // comma + enter
-#define KC_ENOP ALT_T(KC_ENT) // press for enter, hold for option
-#define KC_BSCM GUI_T(KC_BSPC) // press for backspace, hold for command
-#define KC_CTES CTL_T(KC_ESC) // press for escape, hold for control
-#define KC_SHTB SFT_T(KC_TAB) // press for tab, hold for shift
-#define KC_SPFN LT(_FUN, KC_SPC) // press for space, hold for function layer (aka spacefn)
-#define KC_OPTB RALT(KC_TAB) // option + tab
-#define KC_CCSP RGUI(RCTL(KC_P)) // control + command + p
-#define KC_CSTB S(RCTL(KC_TAB)) // shift + control + tab
-#define KC_C_TB RCTL(KC_TAB) // control + tab
-#define KC_C_LF RCTL(KC_LEFT) // control + left
-#define KC_C_RT RCTL(KC_RGHT) // control + right
-#define KC_BRUP KC_F15 // brightness up on osx
-#define KC_BRDN KC_F14 // brightness down on osx
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Base layer - workman
- *
- * ,----------------------------------. ,----------------------------------.
- * | q | d | r | w | b | | j | f | u | p | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | s | h | t | g | | y | n | e | o | i |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | m | c | v | | k | l | dead | . | / |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | esc | enter| |bckspc| space| tab |
- * | shift | ctrl | alt | | gui | fn | shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
- [_WM] = LAYOUT( \
- KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, \
- KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, \
- KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, DK_ACT, KC_DOT, KC_SLSH, \
- KC_SHTB, KC_CTES, KC_ENOP, KC_BSCM, KC_SPFN, KC_SHTB \
- ),
-
-/* Dead key layer
- *
- * ,----------------------------------. ,----------------------------------.
- * | % | & | ? | + | @ | | $ | _ | [ | ] | ! |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | # | ( | = | 0 | { | | } | 1 | * | ) | - |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | 6 | 7 | 8 | 9 | | | | \ | 2 | 3 | 4 | 5 |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | esc | comma| |bckspc| comma| tab |
- * | shift | ctrl |+enter| | gui |+space| shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
- [_DK] = LAYOUT( \
- KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT, KC_DLR, KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, \
- KC_HASH, KC_LPRN, KC_EQL, KC_0, KC_LCBR, KC_RCBR, KC_1, KC_ASTR, KC_RPRN, KC_MINS, \
- KC_6, KC_7, KC_8, KC_9, KC_PIPE, KC_BSLS, KC_2, DK_REL, KC_4, KC_5, \
- KC_SHTB, KC_CTES, KC_CENT, KC_BSCM, KC_COMS, KC_SHTB \
- ),
-
-/* Function layer
- *
- * ,----------------------------------. ,---------------------------------.
- * | | del |⌃← | ⌃→ | | | mute | vol- | vol+ | ⌘⌃p | |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ` | end | pgup | pgdn | home | | ← | ↓ | ↑ | → | ' |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ⌥⇥ | |⇧⌃⇥| ⌃⇥ | | | | br- | , | br+ | ^ |
- * `----------------------------------' `----------------------------------'
- * ,--------------------. ,---------------------.
- * | tab | | enter| |bckspc| | tab |
- * | shift | | alt | | gui | | shift |
- * `-------+------+ | | |------+-------.
- * `------' `------'
- */
- [_FUN] = LAYOUT( \
- XXXXXXX, KC_DEL, KC_C_LF, KC_C_RT, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_CCSP, XXXXXXX, \
- KC_GRV, KC_END, KC_PGUP, KC_PGDN, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, \
- KC_OPTB, XXXXXXX, KC_CSTB, KC_C_TB, XXXXXXX, XXXXXXX, KC_BRDN, KC_COMM, KC_BRUP, KC_CIRC, \
- KC_SHTB, XXXXXXX, KC_ENOP, KC_BSCM, _______, KC_SHTB \
- )
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- case _KC_COMS:
- if (record->event.pressed) {
- return MACRO(T(COMM), T(SPC), END); // comma + space
- }
- break;
- case _KC_CENT:
- if (record->event.pressed) {
- return MACRO(T(COMM), T(ENT), END); // comma + enter
- }
- break;
- case _DK_ACT:
- if (record->event.pressed) {
- if (keyboard_report->mods & MOD_BIT(KC_LSFT) || keyboard_report->mods & MOD_BIT(KC_RSFT)) { // act as comma when shift is pressed (eg <)
- register_code(KC_COMM);
- } else { // activate oneshot dead key layer otherwise
- layer_on(_DK);
- set_oneshot_layer(_DK, ONESHOT_START);
- }
- } else { // make sure to deactive dead key layer on key release
- clear_oneshot_layer_state(ONESHOT_PRESSED);
- unregister_code(KC_COMM);
- }
- break;
- case _DK_REL:
- if (record->event.pressed) { // act as 3 on keypress
- register_code(KC_3);
- } else { // make sure to deactive dead key layer on key release
- clear_oneshot_layer_state(ONESHOT_PRESSED);
- unregister_code(KC_3);
- }
- break;
- }
-
- return MACRO_NONE;
-};
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
index c50571c78d..7683ffc287 100644
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
DE_Q, DE_W, DE_E, DE_R, DE_T, DE_Z, DE_U, DE_I, DE_O, DE_P, \
DE_A, DE_S, DE_D, DE_F, DE_G, DE_H, DE_J, DE_K, DE_L, KC_SPC, \
DE_Y, DE_X, DE_C, DE_V, DE_B, DE_N, DE_M, DE_COMM, DE_DOT, DE_MINS, \
- KC_LCTRL, MO(_LOWER), MO(_RAISE), KC_LGUI, KC_LSFT, KC_LALT \
+ KC_LCTL, MO(_LOWER), MO(_RAISE), KC_LGUI, KC_LSFT, KC_LALT \
),
[_RAISE] = LAYOUT( \
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LOWER] = LAYOUT( \
- KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, DE_LBRC, DE_RBRC, KC_AUDIO_VOL_UP, KC_HOME, KC_PGDOWN, KC_PGUP, KC_END, DE_TILD, \
+ KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, DE_LBRC, DE_RBRC, KC_AUDIO_VOL_UP, KC_HOME, KC_PGDN, KC_PGUP, KC_END, DE_TILD, \
KC_ESC, DE_LABK, DE_LPRN, DE_RPRN, DE_RABK, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_ENT, \
KC_BSPC, KC_DEL, DE_LCBR, DE_RCBR, KC_PSCR, _______, DE_ADIA, DE_ODIA, DE_UDIA, DE_SS, \
_______, _______, _______, _______, MO(_ADJUST), _______ \
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ae26f94999..ee5aaa8294 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
@@ -23,15 +23,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../config.h"
-#define USE_SERIAL
-
#define EE_HANDS
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLED_NUM 8 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
index e1d1d2644c..4bd875b139 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT ( \
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, \
- KC_F11, QK_BOOT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12, \
+ KC_F11, QK_BOOT, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12, \
_______, QWERTY, COLEMAK, DVORAK, _______, QK_BOOT, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______ \
)
diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
index 6867fee4b5..fb12f4175a 100644
--- a/keyboards/maple_computing/minidox/rev1/config.h
+++ b/keyboards/maple_computing/minidox/rev1/config.h
@@ -23,6 +23,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SOFT_SERIAL_PIN D0
-#define USE_SERIAL
-
//#define EE_HANDS
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index f7ccfab276..41cd985c1d 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -91,7 +91,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN E6 // The pin your RGB strip is wired to
#define RGBLED_NUM 1 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17