Merge 60cd9caa89 into b4bdf3f1d5

Update data_driven_config.md (#25612 )
Fix silakka54 layout (#25643 )
2025-09-10 17:15:43 +00:00 · 2025-09-10 01:53:40 -07:00 · 2025-09-10 01:52:25 -07:00 · 2025-09-10 09:11:46 +01:00 · 2025-09-09 19:44:47 -06:00 · 2025-09-09 19:43:28 -06:00
8 changed files with 186 additions and 94 deletions
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -6,7 +6,7 @@ This page describes how QMK's data driven JSON configuration system works. It is

 Historically QMK has been configured through a combination of two mechanisms- `rules.mk` and `config.h`. While this worked well when QMK was only a handful of keyboards we've grown to encompass nearly 4000 supported keyboards. That extrapolates out to 6000 configuration files under `keyboards/` alone! The freeform nature of these files and the unique patterns people have used to avoid duplication have made ongoing maintenance a challenge, and a large number of our keyboards follow patterns that are outdated and sometimes harder to understand.

-We have also been working on bringing the power of QMK to people who aren't comformable with a CLI, and other projects such as VIA are working to make using QMK as easy as installing a program. These tools need information about how a keyboard is laid out or what pins and features are available so that users can take full advantage of QMK. We introduced `info.json` as a first step towards this. The QMK API is an effort to combine these 3 sources of information- `config.h`, `rules.mk`, and `info.json`- into a single source of truth that end-user tools can use.
+We have also been working on bringing the power of QMK to people who aren't comfortable with a CLI, and other projects such as VIA are working to make using QMK as easy as installing a program. These tools need information about how a keyboard is laid out or what pins and features are available so that users can take full advantage of QMK. We introduced `info.json` as a first step towards this. The QMK API is an effort to combine these 3 sources of information- `config.h`, `rules.mk`, and `info.json`- into a single source of truth that end-user tools can use.

 Now we have support for generating `rules.mk` and `config.h` values from `info.json`, allowing us to have a single source of truth. This will allow us to use automated tooling to maintain keyboards saving a lot of time and maintenance work.

--- a/docs/faq_general.md
+++ b/docs/faq_general.md
@@ -38,7 +38,7 @@ Awesome! Open up a Pull Request for it. We'll review the code, and merge it!

 That's amazing! We would love to assist you with that!

-In fact, we have a [whole page](https://qmk.fm/powered/) dedicated to adding QMK Branding to your page and keyboard. This covers pretty much everything you need (knowledge and images) to officially support QMK.
+In fact, we have a [whole page](https://qmk.fm/trademark) dedicated to adding QMK Branding to your page and keyboard. This covers pretty much everything you need (knowledge and images) to officially support QMK.

 If you have any questions about this, open an issue or head to [Discord](https://discord.gg/qmk).

--- a/docs/porting_your_keyboard_to_qmk.md
+++ b/docs/porting_your_keyboard_to_qmk.md
@@ -164,7 +164,7 @@ There are a lot of features that can be turned on or off, configured or tuned. S

 ### Configuration Options

-For available options for `config.h`, you should see the [Config Options](config_options#the-configh-file) page for more details.
+For available options for `config.h`, you should see the [Config Options](config_options#the-config-h-file) page for more details.

 ### Build Options

--- a/keyboards/handwired/dactyl_manuform/5x8/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x8/keyboard.json
@@ -110,14 +110,14 @@

                {"matrix": [10, 4], "x": 14, "y": 4},
                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 2], "x": 12, "y": 5},
-                {"matrix": [10, 1], "x": 11, "y": 5},
+                {"matrix": [10, 2], "x": 12.5, "y": 5},
+                {"matrix": [10, 1], "x": 11.5, "y": 5},

                {"matrix": [4, 5], "x": 4.5, "y": 5},
                {"matrix": [4, 6], "x": 5.5, "y": 5},

-                {"matrix": [10, 6], "x": 14.5, "y": 4.5},
-                {"matrix": [10, 5], "x": 15.5, "y": 4.5},
+                {"matrix": [10, 6], "x": 15, "y": 4.5},
+                {"matrix": [10, 5], "x": 16, "y": 4.5},

                {"matrix": [5, 5], "x": 5, "y": 6},
                {"matrix": [5, 6], "x": 6, "y": 6},
--- a/keyboards/handwired/dactyl_manuform/5x8/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x8/keymaps/default/keymap.c
@@ -15,70 +15,163 @@
 */
 #include QMK_KEYBOARD_H

+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state)) {
+            case 0:
+                oled_write_P(PSTR("Base\n"), false);
+                break;
+            case 1:
+                oled_write_P(PSTR("Right -> Left\n"), false);
+                break;
+            case 2:
+                oled_write_P(PSTR("< >\n"), false);
+                break;
+            case 3:
+                oled_write_P(PSTR("leftNumPad\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undef\n"), false);
+        }
+
+        uint16_t modifiers = get_mods();
+        oled_write_P(PSTR("Mods: "), false);
+        if (modifiers & MOD_MASK_SHIFT) oled_write_P(PSTR("SHF "), false);
+        if (modifiers & MOD_MASK_CTRL) oled_write_P(PSTR("CTL "), false);
+        if (modifiers & MOD_MASK_ALT) oled_write_P(PSTR("ALT "), false);
+        if (modifiers & MOD_MASK_GUI) oled_write_P(PSTR("GUI "), false);
+        if (host_keyboard_led_state().caps_lock) oled_write_P(PSTR("CAPS "), false);
+        oled_write_P(PSTR("\n"), false);
+    } else {
+        oled_write_P(PSTR("Dactyl\nManuform"), false);
+    }
+    return false;
+}
+#endif
+
 enum layers {
    _QWERTY,
-    _RIGHT2LEFT
+    _RIGHT2LEFT,
+    _LEFTIRIGHT, 
+    _LEFTNUMPAD
 };

-/* Base (qwerty)
-     * ,-------------------------------------------------------,   ,-------------------------------------------------------,
-     * |  Esc |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   |   7  |   8  |   9  |   0  |   -  |   =  |   \  |  BS  |
-     * |------+------+------+------+------+------+------+------|   |------+------+------+------+------+------+------+------|
-     * |M_RSTP|  Tab |   q  |   w  |   e  |   r  |   t  |QKBOOT|   |  F8  |   y  |   u  |   i  |   o  |   p  |   [  |   ]  |
-     * |------+------+------+------+------+------+------+------|   |------+------+------+------+------+------+------+------|
-     * |M_REC1| Caps |   a  |   s  |   d  |   f  |   g  |  F7  |   |  F9  |   h  |   j  |   k  |   l  |   ;  |   "  |ENTER |
-     * |------+------+------+------+------+------+------+------'   '------+------+------+------+------+------+------+------|
-     * |M_REC2| Shift|   z  |   x  |   c  |   v  |   b  |                 |   n  |   m  |   ,  |   .  |   /  |Shift | Ctrl |
-     * '------+------+------+------+------+------+------'                 '------+------+------+------+------+------+------'
-     *        | Ctrl | Wint |  Alt | INS  |                                             |  Up  | Down | Left | Right|
-     *        '------+------+------+------+------,                               ,------+------+------+------+------'
-     *                             | TT(1)|SPACE |                               | SPACE|  BS  |
-     *                             '------+------+------'                 ,------+------+------'
-     *                                    | ESC  |ENTER |                 | HOME | END  |
-     *                                    '------+------'                 '------+------'
-     *                                    |  DEL |  F2  |                 | PGUP | PGDN |
-     *                                    '------+------'                 '------+------'
+    /* Base (qwerty)
+     *                      ,----------------------------------,          ,----------------------------------,
+     * ,--------------------|   2  |   3  |   4  |   5  |   6  |          |   7  |   8  |   9  |   0  |   -  |--------------------,
+     * |  Esc |   `  |   1  |------+------+------+------+------|          |------+------+------+------+------|   =  |   \  |  BS  |
+     * |------+------+------|   w  |   e  |   r  |   t  |QKBOOT|          |  F8  |   y  |   u  |   i  |   o  |------+------+------|
+     * |M_RSTP|  Tab |   q  |------+------+------+------+------|          |------+------+------+------+------|   p  |   [  |   ]  |
+     * |------+------+------|   s  |   d  |   f  |   g  | TO(3)|          |  F9  |   h  |   j  |   k  |   l  |------+------+------|
+     * |M_REC1| Caps |   a  |------+------+------+------+------'          '------+------+------+------+------|   ;  |   "  |ENTER |
+     * |------+------+------|   x  |   c  |   v  |   b  |                        |   n  |   m  |   ,  |   .  |------+------+------|
+     * |M_REC2| Shift|   z  |------+------+------+------'                        '------+------+------+------|   /  |Shift | Ctrl |
+     * '------+------+------|  Alt | INS  |                                                    | Down |  Up  |------+------+------'
+     *        | Ctrl | Wint |------+------+-------------,                        ,-------------+------+------| TT(2)| Right|
+     *        '------+------'             | TT(1)|SPACE |                        | SPACE|  BS  |             '------+------'
+     *                                    '------+------+------,          ,------+------+------'
+     *                                           | ESC  |ENTER |          | HOME | END  |
+     *                                           '------+------'          '------+------'
+     *                                           |  DEL |  F2  |          | PGUP | PGDN |
+     *                                           '------+------'          '------+------'
     */
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_QWERTY] = LAYOUT_5x8(
-        KC_ESC,    KC_GRV,  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_BSLS,   KC_BSPC,
-        DM_RSTP,   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   QK_BOOT,       KC_F8,   KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,
-        DM_REC1,   KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_F7,         KC_F9,   KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT,
-        DM_REC2,   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_RCTL,
-                   KC_LCTL, KC_LGUI, KC_LALT, KC_INS,                                                  KC_UP,    KC_DOWN, KC_LEFT,  KC_RGHT,
-                                              TT(1), KC_SPC,                                  KC_SPC,  KC_BSPC,
-                                                     KC_ESC, KC_ENT,                 KC_HOME, KC_END,
-                                                     KC_DEL, KC_F2,                  KC_PGUP, KC_PGDN
-    ),
-/* Base (right to left on hold button)
-     * ,-------------------------------------------------------,   ,-------------------------------------------------------,
-     * |  BS  |   \  |   =  |   -  |   0  |   9  |   8  |   7  |   |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------|   |------+------+------+------+------+------+------+------|
-     * |   [  |   ]  |   p  |   o  |   i  |   u  |   y  |QKBOOT|   |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------|   |------+------+------+------+------+------+------+------|
-     * |M_PLY1|   "  |   ;  |   l  |   k  |   j  |   h  |PRSCRN|   |      |      | Left | Down |  Up  | Right|      |ENTER |
-     * |------+------+------+------+------+------+------+------'   '------+------+------+------+------+------+------+------|
-     * |M_PLY2|MShift|   /  |   .  |   ,  |   m  |   n  |                 |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------'                 '------+------+------+------+------+------+------'
-     *        |MCtrl | MAlt |  DEL |  BS  |                                             |      |      |      |      |
-     *        '------+------+------+------+------,                               ,------+------+------+------+------'
-     *                             |      |SPACE |                               | SPACE|  BS  |
-     *                             '------+------+------'                 ,------+------+------'
-     *                                    | END  |ENTER |                 | HOME | END  |
-     *                                    '------+------'                 '------+------'
-     *                                    | PGDN | PGUP |                 | PGUP | PGDN |
-     *                                    '------+------'                 '------+------'
+        KC_ESC,  KC_GRV,  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_BSLS, KC_BSPC,
+        DM_RSTP, KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,    QK_BOOT,     KC_F8,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        DM_REC1, KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,    TO(3),       KC_F9,   KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        DM_REC2, 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_RCTL,
+                 KC_LCTL, KC_LGUI, KC_LALT, KC_INS,                                                         KC_DOWN, KC_UP,   TT(2),   KC_RCTL,
+                                                    TT(1),  KC_SPC,                        KC_SPC, KC_BSPC,
+                                                            KC_ESC, KC_ENT,       KC_HOME, KC_END,
+                                                            KC_DEL, KC_F2,        KC_PGUP, KC_PGDN),
+                                                            
+    /* Base (right to left on hold button)
+     *                      ,----------------------------------,          ,----------------------------------,
+     * ,--------------------|   -  |   0  |   9  |   8  |   7  |          |  F7  |  F8  |  F9  |  F10 |  F11 |--------------------,
+     * |  BS  |   \  |   =  |------+------+------+------+------|          |------+------+------+------+------|  F12 |      |      |
+     * |------+------+------|   o  |   i  |   u  |   y  |QKBOOT|          |      |      |      |      |      |------+------+------|
+     * |   [  |   ]  |   p  |------+------+------+------+------|          |------+------+------+------+------|      |      |      |
+     * |------+------+------|   l  |   k  |   j  |   h  |PRSCRN|          |      |      | Left | Down |  Up  |------+------+------|
+     * |M_PLY1|   "  |   ;  |------+------+------+------+------'          '------+------+------+------+------| Right|      |ENTER |
+     * |------+------+------|   .  |   ,  |   m  |   n  |                        |  F1  |  F2  |  F3  |  F4  |------+------+------|
+     * |M_PLY2|MShift|   /  |------+------+------+------'                        '------+------+------+------|  F5  |  F6  |      |
+     * '------+------+------|  DEL |  BS  |                                                    |      |      |------+------+------'
+     *        |MCtrl | MAlt |------+------+-------------,                        ,-------------+------+------|      |      |
+     *        '------+------'             |      |SPACE |                        | SPACE|  BS  |             '------+------'
+     *                                    '------+------+------'          ,------+------+------'
+     *                                           | END  |ENTER |          | HOME | END  |
+     *                                           '------+------'          '------+------'
+     *                                           | PGDN | PGUP |          | PGUP | PGDN |
+     *                                           '------+------'          '------+------'
     */
-
    [_RIGHT2LEFT] = LAYOUT_5x8(
-        KC_BSPC,   KC_BSLS,  KC_EQL,    KC_MINS, KC_0,   KC_9,   KC_8,   KC_7,         KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,      KC_NO,   KC_NO,   KC_BSPC,
-        KC_RBRC,   KC_LBRC,  KC_P,      KC_O,    KC_I,   KC_U,   KC_Y,   QK_BOOT,      KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,      KC_NO,   KC_NO,   KC_NO,
-        DM_PLY1,   KC_QUOT,  KC_SCLN,   KC_L,    KC_K,   KC_J,   KC_H,   KC_PSCR,      KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT,   KC_SCLN, KC_NO,   KC_ENT,
-        DM_PLY2,  OSM(MOD_LSFT), KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N,                 KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,      KC_NO,   KC_NO,
-                   OSM(MOD_LCTL), OSM(MOD_LALT), KC_DEL, KC_BSPC,                                          KC_NO,    KC_NO,   KC_NO,      KC_NO,
-                                                         KC_NO,  KC_SPC,                         KC_SPC,  KC_BSPC,
-                                                                 KC_ESC, KC_ENT,       KC_HOME,  KC_END,
-                                                                 KC_DEL, KC_F2,        KC_PGUP,  KC_PGDN
-    ),
+        KC_BSPC, KC_BSLS, KC_EQL,  KC_MINS, KC_0,   KC_9,  KC_8,    KC_7,         KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
+        KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,   KC_U,  KC_Y,    QK_BOOT,      KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        DM_PLY1, KC_QUOT, KC_SCLN, KC_L,    KC_K,   KC_J,  KC_H,    KC_PSCR,      KC_NO,   KC_LEFT, KC_DOWN,KC_UP,   KC_RIGHT,KC_SCLN, KC_NO,   KC_ENT,
+        DM_PLY2, OSM(MOD_LSFT), KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N,                      KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,
+                 OSM(MOD_LCTL), OSM(MOD_LALT), KC_DEL, KC_BSPC,                                             KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                                                    KC_NO,   KC_SPC,                       KC_SPC, KC_BSPC,
+                                                             KC_ESC, KC_ENT,      KC_HOME, KC_END,
+                                                             KC_DEL, KC_F2,       KC_PGUP, KC_PGDN),
+
+/* LeftIRight (left and right on up and down button)
+     *                      ,----------------------------------,          ,----------------------------------,
+     * ,--------------------|   2  |   3  |   4  |   5  |   6  |          |   7  |   8  |   9  |   0  |   -  |--------------------,
+     * |  Esc |   `  |   1  |------+------+------+------+------|          |------+------+------+------+------|   =  |   \  |  BS  |
+     * |------+------+------|   w  |   e  |   r  |   t  |QKBOOT|          |  F8  |   y  |   u  |   i  |   o  |------+------+------|
+     * |M_RSTP|  Tab |   q  |------+------+------+------+------|          |------+------+------+------+------|   p  |   [  |   ]  |
+     * |------+------+------|   s  |   d  |   f  |   g  | TO(3)|          |  F9  |   h  |   j  |   k  |   l  |------+------+------|
+     * |M_REC1| Caps |   a  |------+------+------+------+------'          '------+------+------+------+------|   ;  |   "  |ENTER |
+     * |------+------+------|   x  |   c  |   v  |   b  |                        |   n  |   m  |   ,  |   .  |------+------+------|
+     * |M_REC2| Shift|   z  |------+------+------+------'                        '------+------+------+------|   /  |Shift | Ctrl |
+     * '------+------+------|  Alt | INS  |                                                    | Left | Right|------+------+------'
+     *        | Ctrl | Wint |------+------+-------------,                        ,-------------+------+------|      | Right|
+     *        '------+------'             | TT(1)|SPACE |                        | SPACE|  BS  |             '------+------'
+     *                                    '------+------+------,          ,------+------+------'
+     *                                           | ESC  |ENTER |          | HOME | END  |
+     *                                           '------+------'          '------+------'
+     *                                           |  DEL |  F2  |          | PGUP | PGDN |
+     *                                           '------+------'          '------+------'
+     */
+    [_LEFTIRIGHT] = LAYOUT_5x8(
+        KC_ESC,  KC_GRV,  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_BSLS, KC_BSPC,
+        DM_RSTP, KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,    QK_BOOT,     KC_F8,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        DM_REC1, KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,    TO(3),       KC_F9,   KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        DM_REC2, 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_RCTL,
+                 KC_LCTL, KC_LGUI, KC_LALT, KC_INS,                                                         KC_LEFT, KC_RGHT, KC_NO,   KC_RCTL,
+                                                    KC_NO,  KC_SPC,                        KC_SPC, KC_BSPC,
+                                                            KC_ESC, KC_ENT,       KC_HOME, KC_END,
+                                                            KC_DEL, KC_F2,        KC_PGUP, KC_PGDN),
+
+    /* leftNumPad
+     *                      ,----------------------------------,          ,----------------------------------,
+     * ,--------------------|  NUM |   /  |   *  |   -  |  BS  |          |  F7  |  F8  |  F9  |  F10 |  F11 |--------------------,
+     * |  Esc |   `  |   "  |------+------+------+------+------|          |------+------+------+------+------|  F12 |      |      |
+     * |------+------+------|   7  |   8  |   9  |   +  |QKBOOT|          |      |      |      |      |      |------+------+------|
+     * |M_RSTP|  Tab |   [  |------+------+------+------+------|          |------+------+------+------+------|      |      |      |
+     * |------+------+------|   4  |   5  |   6  |   =  |      |          |      |      | Left | Down |  Up  |------+------+------|
+     * |M_REC1| Caps |   .  |------+------+------+------+------'          '------+------+------+------+------| Right|      |ENTER |
+     * |------+------+------|   1  |   2  |   3  |   ., |                        |  F1  |  F2  |  F3  |  F4  |------+------+------|
+     * |M_REC2| Shift|   ]  |------+------+------+------'                        '------+------+------+------|  F5  |  F6  |      |
+     * '------+------+------|   ,  |   0  |                                                    |      |      |------+------+------'
+     *        | Ctrl |  Alt |------+------+-------------,                        ,-------------+------+------|      |      |
+     *        '------+------'             | TT(1)|SPACE |                        | SPACE|  BS  |             '------+------'
+     *                                    '------+------+------,          ,------+------+------'
+     *                                           | ESC  |ENTER |          | HOME | END  |
+     *                                           '------+------'          '------+------'
+     *                                           |  DEL |  F2  |          | PGUP | PGDN |
+     *                                           '------+------'          '------+------'
+     */
+    [_LEFTNUMPAD] = LAYOUT_5x8(
+        KC_ESC,  KC_GRV,  KC_QUOT, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_BSPC,     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
+        DM_RSTP, KC_TAB,  KC_LBRC, KC_7,    KC_8,    KC_9,    KC_PPLS, QK_BOOT,     KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        DM_REC1, KC_CAPS, KC_DOT,  KC_4,    KC_5,    KC_6,    KC_PEQL, TO(0),       KC_NO,   KC_LEFT, KC_DOWN,KC_UP,   KC_RIGHT,KC_NO,   KC_NO,   KC_ENT,
+        DM_REC2, KC_LSFT, KC_RBRC, KC_1,    KC_2,    KC_3,    KC_SLSH,                       KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,
+                 KC_LCTL, KC_LALT, KC_COMM, KC_0,                                                              KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                                                    TT(1),   KC_SPC,                        KC_SPC, KC_BSPC,
+                                                             KC_ESC, KC_ENT,       KC_HOME, KC_END,
+                                                             KC_DEL, KC_F2,        KC_PGUP, KC_PGDN),
 };
--- a/keyboards/handwired/dactyl_manuform/5x8/keymaps/default/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x8/keymaps/default/rules.mk
@@ -1 +1,2 @@
 DYNAMIC_MACRO_ENABLE = yes
+OLED_ENABLE = yes
--- a/keyboards/handwired/dactyl_manuform/5x8/readme.md
+++ b/keyboards/handwired/dactyl_manuform/5x8/readme.md
@@ -1,6 +1,6 @@
 # handwired/dactyl_manuform/5x8

-![Dactyl_manuform 5x8](https://i.imgur.com/DtawD9r.jpeg)
+![Dactyl_manuform 5x8](https://i.imgur.com/2DBxL2W.jpeg)

 * Keyboard Maintainer: [iliorik](https://github.com/iliorik)

--- a/keyboards/silakka54/keyboard.json
+++ b/keyboards/silakka54/keyboard.json
@@ -40,12 +40,12 @@
                {"matrix": [0, 4], "x": 4, "y": 0},
                {"matrix": [0, 5], "x": 5, "y": 0},

-                {"matrix": [5, 5], "x": 0, "y": 5},
-                {"matrix": [5, 4], "x": 1, "y": 5},
-                {"matrix": [5, 3], "x": 2, "y": 5},
-                {"matrix": [5, 2], "x": 3, "y": 5},
-                {"matrix": [5, 1], "x": 4, "y": 5},
-                {"matrix": [5, 0], "x": 5, "y": 5},
+                {"matrix": [5, 5], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0},


                {"matrix": [1, 0], "x": 0, "y": 1},
@@ -55,12 +55,12 @@
                {"matrix": [1, 4], "x": 4, "y": 1},
                {"matrix": [1, 5], "x": 5, "y": 1},

-                {"matrix": [6, 5], "x": 0, "y": 6},
-                {"matrix": [6, 4], "x": 1, "y": 6},
-                {"matrix": [6, 3], "x": 2, "y": 6},
-                {"matrix": [6, 2], "x": 3, "y": 6},
-                {"matrix": [6, 1], "x": 4, "y": 6},
-                {"matrix": [6, 0], "x": 5, "y": 6},
+                {"matrix": [6, 5], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "x": 12, "y": 1},

                {"matrix": [2, 0], "x": 0, "y": 2},
                {"matrix": [2, 1], "x": 1, "y": 2},
@@ -69,12 +69,12 @@
                {"matrix": [2, 4], "x": 4, "y": 2},
                {"matrix": [2, 5], "x": 5, "y": 2},

-                {"matrix": [7, 5], "x": 0, "y": 7},
-                {"matrix": [7, 4], "x": 1, "y": 7},
-                {"matrix": [7, 3], "x": 2, "y": 7},
-                {"matrix": [7, 2], "x": 3, "y": 7},
-                {"matrix": [7, 1], "x": 4, "y": 7},
-                {"matrix": [7, 0], "x": 5, "y": 7},
+                {"matrix": [7, 5], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "y": 2},

                {"matrix": [3, 0], "x": 0, "y": 3},
                {"matrix": [3, 1], "x": 1, "y": 3},
@@ -83,22 +83,20 @@
                {"matrix": [3, 4], "x": 4, "y": 3},
                {"matrix": [3, 5], "x": 5, "y": 3},

-                {"matrix": [8, 5], "x": 0, "y": 9},
-                {"matrix": [8, 4], "x": 1, "y": 9},
-                {"matrix": [8, 3], "x": 2, "y": 9},
-                {"matrix": [8, 2], "x": 3, "y": 9},
-                {"matrix": [8, 1], "x": 4, "y": 9},
-                {"matrix": [8, 0], "x": 5, "y": 9},
+                {"matrix": [8, 5], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "y": 3},

                {"matrix": [4, 3], "x": 3, "y": 4},
                {"matrix": [4, 4], "x": 4, "y": 4},
                {"matrix": [4, 5], "x": 5, "y": 4},

-                {"matrix": [9, 5], "x": 3, "y": 9},
-                {"matrix": [9, 4], "x": 4, "y": 9},
-                {"matrix": [9, 3], "x": 5, "y": 9}
-
-
+                {"matrix": [9, 5], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4}
            ]
        }
    }
Author	SHA1	Message	Date
Philip	6c47027810	Merge `60cd9caa89` into `b4bdf3f1d5`	2025-09-10 01:53:40 -07:00
diegorodriguezv	b4bdf3f1d5	Update data_driven_config.md (#25612 )	2025-09-10 01:52:25 -07:00
Joel Challis	c4ccbf06e1	Fix silakka54 layout (#25643 )	2025-09-10 09:11:46 +01:00
diegorodriguezv	24c05ff1c7	Correct link in porting_your_keyboard_to_qmk.md (#25635 ) Fixed anchor	2025-09-09 19:44:47 -06:00
diegorodriguezv	65e1afe0af	Correct link in faq_general.md (#25640 ) Updated the link to the QMK trademark page.	2025-09-09 19:43:28 -06:00
Philip	60cd9caa89	Delete keyboards/handwired/dactyl_manuform/5x8/lib directory	2025-09-09 14:25:06 +03:00
Philip	a3c0d8e875	Delete keyboards/handwired/dactyl_manuform/5x8/config.h	2025-09-09 14:24:43 +03:00
Philip	cea34a4f3b	Merge branch 'qmk:master' into master	2025-09-09 14:22:58 +03:00
Philip	959f6b3e60	Update keyboards/handwired/dactyl_manuform/5x8/keymaps/default/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com>	2025-09-09 12:05:58 +03:00
Philip	7baceace0b	Update readme.md	2025-09-09 12:04:49 +03:00
Philip	171947588e	Update readme.md	2025-09-09 11:35:25 +03:00
Philip	59c231c79b	Update config.h	2025-09-09 11:29:48 +03:00
Philip	46465469d2	Update keyboards/handwired/dactyl_manuform/5x8/config.h Co-authored-by: Drashna Jaelre <drashna@live.com>	2025-09-09 11:17:14 +03:00
Philip	5e0e9994b1	Delete keyboards/handwired/dactyl_manuform/5x8/dactyl_manuform_5x8.jpg	2025-09-09 11:12:30 +03:00
Philip	7174058a11	Add files via upload	2025-09-07 23:03:47 +03:00
Philip	0c4c4c2031	Update readme.md	2025-09-07 23:02:26 +03:00
Philip	3a046c90f0	Add files via upload	2025-09-07 22:59:41 +03:00
Philip	b289bbdcb0	Create glcdfont.c Add font for OLED display	2025-09-07 22:58:54 +03:00
Philip	07e4216d16	Update rules.mk Add OLED	2025-09-07 22:57:19 +03:00
Philip	8aa10184a9	Update keymap.c Add OLED function, two layers. Redraw keyboard shceme	2025-09-07 22:55:35 +03:00
Philip	0a3e8bf462	Merge branch 'qmk:master' into master	2025-09-07 22:48:38 +03:00
Philip	45414452ca	Update keyboard.json change button coordinates on right keyboard	2025-01-02 19:32:27 +03:00
Philip	3471c3bd13	Merge branch 'qmk:master' into master	2025-01-02 19:28:59 +03:00
Philip	b08e39407b	Update keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com>	2024-12-28 09:02:39 +03:00
Philip	c8ad2cd8e4	Update keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com>	2024-12-28 09:02:31 +03:00
Philip	7a16d43744	Update readme.md	2024-12-25 20:23:47 +03:00
Philip	6459c5812a	fix KC_BSPC and KC_SPC on right keyboard	2024-12-25 20:10:45 +03:00
Philip	fb99ea04b5	change "serial pin" syntactic change "soft_serial_pin": "D0" to "serial": { "pin": "D0" }	2024-12-25 20:01:30 +03:00
Philip	9fd9ec9708	I rewrote the layout so that the halves are not stacked (keymap.c)	2024-12-25 19:59:13 +03:00
Philip	4e67f9db0e	I rewrote the layout so that the halves are not stacked.	2024-12-25 19:52:11 +03:00
Philip	83a97864b8	Update keyboard.json	2024-12-23 23:01:28 +03:00
Philip	99b3cc263a	move license header to top keymap.c	2024-12-23 20:49:36 +03:00
Philip	b2bcdb55bd	Merge branch 'qmk:master' into master	2024-12-23 20:23:29 +03:00
Philip	2f502b9033	Merge pull request #3 from iliorik-ph/patch-2	2024-12-23 20:08:57 +03:00
iliorik-ph	7f038d2786	Update keymap.c	2024-12-23 20:08:20 +03:00
Philip	4142b272d1	Merge pull request #2 from iliorik-ph/patch-1	2024-12-23 20:04:20 +03:00
iliorik-ph	d979c58d08	Update keyboard.json	2024-12-23 20:03:44 +03:00
Philip	32acdcec4a	Merge pull request #1 from iliorik-ph/master	2024-12-23 18:28:11 +03:00
iliorik-ph	e177ea03f8	change key sets on first workday/add right2left layer	2024-12-23 18:19:49 +03:00
iliorik-ph	524ffdd1b9	add dynamic macros support	2024-12-23 18:19:05 +03:00
Philip	f5e52724f0	Update readme.md	2024-12-22 21:20:27 +03:00
Philip	05755d0b7d	Update readme.md	2024-12-22 21:17:01 +03:00
Philip	0029c978e9	Update readme.md	2024-12-22 21:16:41 +03:00
skandiPC	94c39132ad	fix and compile worked configs	2024-12-22 20:54:10 +03:00
Philip	3dc215558e	Update keyboard.json	2024-12-18 23:49:40 +03:00
Philip	97786350b1	Update keyboard.json	2024-12-18 23:25:09 +03:00
Philip	3ed48f4cef	Update keymap.c	2024-12-18 22:51:55 +03:00
Philip	a43e0f30cb	add keymap scheme	2024-12-18 22:21:43 +03:00
skandiPC	2c8199be20	add handwired/dactyl_manuform/5x8 config	2024-12-17 23:26:04 +03:00