diff options
| author | tmk <nobody@nowhere> | 2013-03-12 10:49:59 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-12 10:49:59 +0900 |
| commit | 738baccb8fdcb4fd7e4a2ae08fe92a63710be433 (patch) | |
| tree | d0d1a061fd8dd7e8ff07ce63f8493618c30f9031 /common | |
| parent | 8b9bd51d3a13959a4d59fdbc819a033cd8b0a3ce (diff) | |
| parent | 92b92dd78f5488981244d353f2d500ad9d82fc49 (diff) | |
| download | qmk_firmware-738baccb8fdcb4fd7e4a2ae08fe92a63710be433.tar.gz qmk_firmware-738baccb8fdcb4fd7e4a2ae08fe92a63710be433.zip | |
Merge branch 'locking_caps'
Diffstat (limited to 'common')
| -rw-r--r-- | common/action.c | 30 | ||||
| -rw-r--r-- | common/keyboard.c | 1 | ||||
| -rw-r--r-- | common/keycode.h | 1 |
3 files changed, 31 insertions, 1 deletions
diff --git a/common/action.c b/common/action.c index 15e125a3ec..4fafbfa79f 100644 --- a/common/action.c +++ b/common/action.c @@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "command.h" #include "util.h" #include "debug.h" +#include "led.h" #include "layer_switch.h" #include "action_macro.h" #include "action.h" @@ -889,6 +890,18 @@ void register_code(uint8_t code) if (code == KC_NO) { return; } +#ifdef CAPSLOCK_LOCKING_ENABLE + else if (KC_LOCKING_CAPS == code) { +#ifdef CAPSLOCK_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(); + } +#endif else if IS_KEY(code) { // TODO: should push command_proc out of this block? if (command_proc(code)) return; @@ -914,7 +927,22 @@ void register_code(uint8_t code) void unregister_code(uint8_t code) { - if IS_KEY(code) { + if (code == KC_NO) { + return; + } +#ifdef CAPSLOCK_LOCKING_ENABLE + else if (KC_LOCKING_CAPS == code) { +#ifdef CAPSLOCK_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(); + } +#endif + else if IS_KEY(code) { host_del_key(code); host_send_keyboard_report(); } diff --git a/common/keyboard.c b/common/keyboard.c index 401fdb4e17..42c57ac96f 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -134,5 +134,6 @@ MATRIX_LOOP_END: void keyboard_set_leds(uint8_t leds) { + if (debug_keyboard) { debug("keyboard_set_led: "); debug_hex8(leds); debug("\n"); } led_set(leds); } diff --git a/common/keycode.h b/common/keycode.h index 3646799948..aea630846b 100644 --- a/common/keycode.h +++ b/common/keycode.h @@ -81,6 +81,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define KC_APP KC_APPLICATION #define KC_NUHS KC_NONUS_HASH #define KC_NUBS KC_NONUS_BSLASH +#define KC_LCAP KC_LOCKING_CAPS #define KC_ERAS KC_ALT_ERASE, #define KC_CLR KC_CLEAR /* Japanese specific */ |