forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into sjb/all-keyboard
* master: NK Plus (qmk#20392) [Docs] Fix suggested code pattern when a specific mod-mask is required. (qmk#20512) [Docs] Remove combo count from array (qmk#20511) Add QuadrumLabs Delta (qmk#20409) Adds Docs option for ArduinoIDE's example `ArduinoISP` (qmk#20486) GMMK 2 volume up/down Fn keys are backwards in default mapping (qmk#20476) Fix typo in `feature_wpm.md` title (qmk#20464) [Keyboard] Add Kalakos Bahrnob65 (qmk#20424) Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460) [Keyboard] Add zoom75 wired (qmk#20396) [Keyboard] Add dymium65 (qmk#20257) Lotus58 glow (qmk#20386) ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
- Loading branch information
Showing
67 changed files
with
2,356 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2022 Arturo Avila (@ADPenrose) | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
|
|
||
| #include QMK_KEYBOARD_H | ||
|
|
||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| /* Base */ | ||
| [0] = LAYOUT_625u_space( | ||
| KC_ESC, 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_BSPC, | ||
| KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | ||
| KC_VOLU, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_UP, KC_SLSH, | ||
| KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT | ||
| ), | ||
| [1] = LAYOUT_625u_space( | ||
| KC_DEL, KC_TRNS, 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_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS, | ||
| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_TRNS, KC_TRNS, | ||
| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| ), | ||
| [2] = LAYOUT_625u_space( | ||
| KC_TILD, 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_RBRC, | ||
| KC_TRNS, QK_BOOT, 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, 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 | ||
| ), | ||
| [3] = LAYOUT_625u_space( | ||
| 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, 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, 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 | ||
| ) | ||
| }; | ||
|
|
||
| #if defined(ENCODER_MAP_ENABLE) | ||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { | ||
| [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||
| [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, | ||
| [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, | ||
| [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } | ||
| }; | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ENCODER_MAP_ENABLE = yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Matrix Diagram for ADPenrose Obi | ||
|
|
||
| ``` | ||
| ┌───┐┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ | ||
| │00 ││01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │ | ||
| ├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ | ||
| │10 ││11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D │ | ||
| ├───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ | ||
| │20 ││21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2C │2D │ | ||
| ├───┤├────┬───┼───┴┬──┴───┴─┬─┴──┬┴───┴───┴─┬─┴──┬───┼───┼───┤ | ||
| │30 ││31 │32 │33 │35 │36 │37 │3A │3B │3C │3D │ | ||
| └───┘└────┴───┴────┴────────┴────┴──────────┴────┴───┴───┴───┘ | ||
| ┌────────────────────────┐ | ||
| │36 │ 6.25u Space | ||
| └────────────────────────┘ | ||
| ``` |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.