D keyboards/m0lly/keymaps/via/config.h => keyboards/m0lly/keymaps/via/config.h +0 -1
@@ 1,1 0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
R keyboards/candybar/bootloader_defs.h => keyboards/tkc/candybar/bootloader_defs.h +0 -0
R keyboards/candybar/chconf.h => keyboards/tkc/candybar/chconf.h +0 -0
R keyboards/candybar/halconf.h => keyboards/tkc/candybar/halconf.h +0 -0
R keyboards/candybar/lefty/config.h => keyboards/tkc/candybar/lefty/config.h +0 -0
R keyboards/candybar/lefty/info.json => keyboards/tkc/candybar/lefty/info.json +0 -0
R keyboards/candybar/lefty/keymaps/default/keymap.c => keyboards/tkc/candybar/lefty/keymaps/default/keymap.c +0 -0
R keyboards/candybar/lefty/keymaps/via/keymap.c => keyboards/tkc/candybar/lefty/keymaps/via/keymap.c +14 -0
@@ 18,6 18,8 @@
#define _BL 0
#define _FL 1
+#define _AL 2
+#define _LL 3
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: Base Layer (Default Layer)
@@ 35,4 37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P4 , KC_P5, KC_P6 , KC_VOLD, KC_TAB , KC_A , KC_SLCK, KC_D, KC_F , KC_G , KC_H, KC_J , KC_K , KC_L , KC_QUOT, KC_BSLS , \
KC_P1 , KC_P2, KC_P3 , KC_PEQL, KC_LSFT, KC_Z , KC_X, KC_CAPS, KC_V , KC_B, KC_NLCK, KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+
+ [_AL] = LAYOUT(
+ KC_P7 , KC_P8, KC_P9 , KC_VOLU, RESET , KC_Q , KC_W , KC_E, KC_R , KC_T , KC_Y, KC_U , KC_I , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+ KC_P4 , KC_P5, KC_P6 , KC_VOLD, KC_TAB , KC_A , KC_SLCK, KC_D, KC_F , KC_G , KC_H, KC_J , KC_K , KC_L , KC_QUOT, KC_BSLS , \
+ KC_P1 , KC_P2, KC_P3 , KC_PEQL, KC_LSFT, KC_Z , KC_X, KC_CAPS, KC_V , KC_B, KC_NLCK, KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+ KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+
+ [_LL] = LAYOUT(
+ KC_P7 , KC_P8, KC_P9 , KC_VOLU, RESET , KC_Q , KC_W , KC_E, KC_R , KC_T , KC_Y, KC_U , KC_I , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+ KC_P4 , KC_P5, KC_P6 , KC_VOLD, KC_TAB , KC_A , KC_SLCK, KC_D, KC_F , KC_G , KC_H, KC_J , KC_K , KC_L , KC_QUOT, KC_BSLS , \
+ KC_P1 , KC_P2, KC_P3 , KC_PEQL, KC_LSFT, KC_Z , KC_X, KC_CAPS, KC_V , KC_B, KC_NLCK, KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+ KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
};
R keyboards/candybar/lefty/keymaps/via/rules.mk => keyboards/tkc/candybar/lefty/keymaps/via/rules.mk +0 -0
R keyboards/candybar/lefty/lefty.c => keyboards/tkc/candybar/lefty/lefty.c +0 -0
R keyboards/candybar/lefty/lefty.h => keyboards/tkc/candybar/lefty/lefty.h +0 -0
R keyboards/candybar/lefty/readme.md => keyboards/tkc/candybar/lefty/readme.md +1 -1
@@ 10,6 10,6 @@ The Key Company Candybar is a staggered 40% board with a numpad utilizing the ST
Make example for this keyboard (after setting up your build environment):
- make candybar/lefty:default:dfu-util
+ make tkc/candybar/lefty:default:dfu-util
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
R keyboards/candybar/lefty/rules.mk => keyboards/tkc/candybar/lefty/rules.mk +0 -0
R keyboards/candybar/mcuconf.h => keyboards/tkc/candybar/mcuconf.h +0 -0
R keyboards/candybar/righty/config.h => keyboards/tkc/candybar/righty/config.h +0 -0
R keyboards/candybar/righty/info.json => keyboards/tkc/candybar/righty/info.json +0 -0
R keyboards/candybar/righty/keymaps/default/keymap.c => keyboards/tkc/candybar/righty/keymaps/default/keymap.c +0 -0
R keyboards/candybar/righty/keymaps/via/keymap.c => keyboards/tkc/candybar/righty/keymaps/via/keymap.c +14 -0
@@ 18,6 18,8 @@
#define _BL 0
#define _FL 1
+#define _AL 2
+#define _LL 3
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: Base Layer (Default Layer)
@@ 35,4 37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+
+ [_AL] = LAYOUT(
+ RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+ KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+ KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+ KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+
+ [_LL] = LAYOUT(
+ RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+ KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+ KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+ KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
};
R keyboards/candybar/righty/keymaps/via/rules.mk => keyboards/tkc/candybar/righty/keymaps/via/rules.mk +0 -0
R keyboards/candybar/righty/readme.md => keyboards/tkc/candybar/righty/readme.md +1 -1
@@ 10,6 10,6 @@ The Key Company Candybar is a staggered 40% board with a numpad utilizing the ST
Make example for this keyboard (after setting up your build environment):
- make candybar/righty:default:dfu-util
+ make tkc/candybar/righty:default:dfu-util
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
R keyboards/candybar/righty/righty.c => keyboards/tkc/candybar/righty/righty.c +0 -0
R keyboards/candybar/righty/righty.h => keyboards/tkc/candybar/righty/righty.h +0 -0
R keyboards/candybar/righty/rules.mk => keyboards/tkc/candybar/righty/rules.mk +0 -0
R keyboards/m0lly/README.md => keyboards/tkc/m0lly/README.md +1 -1
@@ 12,6 12,6 @@ Hardware Availability: [TheKey.Company](https://thekey.company)
Make example for this keyboard (after setting up your build environment):
- make m0lly:default
+ make tkc/m0lly:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
R keyboards/m0lly/config.h => keyboards/tkc/m0lly/config.h +0 -0
R keyboards/m0lly/info.json => keyboards/tkc/m0lly/info.json +0 -0
R keyboards/m0lly/keymaps/default/keymap.c => keyboards/tkc/m0lly/keymaps/default/keymap.c +0 -0
R keyboards/m0lly/keymaps/via/keymap.c => keyboards/tkc/m0lly/keymaps/via/keymap.c +22 -0
@@ 21,6 21,8 @@
enum {
BASE = 0,
FUNCTION,
+ ALTERNATE,
+ LAST,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ 66,6 68,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX, _______, _______, _______, XXXXXXX,
_______, _______, _______, _______, _______, _______, MO(FUNCTION), _______, _______, XXXXXXX, _______, _______
),
+ [ALTERNATE] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, XXXXXXX, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______,
+ _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, MO(FUNCTION), _______, _______, XXXXXXX, _______, _______
+ ),
+ [LAST] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, XXXXXXX, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______,
+ _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, MO(FUNCTION), _______, _______, XXXXXXX, _______, _______
+ ),
};
#ifdef OLED_DRIVER_ENABLE
@@ 81,6 97,12 @@ void oled_task_user(void) {
case FUNCTION:
oled_write_P(PSTR("Function\n"), false);
break;
+ case ALTERNATE:
+ oled_write_P(PSTR("Alternate\n"), false);
+ break;
+ case LAST:
+ oled_write_P(PSTR("Last\n"), false);
+ break;
default:
// Or use the write_ln shortcut over adding '\n' to the end of your string
oled_write_ln_P(PSTR("Undefined"), false);
R keyboards/m0lly/keymaps/via/rules.mk => keyboards/tkc/m0lly/keymaps/via/rules.mk +0 -0
R keyboards/m0lly/m0lly.c => keyboards/tkc/m0lly/m0lly.c +0 -0
R keyboards/m0lly/m0lly.h => keyboards/tkc/m0lly/m0lly.h +0 -0
R keyboards/m0lly/rules.mk => keyboards/tkc/m0lly/rules.mk +0 -0
R keyboards/tkc1800/README.md => keyboards/tkc/tkc1800/README.md +1 -1
@@ 12,6 12,6 @@ Hardware Availability: [TheKey.Company](https://thekey.company/collections/tkc-1
Make example for this keyboard (after setting up your build environment):
- make tkc1800:default
+ make tkc/tkc1800:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
R keyboards/tkc1800/config.h => keyboards/tkc/tkc1800/config.h +0 -0
R keyboards/tkc1800/info.json => keyboards/tkc/tkc1800/info.json +0 -0
R keyboards/tkc1800/keymaps/default/keymap.c => keyboards/tkc/tkc1800/keymaps/default/keymap.c +0 -0
R keyboards/tkc1800/keymaps/smt/keymap.c => keyboards/tkc/tkc1800/keymaps/smt/keymap.c +0 -0
R keyboards/tkc1800/keymaps/via/keymap.c => keyboards/tkc/tkc1800/keymaps/via/keymap.c +26 -0
@@ 20,6 20,8 @@
enum {
BASE = 0,
FUNCTION,
+ ALTERNATE,
+ LAST,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ 75,6 77,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
),
+ [ALTERNATE] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, XXXXXXX, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, \
+ _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ ),
+ [LAST] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, XXXXXXX, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, \
+ _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ ),
};
#ifdef OLED_DRIVER_ENABLE
@@ 90,6 110,12 @@ void oled_task_user(void) {
case FUNCTION:
oled_write_P(PSTR("Function\n"), false);
break;
+ case ALTERNATE:
+ oled_write_P(PSTR("Alternate\n"), false);
+ break;
+ case LAST:
+ oled_write_P(PSTR("Last\n"), false);
+ break;
default:
// Or use the write_ln shortcut over adding '\n' to the end of your string
oled_write_ln_P(PSTR("Undefined"), false);
R keyboards/tkc1800/keymaps/via/rules.mk => keyboards/tkc/tkc1800/keymaps/via/rules.mk +0 -0
R keyboards/tkc1800/keymaps/wkl/keymap.c => keyboards/tkc/tkc1800/keymaps/wkl/keymap.c +0 -0
R keyboards/tkc1800/keymaps/yanfali/keymap.c => keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c +0 -0
R keyboards/tkc1800/keymaps/yanfali/rules.mk => keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk +0 -0
R keyboards/tkc1800/rules.mk => keyboards/tkc/tkc1800/rules.mk +0 -0
R keyboards/tkc1800/tkc1800.c => keyboards/tkc/tkc1800/tkc1800.c +0 -0
R keyboards/tkc1800/tkc1800.h => keyboards/tkc/tkc1800/tkc1800.h +0 -0
D keyboards/tkc1800/keymaps/via/config.h => keyboards/tkc1800/keymaps/via/config.h +0 -1
@@ 1,1 0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
M quantum/dynamic_keymap.c => quantum/dynamic_keymap.c +5 -1
@@ 35,7 35,11 @@
// Explicitly override it if the keyboard uses a microcontroller with
// more EEPROM *and* it makes sense to increase it.
#ifndef DYNAMIC_KEYMAP_EEPROM_MAX_ADDR
-# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
+# if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+# else
+# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
+# endif
#endif
// If DYNAMIC_KEYMAP_EEPROM_ADDR not explicitly defined in config.h,