di0ib
/
tmk_keyboard_custom
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Add NO_ACTION_ONESHOT config option

led_matrix
tmk 11 years ago
parent
9a3edb897a
commit
d44290b91b
4 changed files with 82 additions and 42 deletions
Unified View Show Diff Stats
  1. 1
    0
      common.mk
  2. 8
    42
      common/action.c
  3. 21
    0
      common/action_oneshot.c
  4. 52
    0
      common/action_oneshot.h

+ 1
- 0
common.mk View File

SRC += $(COMMON_DIR)/host.c \ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/keyboard.c \ $(COMMON_DIR)/keyboard.c \
$(COMMON_DIR)/action.c \ $(COMMON_DIR)/action.c \
$(COMMON_DIR)/action_oneshot.c \
$(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/action_macro.c \
$(COMMON_DIR)/layer_switch.c \ $(COMMON_DIR)/layer_switch.c \
$(COMMON_DIR)/keymap.c \ $(COMMON_DIR)/keymap.c \

+ 8
- 42
common/action.c View File

#include "debug.h" #include "debug.h"
#include "led.h" #include "led.h"
#include "layer_switch.h" #include "layer_switch.h"
#include "action_oneshot.h"
#include "action_macro.h" #include "action_macro.h"
#include "action.h" #include "action.h"


} }
return false; return false;
} }


/* Oneshot modifier
*
* Problem: Want to capitalize like 'The' but the result tends to be 'THe'.
* Solution: Oneshot modifier have its effect on only one key coming next.
* Tap Shift, then type 't', 'h' and 'e'. Not need to hold Shift key.
*
* Hold: works as normal modifier.
* Tap: one shot modifier.
* 2 Tap: cancel one shot modifier.
* 5-Tap: toggles enable/disable oneshot feature.
*/
static struct {
uint8_t mods;
uint8_t time;
bool ready;
bool disabled;
} oneshot_state;

static void oneshot_start(uint8_t mods, uint16_t time)
{
oneshot_state.mods = mods;
oneshot_state.time = time;
oneshot_state.ready = true;
}

static void oneshot_cancel(void)
{
oneshot_state.mods = 0;
oneshot_state.time = 0;
oneshot_state.ready = false;
}

static void oneshot_toggle(void)
{
oneshot_state.disabled = !oneshot_state.disabled;
}
#endif #endif




uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ? action.key.mods : uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ? action.key.mods :
action.key.mods<<4; action.key.mods<<4;
switch (action.layer.code) { switch (action.layer.code) {
#ifndef NO_ACTION_ONESHOT
case 0x00: case 0x00:
// Oneshot modifier // Oneshot modifier
if (event.pressed) { if (event.pressed) {
} }
else if (tap_count == 1) { else if (tap_count == 1) {
debug("MODS_TAP: Oneshot: start\n"); debug("MODS_TAP: Oneshot: start\n");
oneshot_start(mods, event.time);
oneshot_start(mods);
} }
else if (tap_count == TAPPING_TOGGLE) { else if (tap_count == TAPPING_TOGGLE) {
debug("MODS_TAP: Oneshot: toggle\n"); debug("MODS_TAP: Oneshot: toggle\n");
} }
} }
break; break;
#endif
default: default:
if (event.pressed) { if (event.pressed) {
if (tap_count > 0) { if (tap_count > 0) {
// 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;


#ifndef NO_ACTION_TAPPING
if (oneshot_state.mods && oneshot_state.ready && !oneshot_state.disabled) {
#ifndef NO_ACTION_ONESHOT
if (oneshot_state.mods && !oneshot_state.disabled) {
uint8_t tmp_mods = host_get_mods(); uint8_t tmp_mods = host_get_mods();
host_add_mods(oneshot_state.mods); host_add_mods(oneshot_state.mods);

host_add_key(code); host_add_key(code);
host_send_keyboard_report(); host_send_keyboard_report();


host_set_mods(tmp_mods); host_set_mods(tmp_mods);
oneshot_state.ready = false;
oneshot_cancel();
} else } else
#endif #endif
{ {

+ 21
- 0
common/action_oneshot.c View File

#include "action_oneshot.h"


#ifndef NO_ACTION_ONESHOT
oneshot_state_t oneshot_state;

void oneshot_start(uint8_t mods)
{
oneshot_state.mods = mods;
}

void oneshot_cancel(void)
{
oneshot_state.mods = 0;
}

void oneshot_toggle(void)
{
oneshot_state.disabled = !oneshot_state.disabled;
}
#endif

+ 52
- 0
common/action_oneshot.h View File

/*
Copyright 2013 Jun Wako <[email protected]>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_ONESHOT_H
#define ACTION_ONESHOT_H

#include <stdint.h>
#include <stdbool.h>

#ifdef NO_ACTION_TAPPING
#define NO_ACTION_ONESHOT
#endif

#ifndef NO_ACTION_ONESHOT
/* Oneshot modifier
*
* Problem: Want to capitalize like 'The' but the result tends to be 'THe'.
* Solution: Oneshot modifier have its effect on only one key coming next.
* Tap Shift, then type 't', 'h' and 'e'. Not need to hold Shift key.
*
* Hold: works as normal modifier.
* Tap: one shot modifier.
* 2 Tap: cancel one shot modifier.
* 5-Tap: toggles enable/disable oneshot feature.
*/
typedef struct {
uint8_t mods;
bool disabled;
} oneshot_state_t;


oneshot_state_t oneshot_state;

void oneshot_start(uint8_t mods);
void oneshot_cancel(void);
void oneshot_toggle(void);
#endif

#endif