Fix mod stuck of MODS_KEY when leaving layer #62
- Add action_util.c and remove action_oneshot.c - Add oneshot_mods for MODS_ONESHOT - Add weak_mods for MODS_KEY and MACRO - weak_mods is cleared when layer switchingexample_keyboards
tmk
11 years ago
parent
cb434cfebc
commit
d52d554360
@ -1,21 +0,0 @@
|
|||||||
#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
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2013 Jun Wako <wakojun@gmail.com>
|
|
||||||
|
|
||||||
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
|
|
||||||
@ -0,0 +1,192 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2013 Jun Wako <wakojun@gmail.com>
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
#include "host.h"
|
||||||
|
#include "report.h"
|
||||||
|
#include "debug.h"
|
||||||
|
#include "action_util.h"
|
||||||
|
|
||||||
|
static inline void add_key_byte(uint8_t code);
|
||||||
|
static inline void del_key_byte(uint8_t code);
|
||||||
|
#ifdef NKRO_ENABLE
|
||||||
|
static inline void add_key_bit(uint8_t code);
|
||||||
|
static inline void del_key_bit(uint8_t code);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static uint8_t real_mods = 0;
|
||||||
|
static uint8_t weak_mods = 0;
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: pointer variable is not needed
|
||||||
|
//report_keyboard_t keyboard_report = {};
|
||||||
|
report_keyboard_t *keyboard_report = &(report_keyboard_t){};
|
||||||
|
|
||||||
|
#ifndef NO_ACTION_ONESHOT
|
||||||
|
static bool oneshot_enabled = true;
|
||||||
|
static int8_t oneshot_mods = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void send_keyboard_report(void) {
|
||||||
|
keyboard_report->mods = real_mods;
|
||||||
|
keyboard_report->mods |= weak_mods;
|
||||||
|
#ifndef NO_ACTION_ONESHOT
|
||||||
|
keyboard_report->mods |= oneshot_mods;
|
||||||
|
if (has_anykey()) {
|
||||||
|
clear_oneshot_mods();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
host_keyboard_send(keyboard_report);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* key */
|
||||||
|
void add_key(uint8_t key)
|
||||||
|
{
|
||||||
|
#ifdef NKRO_ENABLE
|
||||||
|
if (keyboard_nkro) {
|
||||||
|
add_key_bit(key);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
add_key_byte(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
void del_key(uint8_t key)
|
||||||
|
{
|
||||||
|
#ifdef NKRO_ENABLE
|
||||||
|
if (keyboard_nkro) {
|
||||||
|
del_key_bit(key);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
del_key_byte(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
void clear_keys(void)
|
||||||
|
{
|
||||||
|
// not clear mods
|
||||||
|
for (int8_t i = 1; i < REPORT_SIZE; i++) {
|
||||||
|
keyboard_report->raw[i] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* modifier */
|
||||||
|
uint8_t get_mods(void) { return real_mods; }
|
||||||
|
void add_mods(uint8_t mods) { real_mods |= mods; }
|
||||||
|
void del_mods(uint8_t mods) { real_mods &= ~mods; }
|
||||||
|
void set_mods(uint8_t mods) { real_mods = mods; }
|
||||||
|
void clear_mods(void) { real_mods = 0; }
|
||||||
|
|
||||||
|
/* weak modifier */
|
||||||
|
uint8_t get_weak_mods(void) { return weak_mods; }
|
||||||
|
void add_weak_mods(uint8_t mods) { weak_mods |= mods; }
|
||||||
|
void del_weak_mods(uint8_t mods) { weak_mods &= ~mods; }
|
||||||
|
void set_weak_mods(uint8_t mods) { weak_mods = mods; }
|
||||||
|
void clear_weak_mods(void) { weak_mods = 0; }
|
||||||
|
|
||||||
|
/* Oneshot modifier */
|
||||||
|
#ifndef NO_ACTION_ONESHOT
|
||||||
|
void set_oneshot_mods(uint8_t mods) { oneshot_mods = mods; }
|
||||||
|
void clear_oneshot_mods(void) { oneshot_mods = 0; }
|
||||||
|
void oneshot_toggle(void) { oneshot_enabled = !oneshot_enabled; }
|
||||||
|
void oneshot_enable(void) { oneshot_enabled = true; }
|
||||||
|
void oneshot_disable(void) { oneshot_enabled = false; }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* inspect keyboard state
|
||||||
|
*/
|
||||||
|
uint8_t has_anykey(void)
|
||||||
|
{
|
||||||
|
uint8_t cnt = 0;
|
||||||
|
for (uint8_t i = 1; i < REPORT_SIZE; i++) {
|
||||||
|
if (keyboard_report->raw[i])
|
||||||
|
cnt++;
|
||||||
|
}
|
||||||
|
return cnt;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t has_anymod(void)
|
||||||
|
{
|
||||||
|
return bitpop(real_mods);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t get_first_key(void)
|
||||||
|
{
|
||||||
|
#ifdef NKRO_ENABLE
|
||||||
|
if (keyboard_nkro) {
|
||||||
|
uint8_t i = 0;
|
||||||
|
for (; i < REPORT_BITS && !keyboard_report->nkro.bits[i]; i++)
|
||||||
|
;
|
||||||
|
return i<<3 | biton(keyboard_report->nkro.bits[i]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return keyboard_report->keys[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* local functions */
|
||||||
|
static inline void add_key_byte(uint8_t code)
|
||||||
|
{
|
||||||
|
int8_t i = 0;
|
||||||
|
int8_t empty = -1;
|
||||||
|
for (; i < REPORT_KEYS; i++) {
|
||||||
|
if (keyboard_report->keys[i] == code) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (empty == -1 && keyboard_report->keys[i] == 0) {
|
||||||
|
empty = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i == REPORT_KEYS) {
|
||||||
|
if (empty != -1) {
|
||||||
|
keyboard_report->keys[empty] = code;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void del_key_byte(uint8_t code)
|
||||||
|
{
|
||||||
|
for (uint8_t i = 0; i < REPORT_KEYS; i++) {
|
||||||
|
if (keyboard_report->keys[i] == code) {
|
||||||
|
keyboard_report->keys[i] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef NKRO_ENABLE
|
||||||
|
static inline void add_key_bit(uint8_t code)
|
||||||
|
{
|
||||||
|
if ((code>>3) < REPORT_BITS) {
|
||||||
|
keyboard_report->nkro.bits[code>>3] |= 1<<(code&7);
|
||||||
|
} else {
|
||||||
|
dprintf("add_key_bit: can't add: %02X\n", code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void del_key_bit(uint8_t code)
|
||||||
|
{
|
||||||
|
if ((code>>3) < REPORT_BITS) {
|
||||||
|
keyboard_report->nkro.bits[code>>3] &= ~(1<<(code&7));
|
||||||
|
} else {
|
||||||
|
dprintf("del_key_bit: can't del: %02X\n", code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2013 Jun Wako <wakojun@gmail.com>
|
||||||
|
|
||||||
|
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_UTIL_H
|
||||||
|
#define ACTION_UTIL_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
extern report_keyboard_t *keyboard_report;
|
||||||
|
|
||||||
|
void send_keyboard_report(void);
|
||||||
|
|
||||||
|
/* key */
|
||||||
|
void add_key(uint8_t key);
|
||||||
|
void del_key(uint8_t key);
|
||||||
|
void clear_keys(void);
|
||||||
|
|
||||||
|
/* modifier */
|
||||||
|
uint8_t get_mods(void);
|
||||||
|
void add_mods(uint8_t mods);
|
||||||
|
void del_mods(uint8_t mods);
|
||||||
|
void set_mods(uint8_t mods);
|
||||||
|
void clear_mods(void);
|
||||||
|
|
||||||
|
/* weak modifier */
|
||||||
|
uint8_t get_weak_mods(void);
|
||||||
|
void add_weak_mods(uint8_t mods);
|
||||||
|
void del_weak_mods(uint8_t mods);
|
||||||
|
void set_weak_mods(uint8_t mods);
|
||||||
|
void clear_weak_mods(void);
|
||||||
|
|
||||||
|
/* oneshot modifier */
|
||||||
|
void set_oneshot_mods(uint8_t mods);
|
||||||
|
void clear_oneshot_mods(void);
|
||||||
|
void oneshot_toggle(void);
|
||||||
|
void oneshot_enable(void);
|
||||||
|
void oneshot_disable(void);
|
||||||
|
|
||||||
|
/* inspect */
|
||||||
|
uint8_t has_anykey(void);
|
||||||
|
uint8_t has_anymod(void);
|
||||||
|
uint8_t get_first_key(void);
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue