update

Author: QRiary

keyboards/beekeeb/piantor/keymaps/qkekos/general/custom_keys.c

@@ -81,14 +81,11 @@ int custom_keys_pr(uint16_t keycode, keyrecord_t *record) {
             return false;
 
         case US_RFSH:
-            uprintf("qmk_language_swap: en\n");
+            swap_to(ENG);
             current_lang = ENG;
 
             layer_on(STURDY);
             layer_off(QWERTY);
-
-            enable_magic_training();
-            enable_hard_training();
             autocorrect_enable();
 
             return true;
@@ -101,14 +98,6 @@ int custom_keys_pr(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) toggle_alt_case_with(KC_LSFT, 0);
             return false;
 
-        case US_MGTR:
-            if (record->event.pressed) toggle_magic_training();
-            return false;
-
-        case US_HRTR:
-            if (record->event.pressed) toggle_hard_training();
-            return false;
-
         case US_DPAS:
             if (record->event.pressed) send_lang_independant_string(DEFAULT_PASS);
             return false;

keyboards/beekeeb/piantor/keymaps/qkekos/general/custom_keys.h

@@ -15,8 +15,6 @@ enum blender_keycode {
     US_FNCE,
     US_SNKE,
     US_CAML,
-    US_MGTR,
-    US_HRTR,
     US_RFSH,
     US_DPAS,
     US_SPAS,

keyboards/beekeeb/piantor/keymaps/qkekos/keymap.c

@@ -28,8 +28,6 @@ void keyboard_pre_init_user(void) {
 
     transaction_register_rpc(USER_SYNC_A, user_sync_a_slave_handler);
     lang_independant_init();
-    enable_magic_training();
-    enable_hard_training();
 }
 
 void post_process_record_user(uint16_t keycode, keyrecord_t *record) {

keyboards/beekeeb/piantor/keymaps/qkekos/localization/__init__.h

@@ -2,9 +2,6 @@
 #pragma once
 #include "../__init__.h"
 
-#include "language_swapper.h"
-#include "lang_independant.h"
-
 enum languages {
     ENG,
     RU,
@@ -16,3 +13,6 @@ enum language_modes {
     DOUBLE,
     TRIPLE
 };
+
+#include "language_swapper.h"
+#include "lang_independant.h"

keyboards/beekeeb/piantor/keymaps/qkekos/localization/language_swapper.c

@@ -29,17 +29,16 @@ void swap_to(enum languages new_lang) {
     if (do_invert) {
         layer_invert(QWERTY);
         autocorrect_toggle();
-        toggle_magic_training();
     }
 }
 
 void tri_eng_tap_action(void)   { swap_to(RU);  }
 void tri_ru_tap_action(void)    { swap_to(ENG); }
 void tri_ua_tap_action(void)    { swap_to(ENG); }
 
-void tri_eng_hold_action(void)  { swap_to(UA);  }
-void tri_ru_hold_action(void)   { swap_to(UA);  }
-void tri_ua_hold_action(void)   { swap_to(RU);  }
+void tri_eng_hold_action(void)  { swap_to(RU);  }
+void tri_ru_hold_action(void)   { swap_to(ENG); }
+void tri_ua_hold_action(void)   { swap_to(ENG); }
 
 void double_ru_tap_action(void) { tri_ua_tap_action(); }
 

keyboards/beekeeb/piantor/keymaps/qkekos/localization/language_swapper.h

@@ -2,6 +2,8 @@
 #pragma once
 #include "../__init__.h"
 
+extern void swap_to(enum languages new_lang);
+
 extern void (*tri_tap_actions[])(void);
 extern void (*tri_hold_actions[])(void);
 extern void (*double_tap_actions[])(void);

keyboards/beekeeb/piantor/keymaps/qkekos/magic_sturdy/general.c

@@ -4,17 +4,8 @@
 uint16_t magic_keycode_cast(uint16_t keycode, keyrecord_t *record);
 uint16_t magic_double_tap_cast(uint16_t keycode, keyrecord_t *record, uint16_t magic_key);
 
-bool is_training_mode_active = true;
-bool is_hard_mode_active = true;
-
-void enable_magic_training(void) { is_training_mode_active = true; }
-void enable_hard_training(void) { is_hard_mode_active = true; }
-
-void toggle_magic_training(void) { is_training_mode_active = !is_training_mode_active; }
-void toggle_hard_training(void) { is_hard_mode_active = !is_training_mode_active; }
-
 void sequence_transform_on_missed_rule_user(const st_trie_rule_t *rule) {
-    if (!is_training_mode_active) return;
+    
 }
 
 int sturdy_pr(uint16_t keycode, keyrecord_t *record) {

keyboards/beekeeb/piantor/keymaps/qkekos/magic_sturdy/general.h

@@ -3,9 +3,3 @@
 #include "../__init__.h"
 
 int sturdy_pr(uint16_t, keyrecord_t*);
-
-void enable_magic_training(void);
-void enable_hard_training(void);
-
-void toggle_magic_training(void);
-void toggle_hard_training(void);

keyboards/beekeeb/piantor/keymaps/qkekos/magic_sturdy/magic.txt

@@ -59,7 +59,9 @@ _theres       -> there's
 
 _isnt         -> isn't
 _youv         -> you've
+_mustv        -> must've
 _havent       -> haven't
+_mightv       -> might've
 
 // --------------------------------------A--------------------------------------
 
@@ -587,16 +589,17 @@ _hopel        -> hopefully
 
 // --------------------------------------I--------------------------------------
 
+_i@           -> I
 i@            -> ing
 i*            -> ion
 ion*          -> ional
 
-_i@s          -> instead
-_i@c          -> incapable
-
 _i@*          -> include
 _i@*g         -> including
 
+_i@c          -> incredible
+_i@cl         -> incredibly
+
 _i@t          -> interest
 _i@td         -> interested
 _i@tg         -> interesting
@@ -635,8 +638,8 @@ _i*m          -> inform
 _i*d          -> informed
 _i*t          -> information
 
-_i@           -> I
 _is*          -> issue
+_i@s          -> instead
 _imp@         -> impossible
 
 // --------------------------------------J--------------------------------------
@@ -707,8 +710,8 @@ m*@l          -> mentality
 _mu*          -> must
 _mu@          -> music
 
-_m*o         -> mention
-_m*l         -> menthol
+_m*o          -> mention
+_m*od         -> mentioned
 
 _mo*          -> most
 _mo*l         -> mostly
@@ -855,7 +858,7 @@ _deqn         -> dequeuing
 _enqg         -> enqueuing
 
 _q*           -> qmk
-_qol          -> qol
+_qo*          -> qol
 _qeq          -> queen
 _quinq        -> quintessential
 
@@ -929,7 +932,11 @@ _seaq@        -> seasonal
 _sc*          -> screen
 _sc*o         -> screenshot
 
+_sh@          -> should
+_shouldr      -> shoulder
+
 _s@*          -> soon
+_s@n          -> seen
 _s@e          -> system
 _s@o          -> symbol
 
@@ -980,12 +987,10 @@ _st@c*        -> statistics
 _st@ca        -> statistically
 
 _sq*          -> sql
-_sn@          -> seen
 _sk@          -> skill
 _sti@         -> still
 _ser@         -> server
 _sc@          -> school
-_sh@          -> should
 _si@r         -> singer
 _si@l         -> single
 _str@         -> string
@@ -1009,6 +1014,7 @@ _ta@g         -> taking
 _(life)?ti*   -> \1time
 _ti*p         -> timestamp
 
+_tjj          -> tj
 _tj           -> though
 _tj@          -> thought
 _trj          -> through
@@ -1066,11 +1072,13 @@ _ufq          -> unfortunate
 _ufqy         -> unfortunately
 
 _up*          -> update
-_ug*          -> upgrade
 _up*@         -> updated
-_ug*@         -> upgraded
 _up*l         -> updating
 
+_ug*          -> upgrade
+_ug*@         -> upgraded
+_ug*g         -> upgrading
+
 _unr@         -> unreal
 _unr@d        -> unrelated
 _unr@t        -> unrealistic
@@ -1165,12 +1173,11 @@ _z@           -> zone
 
 // ------------------------------------RT_PR------------------------------------
 
-_rt           -> pr
-_rtj          -> rt
-_rtx          -> rtx
-
 _rt@          -> pro
 
+_rt*          -> previous
+_rt*o         -> previously
+
 _rt@o         -> probably
 _rt@o*        -> probability
 

keyboards/beekeeb/piantor/keymaps/qkekos/tap_holds/general.c

@@ -83,6 +83,8 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
         case HR_SAVE:
         case HR_CPLN:
         case HR_SRCH:
+        case TH_LNAV:
+        case TH_FUNC:
             return true;
     }