]> git.donarmstrong.com Git - tmk_firmware.git/blobdiff - common/action.c
Merge branch 'rn42' into merge_rn42
[tmk_firmware.git] / common / action.c
index 07a3a64d6cd1d2afcad8a8f7e398f329c59391bd..ec8eeae7bc8b7bfb6f8e372ce9acc097b4351948 100644 (file)
@@ -19,20 +19,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboard.h"
 #include "mousekey.h"
 #include "command.h"
-#include "debug.h"
 #include "led.h"
-#include "layer_switch.h"
+#include "backlight.h"
+#include "action_layer.h"
 #include "action_tapping.h"
-#include "action_oneshot.h"
 #include "action_macro.h"
+#include "action_util.h"
 #include "action.h"
 
+#ifdef DEBUG_ACTION
+#include "debug.h"
+#else
+#include "nodebug.h"
+#endif
+
 
 void action_exec(keyevent_t event)
 {
     if (!IS_NOEVENT(event)) {
-        debug("\n---- action_exec: start -----\n");
-        debug("EVENT: "); debug_event(event); debug("\n");
+        dprint("\n---- action_exec: start -----\n");
+        dprint("EVENT: "); debug_event(event); dprintln();
     }
 
     keyrecord_t record = { .event = event };
@@ -42,7 +48,7 @@ void action_exec(keyevent_t event)
 #else
     process_action(&record);
     if (!IS_NOEVENT(record.event)) {
-        debug("processed: "); debug_record(record); debug("\n");
+        dprint("processed: "); debug_record(record); dprintln();
     }
 #endif
 }
@@ -50,15 +56,19 @@ void action_exec(keyevent_t event)
 void process_action(keyrecord_t *record)
 {
     keyevent_t event = record->event;
+#ifndef NO_ACTION_TAPPING
     uint8_t tap_count = record->tap.count;
+#endif
 
     if (IS_NOEVENT(event)) { return; }
 
     action_t action = layer_switch_get_action(event.key);
-    debug("ACTION: "); debug_action(action);
-    debug(" overlays: "); overlay_debug();
-    debug(" keymaps: "); keymap_debug();
-    debug(" default_layer: "); debug_dec(default_layer); debug("\n");
+    dprint("ACTION: "); debug_action(action);
+#ifndef NO_ACTION_LAYER
+    dprint(" layer_state: "); layer_debug();
+    dprint(" default_layer_state: "); default_layer_debug();
+#endif
+    dprintln();
 
     switch (action.kind.id) {
         /* Key and Mods */
@@ -68,22 +78,17 @@ void process_action(keyrecord_t *record)
                 uint8_t mods = (action.kind.id == ACT_LMODS) ?  action.key.mods :
                                                                 action.key.mods<<4;
                 if (event.pressed) {
-                    uint8_t tmp_mods = host_get_mods();
                     if (mods) {
-                        host_add_mods(mods);
-                        host_send_keyboard_report();
+                        add_weak_mods(mods);
+                        send_keyboard_report();
                     }
                     register_code(action.key.code);
-                    if (mods && action.key.code) {
-                        host_set_mods(tmp_mods);
-                        host_send_keyboard_report();
-                    }
                 } else {
-                    if (mods && !action.key.code) {
-                        host_del_mods(mods);
-                        host_send_keyboard_report();
-                    }
                     unregister_code(action.key.code);
+                    if (mods) {
+                        del_weak_mods(mods);
+                        send_keyboard_report();
+                    }
                 }
             }
             break;
@@ -93,72 +98,70 @@ void process_action(keyrecord_t *record)
             {
                 uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ?  action.key.mods :
                                                                     action.key.mods<<4;
-                switch (action.layer.code) {
+                switch (action.layer_tap.code) {
     #ifndef NO_ACTION_ONESHOT
-                    case 0x00:
+                    case MODS_ONESHOT:
                         // Oneshot modifier
                         if (event.pressed) {
                             if (tap_count == 0) {
-                                debug("MODS_TAP: Oneshot: add_mods\n");
-                                add_mods(mods);
+                                register_mods(mods);
                             }
                             else if (tap_count == 1) {
-                                debug("MODS_TAP: Oneshot: start\n");
-                                oneshot_start(mods);
-                            }
-                            else if (tap_count == TAPPING_TOGGLE) {
-                                debug("MODS_TAP: Oneshot: toggle\n");
-                                oneshot_toggle();
+                                dprint("MODS_TAP: Oneshot: start\n");
+                                set_oneshot_mods(mods);
                             }
                             else {
-                                debug("MODS_TAP: Oneshot: cancel&add_mods\n");
-                                // double tap cancels oneshot and works as normal modifier.
-                                oneshot_cancel();
-                                add_mods(mods);
+                                register_mods(mods);
                             }
                         } else {
                             if (tap_count == 0) {
-                                debug("MODS_TAP: Oneshot: cancel/del_mods\n");
-                                // cancel oneshot on hold
-                                oneshot_cancel();
-                                del_mods(mods);
+                                clear_oneshot_mods();
+                                unregister_mods(mods);
                             }
                             else if (tap_count == 1) {
-                                debug("MODS_TAP: Oneshot: del_mods\n");
-                                // retain Oneshot
-                                del_mods(mods);
+                                // Retain Oneshot mods
                             }
                             else {
-                                debug("MODS_TAP: Oneshot: del_mods\n");
-                                // cancel Mods
-                                del_mods(mods);
+                                clear_oneshot_mods();
+                                unregister_mods(mods);
                             }
                         }
                         break;
     #endif
+                    case MODS_TAP_TOGGLE:
+                        if (event.pressed) {
+                            if (tap_count <= TAPPING_TOGGLE) {
+                                register_mods(mods);
+                            }
+                        } else {
+                            if (tap_count < TAPPING_TOGGLE) {
+                                unregister_mods(mods);
+                            }
+                        }
+                        break;
                     default:
                         if (event.pressed) {
                             if (tap_count > 0) {
                                 if (record->tap.interrupted) {
-                                    debug("MODS_TAP: Tap: Cancel: add_mods\n");
+                                    dprint("MODS_TAP: Tap: Cancel: add_mods\n");
                                     // ad hoc: set 0 to cancel tap
                                     record->tap.count = 0;
-                                    add_mods(mods);
+                                    register_mods(mods);
                                 } else {
-                                    debug("MODS_TAP: Tap: register_code\n");
+                                    dprint("MODS_TAP: Tap: register_code\n");
                                     register_code(action.key.code);
                                 }
                             } else {
-                                debug("MODS_TAP: No tap: add_mods\n");
-                                add_mods(mods);
+                                dprint("MODS_TAP: No tap: add_mods\n");
+                                register_mods(mods);
                             }
                         } else {
                             if (tap_count > 0) {
-                                debug("MODS_TAP: Tap: unregister_code\n");
+                                dprint("MODS_TAP: Tap: unregister_code\n");
                                 unregister_code(action.key.code);
                             } else {
-                                debug("MODS_TAP: No tap: add_mods\n");
-                                del_mods(mods);
+                                dprint("MODS_TAP: No tap: add_mods\n");
+                                unregister_mods(mods);
                             }
                         }
                         break;
@@ -199,329 +202,127 @@ void process_action(keyrecord_t *record)
             }
             break;
 #endif
-#ifndef NO_ACTION_KEYMAP
-        case ACT_KEYMAP:
-            switch (action.layer.code) {
-                /* Keymap clear */
-                case OP_RESET:
-                    switch (action.layer.val & 0x03) {
-                        case 0:
-                            // NOTE: reserved
-                            overlay_clear();
-                            keymap_clear();
-                            break;
-                        case ON_PRESS:
-                            if (event.pressed) {
-                                overlay_clear();
-                                keymap_clear();
-                            }
-                            break;
-                        case ON_RELEASE:
-                            if (!event.pressed) {
-                                overlay_clear();
-                                keymap_clear();
-                            }
-                            break;
-                        case ON_BOTH:
-                            overlay_clear();
-                            keymap_clear();
-                            break;
-                        /* NOTE: 4-7 rserved */
+#ifndef NO_ACTION_LAYER
+        case ACT_LAYER:
+            if (action.layer_bitop.on == 0) {
+                /* Default Layer Bitwise Operation */
+                if (!event.pressed) {
+                    uint8_t shift = action.layer_bitop.part*4;
+                    uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift;
+                    uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0;
+                    switch (action.layer_bitop.op) {
+                        case OP_BIT_AND: default_layer_and(bits | mask); break;
+                        case OP_BIT_OR:  default_layer_or(bits | mask);  break;
+                        case OP_BIT_XOR: default_layer_xor(bits | mask); break;
+                        case OP_BIT_SET: default_layer_and(mask); default_layer_or(bits); break;
                     }
-                    break;
-                /* Keymap Reset default layer */
-                case (OP_RESET | ON_PRESS):
-                    if (event.pressed) {
-                        default_layer_set(action.layer.val);
-                    }
-                    break;
-                case (OP_RESET | ON_RELEASE):
-                    if (!event.pressed) {
-                        default_layer_set(action.layer.val);
-                    }
-                    break;
-                case (OP_RESET | ON_BOTH):
-                    default_layer_set(action.layer.val);
-                    break;
-
-                /* Keymap Bit invert */
-                case OP_INV:
-                    /* with tap toggle */
-                    if (event.pressed) {
-                        if (tap_count < TAPPING_TOGGLE) {
-                            debug("KEYMAP_INV: tap toggle(press).\n");
-                            keymap_invert(action.layer.val);
-                        }
-                    } else {
-                        if (tap_count <= TAPPING_TOGGLE) {
-                            debug("KEYMAP_INV: tap toggle(release).\n");
-                            keymap_invert(action.layer.val);
-                        }
-                    }
-                    break;
-                case (OP_INV | ON_PRESS):
-                    if (event.pressed) {
-                        keymap_invert(action.layer.val);
-                    }
-                    break;
-                case (OP_INV | ON_RELEASE):
-                    if (!event.pressed) {
-                        keymap_invert(action.layer.val);
-                    }
-                    break;
-                case (OP_INV | ON_BOTH):
-                    keymap_invert(action.layer.val);
-                    break;
-
-                /* Keymap Bit on */
-                case OP_ON:
-                    if (event.pressed) {
-                        keymap_on(action.layer.val);
-                    } else {
-                        keymap_off(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_PRESS):
-                    if (event.pressed) {
-                        keymap_on(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_RELEASE):
-                    if (!event.pressed) {
-                        keymap_on(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_BOTH):
-                    keymap_on(action.layer.val);
-                    break;
-
-                /* Keymap Bit off */
-                case OP_OFF:
-                    if (event.pressed) {
-                        keymap_off(action.layer.val);
-                    } else {
-                        keymap_on(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_PRESS):
-                    if (event.pressed) {
-                        keymap_off(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_RELEASE):
-                    if (!event.pressed) {
-                        keymap_off(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_BOTH):
-                    keymap_off(action.layer.val);
-                    break;
-
-                /* Keymap Bit set */
-                case OP_SET:
-                    if (event.pressed) {
-                        keymap_set(action.layer.val);
-                    } else {
-                        keymap_clear();
-                    }
-                    break;
-                case (OP_SET | ON_PRESS):
-                    if (event.pressed) {
-                        keymap_set(action.layer.val);
-                    }
-                    break;
-                case (OP_SET | ON_RELEASE):
-                    if (!event.pressed) {
-                        keymap_set(action.layer.val);
-                    }
-                    break;
-                case (OP_SET | ON_BOTH):
-                    keymap_set(action.layer.val);
-                    break;
-
-                /* Keymap Bit invert with tap key */
-                default:
-                    if (event.pressed) {
-                        if (tap_count > 0) {
-                            debug("KEYMAP_TAP_KEY: Tap: register_code\n");
-                            register_code(action.layer.code);
-                        } else {
-                            debug("KEYMAP_TAP_KEY: No tap: On on press\n");
-                            keymap_on(action.layer.val);
-                        }
-                    } else {
-                        if (tap_count > 0) {
-                            debug("KEYMAP_TAP_KEY: Tap: unregister_code\n");
-                            unregister_code(action.layer.code);
-                        } else {
-                            debug("KEYMAP_TAP_KEY: No tap: Off on release\n");
-                            keymap_off(action.layer.val);
-                        }
+                }
+            } else {
+                /* Layer Bitwise Operation */
+                if (event.pressed ? (action.layer_bitop.on & ON_PRESS) :
+                                    (action.layer_bitop.on & ON_RELEASE)) {
+                    uint8_t shift = action.layer_bitop.part*4;
+                    uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift;
+                    uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0;
+                    switch (action.layer_bitop.op) {
+                        case OP_BIT_AND: layer_and(bits | mask); break;
+                        case OP_BIT_OR:  layer_or(bits | mask);  break;
+                        case OP_BIT_XOR: layer_xor(bits | mask); break;
+                        case OP_BIT_SET: layer_and(mask); layer_or(bits); break;
                     }
-                    break;
+                }
             }
             break;
-#endif
-#ifndef NO_ACTION_OVERLAY
-        case ACT_OVERLAY:
-            switch (action.layer.code) {
-                // Overlay Invert bit4
-                case OP_INV4 | 0:
-                    if (action.layer.val == 0) {
-                        // NOTE: reserved for future use
-                        overlay_clear();
-                    } else {
-                        overlay_set(overlay_stat ^ action.layer.val);
-                    }
-                    break;
-                case OP_INV4 | 1:
-                    if (action.layer.val == 0) {
-                        // on pressed
-                        if (event.pressed) overlay_clear();
-                    } else {
-                        overlay_set(overlay_stat ^ action.layer.val<<4);
-                    }
-                    break;
-                case OP_INV4 | 2:
-                    if (action.layer.val == 0) {
-                        // on released
-                        if (!event.pressed) overlay_clear();
-                    } else {
-                        overlay_set(overlay_stat ^ action.layer.val<<8);
-                    }
-                    break;
-                case OP_INV4 | 3:
-                    if (action.layer.val == 0) {
-                        // on both
-                        overlay_clear();
+    #ifndef NO_ACTION_TAPPING
+        case ACT_LAYER_TAP:
+        case ACT_LAYER_TAP_EXT:
+            switch (action.layer_tap.code) {
+                case 0xe0 ... 0xef:
+                    /* layer On/Off with modifiers(left only) */
+                    if (event.pressed) {
+                        layer_on(action.layer_tap.val);
+                        register_mods(action.layer_tap.code & 0x0f);
                     } else {
-                        overlay_set(overlay_stat ^ action.layer.val<<12);
+                        layer_off(action.layer_tap.val);
+                        unregister_mods(action.layer_tap.code & 0x0f);
                     }
                     break;
-
-                /* Overlay Bit invert */
-                case OP_INV:
-                    /* with tap toggle */
+                case OP_TAP_TOGGLE:
+                    /* tap toggle */
                     if (event.pressed) {
                         if (tap_count < TAPPING_TOGGLE) {
-                            debug("OVERLAY_INV: tap toggle(press).\n");
-                            overlay_invert(action.layer.val);
+                            layer_invert(action.layer_tap.val);
                         }
                     } else {
                         if (tap_count <= TAPPING_TOGGLE) {
-                            debug("OVERLAY_INV: tap toggle(release).\n");
-                            overlay_invert(action.layer.val);
+                            layer_invert(action.layer_tap.val);
                         }
                     }
                     break;
-                case (OP_INV | ON_PRESS):
-                    if (event.pressed) {
-                        overlay_invert(action.layer.val);
-                    }
+                case OP_ON_OFF:
+                    event.pressed ? layer_on(action.layer_tap.val) :
+                                    layer_off(action.layer_tap.val);
                     break;
-                case (OP_INV | ON_RELEASE):
-                    if (!event.pressed) {
-                        overlay_invert(action.layer.val);
-                    }
+                case OP_OFF_ON:
+                    event.pressed ? layer_off(action.layer_tap.val) :
+                                    layer_on(action.layer_tap.val);
                     break;
-                case (OP_INV | ON_BOTH):
-                    overlay_invert(action.layer.val);
+                case OP_SET_CLEAR:
+                    event.pressed ? layer_move(action.layer_tap.val) :
+                                    layer_clear();
                     break;
-
-                /* Overlay Bit on */
-                case OP_ON:
-                    if (event.pressed) {
-                        overlay_on(action.layer.val);
-                    } else {
-                        overlay_off(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_PRESS):
-                    if (event.pressed) {
-                        overlay_on(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_RELEASE):
-                    if (!event.pressed) {
-                        overlay_on(action.layer.val);
-                    }
-                    break;
-                case (OP_ON | ON_BOTH):
-                    overlay_on(action.layer.val);
-                    break;
-
-                /* Overlay Bit off */
-                case OP_OFF:
-                    if (event.pressed) {
-                        overlay_off(action.layer.val);
-                    } else {
-                        overlay_on(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_PRESS):
-                    if (event.pressed) {
-                        overlay_off(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_RELEASE):
-                    if (!event.pressed) {
-                        overlay_off(action.layer.val);
-                    }
-                    break;
-                case (OP_OFF | ON_BOTH):
-                    overlay_off(action.layer.val);
-                    break;
-
-                /* Overlay Bit set */
-                case OP_SET:
-                    if (event.pressed) {
-                        overlay_move(action.layer.val);
-                    } else {
-                        overlay_clear();
-                    }
-                    break;
-                case (OP_SET | ON_PRESS):
-                    if (event.pressed) {
-                        overlay_move(action.layer.val);
-                    }
-                    break;
-                case (OP_SET | ON_RELEASE):
-                    if (!event.pressed) {
-                        overlay_move(action.layer.val);
-                    }
-                    break;
-                case (OP_SET | ON_BOTH):
-                    overlay_move(action.layer.val);
-                    break;
-
-                /* Overlay Bit invert with tap key */
                 default:
+                    /* tap key */
                     if (event.pressed) {
                         if (tap_count > 0) {
-                            debug("OVERLAY_TAP_KEY: Tap: register_code\n");
-                            register_code(action.layer.code);
+                            dprint("KEYMAP_TAP_KEY: Tap: register_code\n");
+                            register_code(action.layer_tap.code);
                         } else {
-                            debug("OVERLAY_TAP_KEY: No tap: On on press\n");
-                            overlay_on(action.layer.val);
+                            dprint("KEYMAP_TAP_KEY: No tap: On on press\n");
+                            layer_on(action.layer_tap.val);
                         }
                     } else {
                         if (tap_count > 0) {
-                            debug("OVERLAY_TAP_KEY: Tap: unregister_code\n");
-                            unregister_code(action.layer.code);
+                            dprint("KEYMAP_TAP_KEY: Tap: unregister_code\n");
+                            unregister_code(action.layer_tap.code);
                         } else {
-                            debug("OVERLAY_TAP_KEY: No tap: Off on release\n");
-                            overlay_off(action.layer.val);
+                            dprint("KEYMAP_TAP_KEY: No tap: Off on release\n");
+                            layer_off(action.layer_tap.val);
                         }
                     }
                     break;
             }
             break;
+    #endif
 #endif
         /* Extentions */
 #ifndef NO_ACTION_MACRO
         case ACT_MACRO:
             action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
             break;
+#endif
+#ifdef BACKLIGHT_ENABLE
+        case ACT_BACKLIGHT:
+            if (!event.pressed) {
+                switch (action.backlight.opt) {
+                    case BACKLIGHT_INCREASE:
+                        backlight_increase();
+                        break;
+                    case BACKLIGHT_DECREASE:
+                        backlight_decrease();
+                        break;
+                    case BACKLIGHT_TOGGLE:
+                        backlight_toggle();
+                        break;
+                    case BACKLIGHT_STEP:
+                        backlight_step();
+                        break;
+                    case BACKLIGHT_LEVEL:
+                        backlight_level(action.backlight.level);
+                        break;
+                }
+            }
+            break;
 #endif
         case ACT_COMMAND:
             break;
@@ -546,42 +347,73 @@ void register_code(uint8_t code)
     if (code == KC_NO) {
         return;
     }
-#ifdef CAPSLOCK_LOCKING_ENABLE
+
+#ifdef LOCKING_SUPPORT_ENABLE
     else if (KC_LOCKING_CAPS == code) {
-#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE
+#ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is on
         if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) return;
 #endif
-        host_add_key(KC_CAPSLOCK);
-        host_send_keyboard_report();
-        host_del_key(KC_CAPSLOCK);
-        host_send_keyboard_report();
+        add_key(KC_CAPSLOCK);
+        send_keyboard_report();
+        del_key(KC_CAPSLOCK);
+        send_keyboard_report();
+    }
+
+    else if (KC_LOCKING_NUM == code) {
+#ifdef LOCKING_RESYNC_ENABLE
+        if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) return;
+#endif
+        add_key(KC_NUMLOCK);
+        send_keyboard_report();
+        del_key(KC_NUMLOCK);
+        send_keyboard_report();
+    }
+
+    else if (KC_LOCKING_SCROLL == code) {
+#ifdef LOCKING_RESYNC_ENABLE
+        if (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) return;
+#endif
+        add_key(KC_SCROLLLOCK);
+        send_keyboard_report();
+        del_key(KC_SCROLLLOCK);
+        send_keyboard_report();
     }
 #endif
+
     else if IS_KEY(code) {
         // TODO: should push command_proc out of this block?
         if (command_proc(code)) return;
 
 #ifndef NO_ACTION_ONESHOT
+/* TODO: remove
         if (oneshot_state.mods && !oneshot_state.disabled) {
-            uint8_t tmp_mods = host_get_mods();
-            host_add_mods(oneshot_state.mods);
+            uint8_t tmp_mods = get_mods();
+            add_mods(oneshot_state.mods);
 
-            host_add_key(code);
-            host_send_keyboard_report();
+            add_key(code);
+            send_keyboard_report();
 
-            host_set_mods(tmp_mods);
+            set_mods(tmp_mods);
+            send_keyboard_report();
             oneshot_cancel();
         } else 
+*/
 #endif
         {
-            host_add_key(code);
-            host_send_keyboard_report();
+            add_key(code);
+            send_keyboard_report();
         }
     }
     else if IS_MOD(code) {
-        host_add_mods(MOD_BIT(code));
-        host_send_keyboard_report();
+        add_mods(MOD_BIT(code));
+        send_keyboard_report();
+    }
+    else if IS_SYSTEM(code) {
+        host_system_send(KEYCODE2SYSTEM(code));
+    }
+    else if IS_CONSUMER(code) {
+        host_consumer_send(KEYCODE2CONSUMER(code));
     }
 }
 
@@ -590,60 +422,83 @@ void unregister_code(uint8_t code)
     if (code == KC_NO) {
         return;
     }
-#ifdef CAPSLOCK_LOCKING_ENABLE
+
+#ifdef LOCKING_SUPPORT_ENABLE
     else if (KC_LOCKING_CAPS == code) {
-#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE
+#ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is off
         if (!(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) return;
 #endif
-        host_add_key(KC_CAPSLOCK);
-        host_send_keyboard_report();
-        host_del_key(KC_CAPSLOCK);
-        host_send_keyboard_report();
+        add_key(KC_CAPSLOCK);
+        send_keyboard_report();
+        del_key(KC_CAPSLOCK);
+        send_keyboard_report();
+    }
+
+    else if (KC_LOCKING_NUM == code) {
+#ifdef LOCKING_RESYNC_ENABLE
+        if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) return;
+#endif
+        add_key(KC_NUMLOCK);
+        send_keyboard_report();
+        del_key(KC_NUMLOCK);
+        send_keyboard_report();
+    }
+
+    else if (KC_LOCKING_SCROLL == code) {
+#ifdef LOCKING_RESYNC_ENABLE
+        if (!(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK))) return;
+#endif
+        add_key(KC_SCROLLLOCK);
+        send_keyboard_report();
+        del_key(KC_SCROLLLOCK);
+        send_keyboard_report();
     }
 #endif
+
     else if IS_KEY(code) {
-        host_del_key(code);
-        host_send_keyboard_report();
+        del_key(code);
+        send_keyboard_report();
     }
     else if IS_MOD(code) {
-        host_del_mods(MOD_BIT(code));
-        host_send_keyboard_report();
+        del_mods(MOD_BIT(code));
+        send_keyboard_report();
+    }
+    else if IS_SYSTEM(code) {
+        host_system_send(0);
+    }
+    else if IS_CONSUMER(code) {
+        host_consumer_send(0);
     }
 }
 
-void add_mods(uint8_t mods)
+void register_mods(uint8_t mods)
 {
     if (mods) {
-        host_add_mods(mods);
-        host_send_keyboard_report();
+        add_mods(mods);
+        send_keyboard_report();
     }
 }
 
-void del_mods(uint8_t mods)
+void unregister_mods(uint8_t mods)
 {
     if (mods) {
-        host_del_mods(mods);
-        host_send_keyboard_report();
+        del_mods(mods);
+        send_keyboard_report();
     }
 }
 
-void set_mods(uint8_t mods)
-{
-    host_set_mods(mods);
-    host_send_keyboard_report();
-}
-
 void clear_keyboard(void)
 {
-    host_clear_mods();
+    clear_mods();
     clear_keyboard_but_mods();
 }
 
 void clear_keyboard_but_mods(void)
 {
-    host_clear_keys();
-    host_send_keyboard_report();
+    clear_weak_mods();
+    clear_keys();
+    send_keyboard_report();
 #ifdef MOUSEKEY_ENABLE
     mousekey_clear();
     mousekey_send();
@@ -654,29 +509,16 @@ void clear_keyboard_but_mods(void)
 #endif
 }
 
-bool sending_anykey(void)
-{
-    return (host_has_anykey() || host_mouse_in_use() ||
-            host_last_sysytem_report() || host_last_consumer_report());
-}
-
-bool is_tap_key(key_t key)
+bool is_tap_key(keypos_t key)
 {
     action_t action = layer_switch_get_action(key);
 
     switch (action.kind.id) {
         case ACT_LMODS_TAP:
         case ACT_RMODS_TAP:
+        case ACT_LAYER_TAP:
+        case ACT_LAYER_TAP_EXT:
             return true;
-        case ACT_KEYMAP:
-        case ACT_OVERLAY:
-            switch (action.layer.code) {
-                case 0x04 ... 0xEF:    /* tap key */
-                case OP_INV:
-                    return true;
-                default:
-                    return false;
-            }
         case ACT_MACRO:
         case ACT_FUNCTION:
             if (action.func.opt & FUNC_TAP) { return true; }
@@ -691,39 +533,33 @@ bool is_tap_key(key_t key)
  */
 void debug_event(keyevent_t event)
 {
-    debug_hex16((event.key.row<<8) | event.key.col);
-    if (event.pressed) debug("d("); else debug("u(");
-    debug_dec(event.time); debug(")");
+    dprintf("%04X%c(%u)", (event.key.row<<8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time);
 }
 
 void debug_record(keyrecord_t record)
 {
     debug_event(record.event);
 #ifndef NO_ACTION_TAPPING
-    debug(":"); debug_dec(record.tap.count);
-    if (record.tap.interrupted) debug("-");
+    dprintf(":%u%c", record.tap.count, (record.tap.interrupted ? '-' : ' '));
 #endif
 }
 
 void debug_action(action_t action)
 {
     switch (action.kind.id) {
-        case ACT_LMODS:             debug("ACT_LMODS");             break;
-        case ACT_RMODS:             debug("ACT_RMODS");             break;
-        case ACT_LMODS_TAP:         debug("ACT_LMODS_TAP");         break;
-        case ACT_RMODS_TAP:         debug("ACT_RMODS_TAP");         break;
-        case ACT_USAGE:             debug("ACT_USAGE");             break;
-        case ACT_MOUSEKEY:          debug("ACT_MOUSEKEY");          break;
-        case ACT_KEYMAP:            debug("ACT_KEYMAP");            break;
-        case ACT_OVERLAY:           debug("ACT_OVERLAY");           break;
-        case ACT_MACRO:             debug("ACT_MACRO");             break;
-        case ACT_COMMAND:           debug("ACT_COMMAND");           break;
-        case ACT_FUNCTION:          debug("ACT_FUNCTION");          break;
-        default:                    debug("UNKNOWN");               break;
+        case ACT_LMODS:             dprint("ACT_LMODS");             break;
+        case ACT_RMODS:             dprint("ACT_RMODS");             break;
+        case ACT_LMODS_TAP:         dprint("ACT_LMODS_TAP");         break;
+        case ACT_RMODS_TAP:         dprint("ACT_RMODS_TAP");         break;
+        case ACT_USAGE:             dprint("ACT_USAGE");             break;
+        case ACT_MOUSEKEY:          dprint("ACT_MOUSEKEY");          break;
+        case ACT_LAYER:             dprint("ACT_LAYER");             break;
+        case ACT_LAYER_TAP:         dprint("ACT_LAYER_TAP");         break;
+        case ACT_LAYER_TAP_EXT:     dprint("ACT_LAYER_TAP_EXT");     break;
+        case ACT_MACRO:             dprint("ACT_MACRO");             break;
+        case ACT_COMMAND:           dprint("ACT_COMMAND");           break;
+        case ACT_FUNCTION:          dprint("ACT_FUNCTION");          break;
+        default:                    dprint("UNKNOWN");               break;
     }
-    debug("[");
-    debug_hex4(action.kind.param>>8);
-    debug(":");
-    debug_hex8(action.kind.param & 0xff);
-    debug("]");
+    dprintf("[%X:%02X]", action.kind.param>>8, action.kind.param&0xff);
 }