di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Add user defined function to action.

Browse Source
This commit is contained in:
tmk 2013-02-01 14:48:11 +09:00
parent 52efc71624
commit 4f274d125f
5 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/action.c
View File

@ -110,7 +110,7 @@ static bool waiting_buffer_typed(keyevent_t event)
} }
#endif #endif
static bool waiting_buffer_has_anykey_pressed(void) bool waiting_buffer_has_anykey_pressed(void)
{ {
for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
if (waiting_buffer[i].event.pressed) return true; if (waiting_buffer[i].event.pressed) return true;
@ -256,7 +256,7 @@ static void process_action(keyrecord_t *record)
debug("MODS_TAP: Oneshot: start\n"); debug("MODS_TAP: Oneshot: start\n");
oneshot_start(mods, event.time); oneshot_start(mods, event.time);
} }
else if (tap_count == 5) { else if (tap_count == TAPPING_TOGGLE) {
debug("MODS_TAP: Oneshot: toggle\n"); debug("MODS_TAP: Oneshot: toggle\n");
oneshot_toggle(); oneshot_toggle();
} }
@ -356,7 +356,7 @@ static void process_action(keyrecord_t *record)
switch (action.layer.code) { switch (action.layer.code) {
case 0x00: case 0x00:
if (event.pressed) { if (event.pressed) {
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
//TODO: this is ok? //TODO: this is ok?
else { else {
@ -367,19 +367,19 @@ static void process_action(keyrecord_t *record)
// tap toggle // tap toggle
if (event.pressed) { if (event.pressed) {
if (tap_count < TAPPING_TOGGLE) { if (tap_count < TAPPING_TOGGLE) {
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} else { } else {
if (tap_count >= TAPPING_TOGGLE) { if (tap_count >= TAPPING_TOGGLE) {
debug("LAYER_PRESSED: tap toggle.\n"); debug("LAYER_PRESSED: tap toggle.\n");
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} }
break; break;
case 0xFF: case 0xFF:
// change default layer // change default layer
if (event.pressed) { if (event.pressed) {
default_layer = action.layer.opt; default_layer = action.layer.val;
layer_switch(default_layer); layer_switch(default_layer);
} }
break; break;
@ -391,7 +391,7 @@ static void process_action(keyrecord_t *record)
register_code(action.layer.code); register_code(action.layer.code);
} else { } else {
debug("LAYER_PRESSED: No tap: layer_switch\n"); debug("LAYER_PRESSED: No tap: layer_switch\n");
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} else { } else {
if (tap_count > 0) { if (tap_count > 0) {
@ -411,7 +411,7 @@ static void process_action(keyrecord_t *record)
switch (action.layer.code) { switch (action.layer.code) {
case 0x00: case 0x00:
if (!event.pressed) { if (!event.pressed) {
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
break; break;
case 0xF0: case 0xF0:
@ -419,18 +419,18 @@ static void process_action(keyrecord_t *record)
if (event.pressed) { if (event.pressed) {
if (tap_count >= TAPPING_TOGGLE) { if (tap_count >= TAPPING_TOGGLE) {
debug("LAYER_RELEASED: tap toggle.\n"); debug("LAYER_RELEASED: tap toggle.\n");
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} else { } else {
if (tap_count < TAPPING_TOGGLE) { if (tap_count < TAPPING_TOGGLE) {
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} }
break; break;
case 0xFF: case 0xFF:
// change default layer // change default layer
if (!event.pressed) { if (!event.pressed) {
default_layer = action.layer.opt; default_layer = action.layer.val;
layer_switch(default_layer); layer_switch(default_layer);
} }
break; break;
@ -449,7 +449,7 @@ static void process_action(keyrecord_t *record)
unregister_code(action.layer.code); unregister_code(action.layer.code);
} else { } else {
debug("LAYER_RELEASED: No tap: layer_switch\n"); debug("LAYER_RELEASED: No tap: layer_switch\n");
layer_switch(action.layer.opt); layer_switch(action.layer.val);
} }
} }
break; break;
@ -459,9 +459,9 @@ static void process_action(keyrecord_t *record)
switch (action.layer.code) { switch (action.layer.code) {
case 0x00: case 0x00:
if (event.pressed) { if (event.pressed) {
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} else { } else {
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} }
break; break;
case 0xF0: case 0xF0:
@ -469,22 +469,22 @@ static void process_action(keyrecord_t *record)
if (event.pressed) { if (event.pressed) {
if (tap_count < TAPPING_TOGGLE) { if (tap_count < TAPPING_TOGGLE) {
debug("LAYER_BIT: tap toggle(press).\n"); debug("LAYER_BIT: tap toggle(press).\n");
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} }
} else { } else {
if (tap_count <= TAPPING_TOGGLE) { if (tap_count <= TAPPING_TOGGLE) {
debug("LAYER_BIT: tap toggle(release).\n"); debug("LAYER_BIT: tap toggle(release).\n");
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} }
} }
break; break;
case 0xFF: case 0xFF:
// change default layer // change default layer
if (event.pressed) { if (event.pressed) {
default_layer = current_layer ^ action.layer.opt; default_layer = current_layer ^ action.layer.val;
layer_switch(default_layer); layer_switch(default_layer);
} else { } else {
default_layer = current_layer ^ action.layer.opt; default_layer = current_layer ^ action.layer.val;
layer_switch(default_layer); layer_switch(default_layer);
} }
break; break;
@ -496,7 +496,7 @@ static void process_action(keyrecord_t *record)
register_code(action.layer.code); register_code(action.layer.code);
} else { } else {
debug("LAYER_BIT: No tap: layer_switch(bit on)\n"); debug("LAYER_BIT: No tap: layer_switch(bit on)\n");
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} }
} else { } else {
if (IS_TAPPING_KEY(event.key) && tap_count > 0) { if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
@ -504,14 +504,14 @@ static void process_action(keyrecord_t *record)
unregister_code(action.layer.code); unregister_code(action.layer.code);
} else { } else {
debug("LAYER_BIT: No tap: layer_switch(bit off)\n"); debug("LAYER_BIT: No tap: layer_switch(bit off)\n");
layer_switch(current_layer ^ action.layer.opt); layer_switch(current_layer ^ action.layer.val);
} }
} }
break; break;
} }
break; break;
case ACT_LAYER_EXT: case ACT_LAYER_EXT:
switch (action.layer.opt) { switch (action.layer.val) {
case 0x00: case 0x00:
// set default layer when pressed // set default layer when pressed
switch (action.layer.code) { switch (action.layer.code) {
@ -620,7 +620,7 @@ static void process_action(keyrecord_t *record)
break; break;
case ACT_FUNCTION: case ACT_FUNCTION:
// TODO // TODO
action_call_function(event, action.func.id); keymap_call_function(record, action.func.id);
break; break;
default: default:
break; break;
@ -944,7 +944,7 @@ bool is_tap_key(key_t key)
} }
return false; return false;
case ACT_FUNCTION: case ACT_FUNCTION:
if (action.func.opt & 0x1) { if (action.func.opt & O_TAP) {
return true; return true;
} }
return false; return false;

47
common/action.h
View File

@ -21,6 +21,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode.h" #include "keycode.h"
/* Execute action per keyevent */
void action_exec(keyevent_t event);
/* Struct to record event and tap count */
typedef struct {
keyevent_t event;
uint8_t tap_count;
} keyrecord_t;
/* Action struct. /* Action struct.
* *
* In avr-gcc bit field seems to be assigned from LSB(bit0) to MSB(bit15). * In avr-gcc bit field seems to be assigned from LSB(bit0) to MSB(bit15).
@ -48,7 +58,7 @@ typedef union {
} key; } key;
struct action_layer { struct action_layer {
uint16_t code :8; uint16_t code :8;
uint16_t opt :4; uint16_t val :4;
uint16_t kind :4; uint16_t kind :4;
} layer; } layer;
struct action_usage { struct action_usage {
@ -58,7 +68,7 @@ typedef union {
} usage; } usage;
struct action_command { struct action_command {
uint16_t id :8; uint16_t id :8;
uint16_t option :4; uint16_t opt :4;
uint16_t kind :4; uint16_t kind :4;
} command; } command;
struct action_function { struct action_function {
@ -68,18 +78,6 @@ typedef union {
} func; } func;
} action_t; } action_t;
/* Struct to record action and tap count */
typedef struct {
keyevent_t event;
uint8_t tap_count;
} keyrecord_t;
/* execute action per keyevent */
void action_exec(keyevent_t event);
typedef void (*action_func_t)(keyevent_t event, uint8_t opt); // TODO:no need?
void action_call_function(keyevent_t event, uint8_t id); // TODO: action function
/* /*
* Utilities for actions. * Utilities for actions.
@ -94,6 +92,7 @@ void clear_keyboard_but_mods(void);
bool sending_anykey(void); bool sending_anykey(void);
void layer_switch(uint8_t new_layer); void layer_switch(uint8_t new_layer);
bool is_tap_key(key_t key); bool is_tap_key(key_t key);
bool waiting_buffer_has_anykey_pressed(void);
@ -203,9 +202,6 @@ ACT_FUNCTION(1111):
1111| address(12) Function? 1111| address(12) Function?
1111|opt | id(8) Function? 1111|opt | id(8) Function?
TODO: modifier + function by tap?
for example: LShift + '('[Shift+9] and RShift + ')'[Shift+0]
http://deskthority.net/workshop-f7/tmk-keyboard-firmware-collection-t4478.html#p90052
*/ */
enum action_kind_id { enum action_kind_id {
ACT_LMODS = 0b0000, ACT_LMODS = 0b0000,
@ -226,8 +222,12 @@ enum action_kind_id {
ACT_FUNCTION = 0b1111 ACT_FUNCTION = 0b1111
}; };
enum acion_param { enum params {
ONE_SHOT = 0x00, P_ONESHOT = 0x00,
};
enum options {
O_TAP = 0x8,
}; };
@ -251,14 +251,14 @@ enum acion_param {
/* Mods + Tap key */ /* Mods + Tap key */
#define ACTION_LMODS_TAP_KEY(mods, key) ACTION(ACT_LMODS_TAP, MODS4(mods)<<8 | (key)) #define ACTION_LMODS_TAP_KEY(mods, key) ACTION(ACT_LMODS_TAP, MODS4(mods)<<8 | (key))
#define ACTION_LMODS_ONESHOT(mods) ACTION(ACT_LMODS_TAP, MODS4(mods)<<8 | ONE_SHOT) #define ACTION_LMODS_ONESHOT(mods) ACTION(ACT_LMODS_TAP, MODS4(mods)<<8 | P_ONESHOT)
#define ACTION_RMODS_TAP_KEY(mods, key) ACTION(ACT_RMODS_TAP, MODS4(mods)<<8 | (key)) #define ACTION_RMODS_TAP_KEY(mods, key) ACTION(ACT_RMODS_TAP, MODS4(mods)<<8 | (key))
#define ACTION_RMODS_ONESHOT(mods) ACTION(ACT_RMODS_TAP, MODS4(mods)<<8 | ONE_SHOT) #define ACTION_RMODS_ONESHOT(mods) ACTION(ACT_RMODS_TAP, MODS4(mods)<<8 | P_ONESHOT)
/* Mod + Tap key */ /* Mod + Tap key */
#define ACTION_LMOD_TAP_KEY(mod, key) ACTION(ACT_LMODS_TAP, MODS4(MOD_BIT(mod))<<8 | (key)) #define ACTION_LMOD_TAP_KEY(mod, key) ACTION(ACT_LMODS_TAP, MODS4(MOD_BIT(mod))<<8 | (key))
#define ACTION_LMOD_ONESHOT(mod) ACTION(ACT_LMODS_TAP, MODS4(MOD_BIT(mod))<<8 | ONE_SHOT) #define ACTION_LMOD_ONESHOT(mod) ACTION(ACT_LMODS_TAP, MODS4(MOD_BIT(mod))<<8 | P_ONESHOT)
#define ACTION_RMOD_TAP_KEY(mod, key) ACTION(ACT_RMODS_TAP, MODS4(MOD_BIT(mod))<<8 | (key)) #define ACTION_RMOD_TAP_KEY(mod, key) ACTION(ACT_RMODS_TAP, MODS4(MOD_BIT(mod))<<8 | (key))
#define ACTION_RMOD_ONESHOT(mod) ACTION(ACT_RMODS_TAP, MODS4(MOD_BIT(mod))<<8 | ONE_SHOT) #define ACTION_RMOD_ONESHOT(mod) ACTION(ACT_RMODS_TAP, MODS4(MOD_BIT(mod))<<8 | P_ONESHOT)
// TODO: contemplate about layer action // TODO: contemplate about layer action
/* Switch current layer */ /* Switch current layer */
@ -304,5 +304,6 @@ enum acion_param {
/* Function */ /* Function */
#define ACTION_FUNCTION(id, opt) ACTION(ACT_FUNCTION, (opt)<<8 | id) #define ACTION_FUNCTION(id, opt) ACTION(ACT_FUNCTION, (opt)<<8 | id)
#define ACTION_FUNCTION_TAP(id) ACTION(ACT_FUNCTION, O_TAP<<8 | id)
#endif /* ACTION_H */ #endif /* ACTION_H */

1
common/keyboard.h
View File

@ -32,6 +32,7 @@ typedef struct {
uint8_t row; uint8_t row;
} keypos_t; } keypos_t;
// TODO: need raw? keypos_t -> key_t?
typedef union { typedef union {
uint16_t raw; uint16_t raw;
keypos_t pos; keypos_t pos;

2
common/keymap.c
View File

@ -68,6 +68,6 @@ action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col)
#endif #endif
__attribute__ ((weak)) __attribute__ ((weak))
void action_call_function(keyevent_t event, uint8_t id) void keymap_call_function(keyrecord_t *event, uint8_t id)
{ {
} }

8
common/keymap.h
View File

@ -29,11 +29,13 @@ extern uint8_t current_layer;
extern uint8_t default_layer; extern uint8_t default_layer;
/* /* action for key */
* new keymap interface: action // TODO: should use struct key_t?
*/
action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col); action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col);
/* user defined special function */
void keymap_call_function(keyrecord_t *record, uint8_t id);
#ifndef NO_LEGACY_KEYMAP_SUPPORT #ifndef NO_LEGACY_KEYMAP_SUPPORT
/* keycode of key */ /* keycode of key */