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)
SjB · Apr 22, 2023 · 6422db5 · 6422db5
2 parents 45017f5 + ab4013a
commit 6422db5
Show file tree

Hide file tree

Showing 67 changed files with 2,356 additions and 105 deletions.
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
@@ -37,9 +37,9 @@ For more information on bitwise operators in C, click [here](https://en.wikipedi
 
 In practice, this means that you can check whether a given modifier is active with `get_mods() & MOD_BIT(KC_<modifier>)` (see the [list of modifier keycodes](keycodes_basic.md#modifiers)) or with `get_mods() & MOD_MASK_<modifier>` if the difference between left and right hand modifiers is not important and you want to match both. Same thing can be done for one-shot modifiers if you replace `get_mods()` with `get_oneshot_mods()`.
 
-To check that *only* a specific set of mods is active at a time, AND the modifier state and your desired mod mask as explained above and compare the result to the mod mask itself: `get_mods() & <mod mask> == <mod mask>`.
+To check that *only* a specific set of mods is active at a time, use a simple equality operator: `get_mods() == <mod mask>`.
 
-For example, let's say you want to trigger a piece of custom code if one-shot left control and one-shot left shift are on but every other one-shot mods are off. To do so, you can compose the desired mod mask by combining the mod bits for left control and shift with `(MOD_BIT(KC_LCTL) | MOD_BIT(KC_LSFT))` and then plug it in: `get_oneshot_mods() & (MOD_BIT(KC_LCTL) | MOD_BIT(KC_LSFT)) == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_LSFT))`. Using `MOD_MASK_CS` instead for the mod bitmask would have forced you to press four modifier keys (both versions of control and shift) to fulfill the condition.
+For example, let's say you want to trigger a piece of custom code if one-shot left control and one-shot left shift are on but every other one-shot mods are off. To do so, you can compose the desired mod mask by combining the mod bits for left control and shift with `(MOD_BIT(KC_LCTL) | MOD_BIT(KC_LSFT))` and then plug it in: `get_oneshot_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_LSFT))`. Using `MOD_MASK_CS` instead for the mod bitmask would have forced you to press four modifier keys (both versions of control and shift) to fulfill the condition.
 
 The full list of mod masks is as follows:
 
@@ -184,4 +184,4 @@ This page used to encompass a large set of features. We have moved many sections
 
 ## Key Overrides :id=key-overrides
 
-* [Key Overrides](feature_key_overrides.md)
+* [Key Overrides](feature_key_overrides.md)
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
@@ -58,7 +58,7 @@ const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
 const uint16_t PROGMEM qw_combo[] = {KC_Q, KC_W, COMBO_END};
 const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
  [AB_ESC] = COMBO(ab_combo, KC_ESC),
  [JK_TAB] = COMBO(jk_combo, KC_TAB),
  [QW_SFT] = COMBO(qw_combo, KC_LSFT),

diff --git a/docs/feature_wpm.md b/docs/feature_wpm.md
@@ -1,4 +1,4 @@
-# Word Per Minute (WPM) Calculcation
+# Word Per Minute (WPM) Calculation
 
 The WPM feature uses time between keystrokes to compute a rolling average words per minute rate and makes this available for various uses.
 

diff --git a/docs/isp_flashing_guide.md b/docs/isp_flashing_guide.md
@@ -35,6 +35,40 @@ To use a 5V/16MHz Pro Micro as an ISP flashing tool, you will first need to load
 
 !> Note that the `10` pin on the Pro Micro should be wired to the `RESET` pin on the keyboard's controller. ***DO NOT*** connect the `RESET` pin on the Pro Micro to the `RESET` on the keyboard.
 
+
+### Arduino Uno / Micro as ISP
+
+[Arduino Uno](https://store.arduino.cc/products/arduino-uno-rev3)
+[Arduino Micro](https://store.arduino.cc/products/arduino-micro)
+
+A standard Uno or Micro can be used as an ISP flashing tool using the [example "ArduinoISP" sketch](https://docs.arduino.cc/built-in-examples/arduino-isp/ArduinoISP#load-the-sketch) to emulate an STK500 ISP. Also works with Sparkfun Pro Micros and clones.
+
+**AVRDUDE Programmer**: `stk500v1` 
+**AVRDUDE Port**: Serial
+
+#### Wiring
+
+|Uno |Keyboard|
+|-----------|--------|
+|`5V` |`VCC` |
+|`GND` |`GND` |
+|`10` (`B2`)|`RESET` |
+|`13` (`B5`)|`SCLK` |
+|`11` (`B3`)|`MOSI` |
+|`12` (`B4`)|`MISO` |
+
+|Micro |Keyboard|
+|-----------|--------|
+|`5V` |`VCC` |
+|`GND` |`GND` |
+|`10` (`B6`)|`RESET` |
+|`15` (`B1`)|`SCLK` |
+|`16` (`B2`)|`MOSI` |
+|`14` (`B3`)|`MISO` |
+
+!> Note that the `10` pin on the Uno/Micro should be wired to the `RESET` pin on the keyboard's controller. ***DO NOT*** connect the `RESET` pin on the Uno/Micro to the `RESET` on the keyboard.
+
+
 ### Teensy 2.0 as ISP
 
 [PJRC Teensy 2.0](https://www.pjrc.com/store/teensy.html)
@@ -57,6 +91,7 @@ To use a Teensy 2.0 as an ISP flashing tool, you will first need to load a [spec
 
 !> Note that the `B0` pin on the Teensy should be wired to the `RESET` pin on the keyboard's controller. ***DO NOT*** connect the `RESET` pin on the Teensy to the `RESET` on the keyboard.
 
+
 ### SparkFun PocketAVR / USBtinyISP
 
 [SparkFun PocketAVR](https://www.sparkfun.com/products/9825) 

diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
@@ -17,60 +17,117 @@
  "layouts": {
  "LAYOUT_all": {
  "layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Tab", "x":1.25, "y":0, "w":1.5},
- {"label":"Q", "x":2.75, "y":0},
- {"label":"W", "x":3.75, "y":0},
- {"label":"E", "x":4.75, "y":0},
- {"label":"R", "x":5.75, "y":0},
- {"label":"T", "x":6.75, "y":0},
- {"label":"Y", "x":7.75, "y":0},
- {"label":"U", "x":8.75, "y":0},
- {"label":"I", "x":9.75, "y":0},
- {"label":"O", "x":10.75, "y":0},
- {"label":"P", "x":11.75, "y":0},
- {"label":"{", "x":12.75, "y":0},
- {"label":"Backspace", "x":13.75, "y":0, "w":1.5},
+ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "Tab", "matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+ {"label": "Q", "matrix": [0, 2], "x": 2.75, "y": 0},
+ {"label": "W", "matrix": [0, 3], "x": 3.75, "y": 0},
+ {"label": "E", "matrix": [0, 4], "x": 4.75, "y": 0},
+ {"label": "R", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "T", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "Y", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "U", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "I", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "O", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "P", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "{", "matrix": [0, 12], "x": 12.75, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
 
- {"label":"F2", "x":0, "y":1},
- {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75},
- {"label":"A", "x":3, "y":1}, 
- {"label":"S", "x":4, "y":1},
- {"label":"D", "x":5, "y":1},
- {"label":"F", "x":6, "y":1},
- {"label":"G", "x":7, "y":1},
- {"label":"H", "x":8, "y":1},
- {"label":"J", "x":9, "y":1},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1},
- {"label":":", "x":12, "y":1},
- {"label":"Enter", "x":13, "y":1, "w":2.25},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Shift", "x":1.25, "y":2, "w":2.25},
- {"label":"Z", "x":3.5, "y":2},
- {"label":"X", "x":4.5, "y":2},
- {"label":"C", "x":5.5, "y":2},
- {"label":"V", "x":6.5, "y":2},
- {"label":"B", "x":7.5, "y":2},
- {"label":"N", "x":8.5, "y":2},
- {"label":"M", "x":9.5, "y":2},
- {"label":"<", "x":10.5, "y":2},
- {"label":"Shift", "x":11.5, "y":2, "w":1.75},
- {"label":"Up", "x":13.25, "y":2},
- {"label":"?", "x":14.25, "y":2},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Ctrl", "x":1.25, "y":3, "w":1.25},
- {"label":"Win", "x":2.5, "y":3},
- {"label":"Alt", "x":3.5, "y":3, "w":1.25},
- {"label":"Spacebar", "x":4.75, "y":3, "w":2.25},
- {"label":"Spacebar", "x":7, "y":3, "w":1.25},
- {"label":"Spacebar", "x":8.25, "y":3, "w":2.75},
- {"label":"Alt", "x":11, "y":3, "w":1.25},
- {"label":"Left", "x":12.25, "y":3},
- {"label":"Down", "x":13.25, "y":3},
- {"label":"Right", "x":14.25, "y":3}
+ {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "Caps Lock", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+ {"label": "A", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "S", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "D", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "F", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "G", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "H", "matrix": [1, 7], "x": 8, "y": 1},
+ {"label": "J", "matrix": [1, 8], "x": 9, "y": 1},
+ {"label": "K", "matrix": [1, 9], "x": 10, "y": 1},
+ {"label": "L", "matrix": [1, 10], "x": 11, "y": 1},
+ {"label": ":", "matrix": [1, 11], "x": 12, "y": 1},
+ {"label": "Enter", "matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
+
+ {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "Shift", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
+ {"label": "Z", "matrix": [2, 2], "x": 3.5, "y": 2},
+ {"label": "X", "matrix": [2, 3], "x": 4.5, "y": 2},
+ {"label": "C", "matrix": [2, 4], "x": 5.5, "y": 2},
+ {"label": "V", "matrix": [2, 5], "x": 6.5, "y": 2},
+ {"label": "B", "matrix": [2, 6], "x": 7.5, "y": 2},
+ {"label": "N", "matrix": [2, 7], "x": 8.5, "y": 2},
+ {"label": "M", "matrix": [2, 8], "x": 9.5, "y": 2},
+ {"label": "<", "matrix": [2, 9], "x": 10.5, "y": 2},
+ {"label": "Shift", "matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
+ {"label": "Up", "matrix": [2, 12], "x": 13.25, "y": 2},
+ {"label": "?", "matrix": [2, 13], "x": 14.25, "y": 2},
+
+ {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "Ctrl", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"label": "Win", "matrix": [3, 2], "x": 2.5, "y": 3},
+ {"label": "Alt", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
+ {"label": "Spacebar", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2.25},
+ {"label": "Spacebar", "matrix": [3, 6], "x": 7, "y": 3, "w": 1.25},
+ {"label": "Spacebar", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
+ {"label": "Left", "matrix": [3, 11], "x": 12.25, "y": 3},
+ {"label": "Down", "matrix": [3, 12], "x": 13.25, "y": 3},
+ {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3}
+ ]
+ },
+
+ "LAYOUT_625u_space": {
+ "layout": [
+ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "Tab", "matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+ {"label": "Q", "matrix": [0, 2], "x": 2.75, "y": 0},
+ {"label": "W", "matrix": [0, 3], "x": 3.75, "y": 0},
+ {"label": "E", "matrix": [0, 4], "x": 4.75, "y": 0},
+ {"label": "R", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "T", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "Y", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "U", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "I", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "O", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "P", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "{", "matrix": [0, 12], "x": 12.75, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
+
+ {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "Caps Lock", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+ {"label": "A", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "S", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "D", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "F", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "G", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "H", "matrix": [1, 7], "x": 8, "y": 1},
+ {"label": "J", "matrix": [1, 8], "x": 9, "y": 1},
+ {"label": "K", "matrix": [1, 9], "x": 10, "y": 1},
+ {"label": "L", "matrix": [1, 10], "x": 11, "y": 1},
+ {"label": ":", "matrix": [1, 11], "x": 12, "y": 1},
+ {"label": "Enter", "matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
+
+ {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "Shift", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
+ {"label": "Z", "matrix": [2, 2], "x": 3.5, "y": 2},
+ {"label": "X", "matrix": [2, 3], "x": 4.5, "y": 2},
+ {"label": "C", "matrix": [2, 4], "x": 5.5, "y": 2},
+ {"label": "V", "matrix": [2, 5], "x": 6.5, "y": 2},
+ {"label": "B", "matrix": [2, 6], "x": 7.5, "y": 2},
+ {"label": "N", "matrix": [2, 7], "x": 8.5, "y": 2},
+ {"label": "M", "matrix": [2, 8], "x": 9.5, "y": 2},
+ {"label": "<", "matrix": [2, 9], "x": 10.5, "y": 2},
+ {"label": "Shift", "matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
+ {"label": "Up", "matrix": [2, 12], "x": 13.25, "y": 2},
+ {"label": "?", "matrix": [2, 13], "x": 14.25, "y": 2},
+
+ {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "Ctrl", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"label": "Win", "matrix": [3, 2], "x": 2.5, "y": 3},
+ {"label": "Alt", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
+ {"label": "Spacebar", "matrix": [3, 6], "x": 4.75, "y": 3, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
+ {"label": "Left", "matrix": [3, 11], "x": 12.25, "y": 3},
+ {"label": "Down", "matrix": [3, 12], "x": 13.25, "y": 3},
+ {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3}
  ]
  }
  }

diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
@@ -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
diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk b/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/obi/matrix_diagram.md b/keyboards/adpenrose/obi/matrix_diagram.md
@@ -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
+ └────────────────────────┘
+```
diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c