From 9c41fff57450b9044cf0e94ced34a30f0f3ee74c Mon Sep 17 00:00:00 2001
From: sebastienPoussard <sebastienPoussard>
Date: Sun, 12 Mar 2023 14:01:36 +0100
Subject: [PATCH] final diactriques

---
 config/corne.keymap | 93 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/config/corne.keymap b/config/corne.keymap
index 2e8896c..3598b25 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -104,11 +104,13 @@
             <&macro_tap &kp COMMA>,
             <&macro_release &kp RALT>;
         )  
+        // [à]
         ZMK_MACRO(macroagravmin,
             wait-ms = <0>;
             tap-ms = <0>;
             bindings = <&kp GRAVE &kp A>;
         ) 
+        // [À]
         ZMK_MACRO(macroagravmaj,
             wait-ms = <30>;
             tap-ms = <30>;
@@ -117,11 +119,13 @@
             <&macro_tap &kp A>,
             <&macro_release &kp LSHFT>;
         ) 
+        // [â]
         ZMK_MACRO(macroacircmin,
             wait-ms = <0>;
             tap-ms = <0>;
             bindings = <&kp CARET &kp A>;
         ) 
+        // [Â]
         ZMK_MACRO(macroacircmaj,
             wait-ms = <40>;
             tap-ms = <40>;
@@ -130,11 +134,13 @@
             <&macro_tap &kp A>,
             <&macro_release &kp LSHFT>;
         )
+        // [î]
         ZMK_MACRO(macroicircmin,
             wait-ms = <0>;
             tap-ms = <0>;
             bindings = <&kp CARET &kp I>;
         )
+        // [Î]
         ZMK_MACRO(macroicircmaj,
             wait-ms = <40>;
             tap-ms = <40>;
@@ -143,6 +149,7 @@
             <&macro_tap &kp I>,
             <&macro_release &kp LSHFT>;
         )
+        // [ï]
         ZMK_MACRO(macroitremamin,
             wait-ms = <40>;
             tap-ms = <40>;
@@ -151,6 +158,7 @@
             <&macro_release &kp LSHFT>,
             <&macro_tap &kp I>;
         )
+        // [Ï]
         ZMK_MACRO(macroitremamaj,
             wait-ms = <50>;
             tap-ms = <40>;
@@ -159,7 +167,51 @@
             <&macro_tap &kp I>,
             <&macro_release &kp LSHFT>;
         )
-                  
+        // []
+        ZMK_MACRO(macroocircmin,
+            wait-ms = <0>;
+            tap-ms = <0>;
+            bindings = <&kp CARET &kp O>;
+        )
+        // []
+        ZMK_MACRO(macroocircmaj,
+            wait-ms = <40>;
+            tap-ms = <40>;
+            bindings = <&macro_tap &kp CARET>,
+            <&macro_press &kp LSHFT>,
+            <&macro_tap &kp O>,
+            <&macro_release &kp LSHFT>;
+        )
+        // []
+        ZMK_MACRO(macrougravemin,
+            wait-ms = <0>;
+            tap-ms = <0>;
+            bindings = <&kp GRAVE &kp U>;
+        )
+        // []
+        ZMK_MACRO(macrougravemaj,
+            wait-ms = <30>;
+            tap-ms = <30>;
+            bindings = <&macro_tap &kp GRAVE>,
+            <&macro_press &kp LSHFT>,
+            <&macro_tap &kp U>,
+            <&macro_release &kp LSHFT>;
+        )  
+        // []
+        ZMK_MACRO(macroucircmin,
+            wait-ms = <0>;
+            tap-ms = <0>;
+            bindings = <&kp CARET &kp U>;
+        )
+        // []
+        ZMK_MACRO(macroucircmaj,
+            wait-ms = <40>;
+            tap-ms = <40>;
+            bindings = <&macro_tap &kp CARET>,
+            <&macro_press &kp LSHFT>,
+            <&macro_tap &kp U>,
+            <&macro_release &kp LSHFT>;
+        )               
     };
 /* ======
  * MODTAP   
@@ -251,7 +303,29 @@
             #binding-cells = <0>;
             bindings = <&macroitremamin>, <&macroitremamaj>;
             mods = <(MOD_LSFT)>;
-        }; 
+        };
+        o_circ: o_circ {
+            compatible = "zmk,behavior-mod-morph";
+            label = "OCIRC";
+            #binding-cells = <0>;
+            bindings = <&macroocircmin>, <&macroocircmaj>;
+            mods = <(MOD_LSFT)>;
+        };
+        u_grave: u_grave {
+            compatible = "zmk,behavior-mod-morph";
+            label = "UGRAVE";
+            #binding-cells = <0>;
+            bindings = <&macrougravemin>, <&macrougravemaj>;
+            mods = <(MOD_LSFT)>;
+        };
+        u_circ: u_circ {
+            compatible = "zmk,behavior-mod-morph";
+            label = "UCIRC";
+            #binding-cells = <0>;
+            bindings = <&macroucircmin>, <&macroucircmaj>;
+            mods = <(MOD_LSFT)>;
+        };
+        
     };
 /* ======
  * COMBOS
@@ -304,6 +378,21 @@
             key-positions = <20 22>;
             bindings = <&i_trema>;
         };
+        combo_ocirc {
+            timeout-ms = <40>;
+            key-positions = <21 22 23>;
+            bindings = <&o_circ>;
+        };
+        combo_ugrave {
+            timeout-ms = <30>;
+            key-positions = <8 9>;
+            bindings = <&u_grave>;
+        };
+        combo_ucirc {
+            timeout-ms = <40>;
+            key-positions = <7 8 9>;
+            bindings = <&u_circ>;
+        };
         
     };
 };