[Keyboard] Doro67 cleanup (#6514)
Add spacing to LAYOUT macros, add layout comments, improve consistency, fix ISO layout bug * Remove placeholder comments in regular.h and rgb.h * Change K## to k## in multi.h and regular.h * Add alignment whitespace in Doro67 LAYOUT macros * Update multi default keymaps and add layout comments * Update rgb default keymap and add layout comments * Add RESET to Fn layer in multi default keymaps * Replace KC_GESC with KC_ESC in rgb default keymap for consistency with other Doro keymaps * Update regular default keymap and add layout comments * WIP * Replace odd F1, F2 with proper split LShift/Backspace keys in default_multi * Minor fixes and tweaks in multi default keymaps * Fix Enter and NUHS positions in multi LAYOUT_iso * Return true in process_record_user in rgb default keymap * Update Enter position in multi info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update labels in multi info.json to match the default keymaps
This commit is contained in:
		
							parent
							
								
									5c324ee104
								
							
						
					
					
						commit
						c522009816
					
				
					 12 changed files with 346 additions and 337 deletions
				
			
		| 
						 | 
				
			
			@ -17,46 +17,74 @@
 | 
			
		|||
 | 
			
		||||
// Defines the keycodes used by our macros in process_record_user
 | 
			
		||||
enum custom_keycodes {
 | 
			
		||||
  QMKBEST = SAFE_RANGE,
 | 
			
		||||
  QMKURL
 | 
			
		||||
    QMKBEST = SAFE_RANGE,
 | 
			
		||||
    QMKURL,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  [0] = LAYOUT( \
 | 
			
		||||
    KC_GESC, 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_BSPC, KC_INS,  \
 | 
			
		||||
    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_DEL,  \
 | 
			
		||||
    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_ENT,  KC_PGUP,          \
 | 
			
		||||
    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,          \
 | 
			
		||||
    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_LALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT                                                        \
 | 
			
		||||
  ),
 | 
			
		||||
    /* Default layer
 | 
			
		||||
     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
 | 
			
		||||
     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bspace │Ins│
 | 
			
		||||
     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
 | 
			
		||||
     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
 | 
			
		||||
     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
 | 
			
		||||
     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
 | 
			
		||||
     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
 | 
			
		||||
     * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RShift│ ↑ │PgD│
 | 
			
		||||
     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
 | 
			
		||||
     * │LCtl│LGui│LAlt│         Space          │RAlt│ Fn │ │ ← │ ↓ │ → │
 | 
			
		||||
     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 | 
			
		||||
     */
 | 
			
		||||
    [0] = 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_BSPC, KC_INS,
 | 
			
		||||
        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_DEL,
 | 
			
		||||
        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_ENT,  KC_PGUP,
 | 
			
		||||
        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
  [1] = LAYOUT( \
 | 
			
		||||
    KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, \
 | 
			
		||||
    QMKBEST, QMKURL,   KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
 | 
			
		||||
    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
 | 
			
		||||
    KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
 | 
			
		||||
    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS                                                        \
 | 
			
		||||
  ),
 | 
			
		||||
    /* Fn layer
 | 
			
		||||
     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
 | 
			
		||||
     * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
 | 
			
		||||
     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
 | 
			
		||||
     * │BEST │URL│   │   │Rst│   │   │   │   │   │   │   │   │     │   │
 | 
			
		||||
     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
 | 
			
		||||
     * │ RGB  │Mo+│Hu+│Sa+│Va+│Sp+│   │   │   │   │   │   │        │   │
 | 
			
		||||
     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
 | 
			
		||||
     * │        │Mo-│Hu-│Sa-│Va-│Sp-│   │   │   │   │   │      │   │   │
 | 
			
		||||
     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
 | 
			
		||||
     * │    │    │    │                        │    │    │ │   │   │   │
 | 
			
		||||
     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 | 
			
		||||
     */
 | 
			
		||||
    [1] = LAYOUT(
 | 
			
		||||
        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 | 
			
		||||
        QMKBEST, QMKURL,  _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
 | 
			
		||||
        _______,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
    switch (keycode) {
 | 
			
		||||
    case QMKBEST:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        // when keycode QMKBEST is pressed
 | 
			
		||||
        SEND_STRING("QMK is the best thing ever!");
 | 
			
		||||
      } else {
 | 
			
		||||
        // when keycode QMKBEST is released
 | 
			
		||||
      }
 | 
			
		||||
      break;
 | 
			
		||||
        if (record->event.pressed) {
 | 
			
		||||
            // When keycode QMKBEST is pressed
 | 
			
		||||
            SEND_STRING("QMK is the best thing ever!");
 | 
			
		||||
        } else {
 | 
			
		||||
            // When keycode QMKBEST is released
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
 | 
			
		||||
    case QMKURL:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        // when keycode QMKURL is pressed
 | 
			
		||||
        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
 | 
			
		||||
      } else {
 | 
			
		||||
        // when keycode QMKURL is released
 | 
			
		||||
      }
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
  return true;
 | 
			
		||||
        if (record->event.pressed) {
 | 
			
		||||
            // When keycode QMKURL is pressed
 | 
			
		||||
            SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
 | 
			
		||||
        } else {
 | 
			
		||||
            // When keycode QMKURL is released
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue