feat(shields): add physical layouts and update keymap for Jorne

Add physical layouts and update the keymap for Joric's Jorne.
Layouts are added for all three possible transforms:
- Full (with additional pinky key)
- 6 column (Corne), re-uses Corne layout
- 5 column (Minidox), re-uses Corne layout

Keymap update includes quick-tap-ms (essential for this keymap), small
guide clarifications, output selection, tri-layer and &studio_unlock.

6 files changed, 160 insertions, 15 deletions

diff --git a/app/boards/shields/jorne/jorne.dtsi b/app/boards/shields/jorne/jorne.dtsi
index e7b81e5f11..483b47e41e 100644
--- a/app/boards/shields/jorne/jorne.dtsi
+++ b/app/boards/shields/jorne/jorne.dtsi
@@ -6,11 +6,27 @@
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
+#include "layouts/full.dtsi"
+#include "layouts/6column.dtsi"
+#include "layouts/5column.dtsi"
+
+&joric_jorne_full_layout {
+    transform = <&default_transform>;
+};
+
+&foostan_corne_6col_layout {
+    transform = <&crkbd_transform>;
+};
+
+&foostan_corne_5col_layout {
+    transform = <&five_column_transform>;
+};
+
 / {
     chosen {
         zephyr,display = &oled;
         zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &joric_jorne_full_layout;
     };
 
     default_transform: keymap_transform_0 {
@@ -57,7 +73,7 @@
 RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
 RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
 RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
-                        RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
+                RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
         >;
     };
 
diff --git a/app/boards/shields/jorne/jorne.keymap b/app/boards/shields/jorne/jorne.keymap
index 56ffe61791..72d4bde8b8 100644
--- a/app/boards/shields/jorne/jorne.keymap
+++ b/app/boards/shields/jorne/jorne.keymap
@@ -7,67 +7,83 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/outputs.h>
 
 #define DEF 0
 #define LWR 1
 #define RSE 2
 #define ADJ 3
 
+&lt { quick-tap-ms = <200>; };
+&mt { quick-tap-ms = <200>; };
+
 / {
+    conditional_layers {
+        compatible = "zmk,conditional-layers";
+        tri_layer {
+            if-layers = <LWR RSE>;
+            then-layer = <ADJ>;
+        };
+    };
+
         keymap {
                 compatible = "zmk,keymap";
 
                 default_layer {
+                        display-name = "MAIN";
 // -----------------------------------------------------------------------------------------
 // |  GUI |   ~  |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  |  [   | GUI/] |
 //        | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |CTRL/'|
-//        | LALT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | RALT |
+//        | LALT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  |RALT/\|
 //                           | RSE | SPC | LWR |   | LWR | BSPC | RSE |
                         bindings = <
    &kp LWIN &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y         &kp U  &kp I     &kp O   &kp P    &kp LBKT &mt RWIN RBKT
             &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H         &kp J  &kp K     &kp L   &kp SEMI &mt RCTRL SQT
-            &kp LALT  &kp Z &kp X &kp C &kp V &kp B &kp N         &kp M  &kp COMMA &kp DOT &kp FSLH &kp BSLH
-                         &lt RSE TAB &mt LSHFT SPACE &lt LWR RET &lt LWR ESC &mt RSHFT BSPC &lt RSE DEL
+            &kp LALT  &kp Z &kp X &kp C &kp V &kp B &kp N         &kp M  &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
+                  &lt RSE TAB &mt LSHFT SPACE &lt LWR RET         &lt LWR ESC &mt RSHFT BSPC &lt RSE DEL
                         >;
                 };
                 lower_layer {
+                        display-name = "SYM";
 // -----------------------------------------------------------------------------------------
 // |     |  _  |  F1 |  F2 |  F3 |  F4 |  F5 |   |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |
 //       |  +  |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  |  -  |
 //       |  =  |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  |     |
-//                    | GUI |     | SPC |   | ENT |     | ALT |
+//                         | ADJ |     |     |   |     |     | ADJ |
                         bindings = <
    &trans &kp UNDER      &kp F1   &kp F2 &kp F3   &kp F4   &kp F5           &kp F6    &kp F7   &kp F8   &kp F9   &kp F10  &kp F11 &mt RGUI F12
           &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT        &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS
           &mt LALT EQUAL &kp N1   &kp N2 &kp N3   &kp N4   &kp N5           &kp N6    &kp N7   &kp N8   &kp N9   &kp N0   &trans
-                                              &lt ADJ TAB &trans &trans   &trans &trans &lt ADJ DEL
+                                                &trans &trans &trans        &trans &trans &trans
                         >;
                 };
 
                 raise_layer {
+                        display-name = "NUM";
 // -----------------------------------------------------------------------------------------
 // |     | NMLK |  /  |  7  |  8  |  9  |  -  |   | VOLU| HOME| PRSC| PGUP| SCLK| CLCK|     |
-//       | CTRL |  *  |  4  |  5  |  6  |  +  |   | MUT | LEFT|  UP | RGHT| INS | APP |
+//       |CTRL/=|  *  |  4  |  5  |  6  |  +  |   | MUT | LEFT|  UP | RGHT| INS | APP |
 //       |      |  0  |  1  |  2  |  3  |  .  |   | VOLD| END | DOWN| PGDN| PAUS|     |
 //                          |     |     | ADJ |   | ADJ |     |     |
                         bindings = <
    &trans &kp KP_NUM      &kp KP_SLASH    &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS        &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CAPS &trans
           &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS         &kp C_MUTE   &kp LEFT &kp UP    &kp RIGHT &kp INS  &mt RCTRL K_APP
           &trans          &kp KP_N0       &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT          &kp C_VOL_DN &kp END  &kp DOWN  &kp PG_DN &kp PAUSE_BREAK &trans
-                                                           &trans &trans &lt ADJ RET   &lt ADJ ESC &trans &trans
+                                                                &trans &trans &trans        &trans &trans &trans
                         >;
                 };
                 adjust_layer {
+                        display-name = "ADJ";
 // -----------------------------------------------------------------------------------------
-// | RST | BLDR |     |     |     |     |     |   |     |     |     |     |     | BLDR | RST |
+// | RST | BLDR | STU |     |     |     |     |   |     |     |     |     | STU | BLDR | RST |
 //       | BTCLR| BT0 | BT1 | BT2 | BT3 | BT4 |   | BT4 | BT3 | BT2 | BT1 | BT0 | BTCLR|
-//       |      |     |     |     |     |     |   |     |     |     |     |     |      |
+//       | OUT  |     |     |     |     |     |   |     |     |     |     |     | OUT  |
 //                          |     |     |     |   |     |     |     |
                         bindings = <
-   &sys_reset &bootloader  &none        &none        &none        &none        &none              &none        &none        &none        &none        &none         &bootloader &sys_reset
-          &bt BT_CLR   &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4       &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0  &bt BT_CLR
-          &none        &none        &none        &none        &none        &none              &none        &none        &none        &none        &none         &none
-                                                                    &trans &none &trans   &trans &none &trans
+   &sys_reset &bootloader  &studio_unlock &none        &none        &none        &none              &none        &none        &none        &none        &studio_unlock &bootloader &sys_reset
+              &bt BT_CLR   &bt BT_SEL 0   &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4       &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0   &bt BT_CLR
+              &out OUT_TOG &none          &none        &none        &none        &none              &none        &none        &none        &none        &none          &out OUT_TOG
+                                                                          &trans &none &trans       &trans &none &trans
                         >;
                 };
         };
diff --git a/app/boards/shields/jorne/layouts/5column.dtsi b/app/boards/shields/jorne/layouts/5column.dtsi
new file mode 100644
index 0000000000..d9f0f4827a
--- /dev/null
+++ b/app/boards/shields/jorne/layouts/5column.dtsi
@@ -0,0 +1,19 @@
+#include <layouts/foostan/corne/5column.dtsi>
+#include <physical_layouts.dtsi>
+
+#include "position_map.dtsi"
+
+&layouts_foostan_corne_position_map {
+    status = "disabled";
+};
+
+&layouts_joric_jorne_position_map {
+    joric_jorne_5col_posmap: five {
+        physical-layout = <&foostan_corne_5col_layout>;
+        positions
+            = <36 37  0  1  2  3  4        5  6  7  8  9 38 39>
+            , <   40 10 11 12 13 14       15 16 17 18 19 41   >
+            , <   42 20 21 22 23 24       25 26 27 28 29 43   >
+            , <               30 31 32 33 34 35               >;
+    };
+};
diff --git a/app/boards/shields/jorne/layouts/6column.dtsi b/app/boards/shields/jorne/layouts/6column.dtsi
new file mode 100644
index 0000000000..65d4fa8543
--- /dev/null
+++ b/app/boards/shields/jorne/layouts/6column.dtsi
@@ -0,0 +1,19 @@
+#include <layouts/foostan/corne/6column.dtsi>
+#include <physical_layouts.dtsi>
+
+#include "position_map.dtsi"
+
+&layouts_foostan_corne_position_map {
+    status = "disabled";
+};
+
+&layouts_joric_jorne_position_map {
+    joric_jorne_6col_posmap: six {
+        physical-layout = <&foostan_corne_6col_layout>;
+        positions
+            = <42  0  1  2  3  4  5        6  7  8  9 10 11 43>
+            , <   12 13 14 15 16 17       18 19 20 21 22 23   >
+            , <   24 25 26 27 28 29       30 31 32 33 34 35   >
+            , <               36 37 38 39 40 41               >;
+    };
+};
diff --git a/app/boards/shields/jorne/layouts/full.dtsi b/app/boards/shields/jorne/layouts/full.dtsi
new file mode 100644
index 0000000000..545122981d
--- /dev/null
+++ b/app/boards/shields/jorne/layouts/full.dtsi
@@ -0,0 +1,68 @@
+#include <physical_layouts.dtsi>
+
+#include "position_map.dtsi"
+
+/ {
+    joric_jorne_full_layout: joric_jorne_full_layout {
+        compatible = "zmk,physical-layout";
+        display-name = "Full (with pinky)";
+
+        keys  //                     w   h    x    y     rot    rx    ry
+            = <&key_physical_attrs 100 100    0  112       0     0     0>
+            , <&key_physical_attrs 100 100  100   37       0     0     0>
+            , <&key_physical_attrs 100 100  200   37       0     0     0>
+            , <&key_physical_attrs 100 100  300   12       0     0     0>
+            , <&key_physical_attrs 100 100  400    0       0     0     0>
+            , <&key_physical_attrs 100 100  500   12       0     0     0>
+            , <&key_physical_attrs 100 100  600   24       0     0     0>
+            , <&key_physical_attrs 100 100  900   24       0     0     0>
+            , <&key_physical_attrs 100 100 1000   12       0     0     0>
+            , <&key_physical_attrs 100 100 1100    0       0     0     0>
+            , <&key_physical_attrs 100 100 1200   12       0     0     0>
+            , <&key_physical_attrs 100 100 1300   37       0     0     0>
+            , <&key_physical_attrs 100 100 1400   37       0     0     0>
+            , <&key_physical_attrs 100 100 1500  112       0     0     0>
+            , <&key_physical_attrs 100 100  100  137       0     0     0>
+            , <&key_physical_attrs 100 100  200  137       0     0     0>
+            , <&key_physical_attrs 100 100  300  112       0     0     0>
+            , <&key_physical_attrs 100 100  400  100       0     0     0>
+            , <&key_physical_attrs 100 100  500  112       0     0     0>
+            , <&key_physical_attrs 100 100  600  124       0     0     0>
+            , <&key_physical_attrs 100 100  900  124       0     0     0>
+            , <&key_physical_attrs 100 100 1000  112       0     0     0>
+            , <&key_physical_attrs 100 100 1100  100       0     0     0>
+            , <&key_physical_attrs 100 100 1200  112       0     0     0>
+            , <&key_physical_attrs 100 100 1300  137       0     0     0>
+            , <&key_physical_attrs 100 100 1400  137       0     0     0>
+            , <&key_physical_attrs 100 100  100  237       0     0     0>
+            , <&key_physical_attrs 100 100  200  237       0     0     0>
+            , <&key_physical_attrs 100 100  300  212       0     0     0>
+            , <&key_physical_attrs 100 100  400  200       0     0     0>
+            , <&key_physical_attrs 100 100  500  212       0     0     0>
+            , <&key_physical_attrs 100 100  600  224       0     0     0>
+            , <&key_physical_attrs 100 100  900  224       0     0     0>
+            , <&key_physical_attrs 100 100 1000  212       0     0     0>
+            , <&key_physical_attrs 100 100 1100  200       0     0     0>
+            , <&key_physical_attrs 100 100 1200  212       0     0     0>
+            , <&key_physical_attrs 100 100 1300  237       0     0     0>
+            , <&key_physical_attrs 100 100 1400  237       0     0     0>
+            , <&key_physical_attrs 100 100  450  312       0     0     0>
+            , <&key_physical_attrs 100 100  550  312    1200   550   412>
+            , <&key_physical_attrs 100 150  648  283    2400   648   433>
+            , <&key_physical_attrs 100 150  852  283  (-2400)  952   433>
+            , <&key_physical_attrs 100 100  950  312  (-1200) 1050   412>
+            , <&key_physical_attrs 100 100 1050  312       0     0     0>
+        ;
+    };
+};
+
+&layouts_joric_jorne_position_map {
+    joric_jorne_full_posmap: full {
+        physical-layout = <&joric_jorne_full_layout>;
+        positions
+            = < 0  1  2  3  4  5  6        7  8  9 10 11 12 13>
+            , <   14 15 16 17 18 19       20 21 22 23 24 25   >
+            , <   26 27 28 29 30 31       32 33 34 35 36 37   >
+            , <               38 39 40 41 42 43               >;
+    };
+};
diff --git a/app/boards/shields/jorne/layouts/position_map.dtsi b/app/boards/shields/jorne/layouts/position_map.dtsi
new file mode 100644
index 0000000000..6d183e0be9
--- /dev/null
+++ b/app/boards/shields/jorne/layouts/position_map.dtsi
@@ -0,0 +1,7 @@
+/ {
+    layouts_joric_jorne_position_map: layouts_joric_jorne_position_map {
+        compatible = "zmk,physical-layout-position-map";
+
+        complete;
+    };
+};