di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'locking_caps'

Browse Source
This commit is contained in:
tmk 2013-03-12 10:49:59 +09:00
commit 28032ccea4
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/action.c
View File

@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command.h" #include "command.h"
#include "util.h" #include "util.h"
#include "debug.h" #include "debug.h"
#include "led.h"
#include "layer_switch.h" #include "layer_switch.h"
#include "action_macro.h" #include "action_macro.h"
#include "action.h" #include "action.h"
@ -889,6 +890,18 @@ void register_code(uint8_t code)
if (code == KC_NO) { if (code == KC_NO) {
return; 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) { else if IS_KEY(code) {
// TODO: should push command_proc out of this block? // TODO: should push command_proc out of this block?
if (command_proc(code)) return; if (command_proc(code)) return;
@ -914,7 +927,22 @@ void register_code(uint8_t code)
void unregister_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_del_key(code);
host_send_keyboard_report(); host_send_keyboard_report();
} }

1
common/keyboard.c
View File

@ -134,5 +134,6 @@ MATRIX_LOOP_END:
void keyboard_set_leds(uint8_t leds) void keyboard_set_leds(uint8_t leds)
{ {
if (debug_keyboard) { debug("keyboard_set_led: "); debug_hex8(leds); debug("\n"); }
led_set(leds); led_set(leds);
} }

1
common/keycode.h
View File

@ -81,6 +81,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KC_APP KC_APPLICATION #define KC_APP KC_APPLICATION
#define KC_NUHS KC_NONUS_HASH #define KC_NUHS KC_NONUS_HASH
#define KC_NUBS KC_NONUS_BSLASH #define KC_NUBS KC_NONUS_BSLASH
#define KC_LCAP KC_LOCKING_CAPS
#define KC_ERAS KC_ALT_ERASE, #define KC_ERAS KC_ALT_ERASE,
#define KC_CLR KC_CLEAR #define KC_CLR KC_CLEAR
/* Japanese specific */ /* Japanese specific */