From 7838a7c4cde2d67c36655b251e21f63b39d55f5c Mon Sep 17 00:00:00 2001
From: Kawamashi <kawamashi@free.fr>
Date: Mon, 21 Apr 2025 20:05:33 +0200
Subject: [PATCH] Suppression CA_CED et AGRV_SPC

---
 .../kyria/rev1/base/keymaps/Kawamashi/clever_keys.c       | 8 ++++++--
 .../rev1/base/keymaps/Kawamashi/features/odk_layer.c      | 3 ++-
 .../kyria/rev1/base/keymaps/Kawamashi/features_conf.c     | 1 +
 .../splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c    | 2 +-
 .../splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h    | 8 ++++----
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c
index 3957a45d..668b98b3 100644
--- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c
+++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c
@@ -101,12 +101,12 @@ void get_clever_keycode(uint16_t* next_keycode, keyrecord_t* record) {
       }
       break;
     
-    case FG_CCED:
+/*     case FG_CCED:
       if (!isLetter(*next_keycode)) {
         invoke_key(FG_A, record);
         set_last_keycode(*next_keycode);
       }
-      break;
+      break; */
   }
 
   
@@ -246,6 +246,10 @@ void get_clever_keycode(uint16_t* next_keycode, keyrecord_t* record) {
       layer_off(_ODK);
       return finish_word((uint16_t[]) {FG_O, FG_ODK, FG_T}, 3, next_keycode, record);
 
+/*     case CA_CED:
+      layer_off(_ODK);
+      return finish_word((uint16_t[]) {FG_CCED, FG_A}, 2, next_keycode, record); */
+
 /*     case AGRV_SPC:
       layer_off(_ODK);
       return finish_word((uint16_t[]) {FG_AGR, KC_SPC}, 2, next_keycode, record); */
diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/odk_layer.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/odk_layer.c
index d83fe5d4..b5677448 100644
--- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/odk_layer.c
+++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/odk_layer.c
@@ -66,7 +66,8 @@ bool process_odk_layer(uint16_t keycode, keyrecord_t *record) {
                 case FG_ECIR:
                 case OU_GRV:
                 case FG_CCED:
-                case AGRV_SPC:
+                //case CA_CED:
+                //case AGRV_SPC:
                 case KC_SPC:    // When space is added by Clever Keys
                 case FG_3PTS:
                 case CNL_ODK:
diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c
index b680bbf7..4cb0e1c5 100644
--- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c
+++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c
@@ -38,6 +38,7 @@ bool isLetter(uint16_t keycode) {
 bool isSendStringMacro(uint16_t keycode) {
   switch (keycode) {
     //case AGRV_SPC:
+    //case CA_CED:
     case OU_GRV:
     case MAGIC:
       return true;
diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c
index e97c669e..1b61c765 100644
--- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c
+++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c
@@ -247,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ODK] = LAYOUT(
        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
        _______, OU_GRV,  _______, _______, FG_3PTS, _______,                                     _______, FG_J,    FG_D,    FG_AROB, _______, _______,
-       _______, _______, _______, _______, FG_F,    _______, _______, _______, _______, _______, _______, FG_CCED, _______, FG_K,    CNL_ODK, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, FG_CCED, _______, FG_K,    CNL_ODK, _______,
                                   _______, _______, _______, _______, FG_ECIR, _______, _______, _______, _______, _______
      ),
 
diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h
index f20efa62..77df1e78 100644
--- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h
+++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h
@@ -50,16 +50,16 @@ enum custom_keycodes {
   OS4A,
   RAZ,
   CAPSWORD,
-  AGRV_SPC,
+  //AGRV_SPC,
   OU_GRV,
   //E_CIRC,
 /*  I_CIRC,
   A_CIRC,
   O_CIRC,
   U_CIRC,
-  I_TREM, */
-  //CA_CED,
-/*   CIRC,
+  I_TREM,
+  CA_CED,
+   CIRC,
   TILDE,
   GRAVE, */
   MAGIC,