X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=common%2Faction.c;h=b1fa0e31cf7798c4cdbf49efa83d9a0e97a4575b;hb=eef6aa58b752649985cd580c87437bf46805e302;hp=07a3a64d6cd1d2afcad8a8f7e398f329c59391bd;hpb=c69f7e106922cecaf1aee8453e449dd7e2832c7a;p=max%2Ftmk_keyboard.git
diff --git a/common/action.c b/common/action.c
index 07a3a64d..b1fa0e31 100644
--- a/common/action.c
+++ b/common/action.c
@@ -19,20 +19,26 @@ along with this program. If not, see .
#include "keyboard.h"
#include "mousekey.h"
#include "command.h"
-#include "debug.h"
#include "led.h"
-#include "layer_switch.h"
+#include "backlight.h"
+#include "action_layer.h"
#include "action_tapping.h"
#include "action_oneshot.h"
#include "action_macro.h"
#include "action.h"
+#ifdef DEBUG_ACTION
+#include "debug.h"
+#else
+#include "nodebug.h"
+#endif
+
void action_exec(keyevent_t event)
{
if (!IS_NOEVENT(event)) {
- debug("\n---- action_exec: start -----\n");
- debug("EVENT: "); debug_event(event); debug("\n");
+ dprint("\n---- action_exec: start -----\n");
+ dprint("EVENT: "); debug_event(event); dprintln();
}
keyrecord_t record = { .event = event };
@@ -42,7 +48,7 @@ void action_exec(keyevent_t event)
#else
process_action(&record);
if (!IS_NOEVENT(record.event)) {
- debug("processed: "); debug_record(record); debug("\n");
+ dprint("processed: "); debug_record(record); dprintln();
}
#endif
}
@@ -50,15 +56,19 @@ void action_exec(keyevent_t event)
void process_action(keyrecord_t *record)
{
keyevent_t event = record->event;
+#ifndef NO_ACTION_TAPPING
uint8_t tap_count = record->tap.count;
+#endif
if (IS_NOEVENT(event)) { return; }
action_t action = layer_switch_get_action(event.key);
- debug("ACTION: "); debug_action(action);
- debug(" overlays: "); overlay_debug();
- debug(" keymaps: "); keymap_debug();
- debug(" default_layer: "); debug_dec(default_layer); debug("\n");
+ dprint("ACTION: "); debug_action(action);
+#ifndef NO_ACTION_LAYER
+ dprint(" layer_state: "); layer_debug();
+ dprint(" default_layer_state: "); default_layer_debug();
+#endif
+ dprintln();
switch (action.kind.id) {
/* Key and Mods */
@@ -68,22 +78,17 @@ void process_action(keyrecord_t *record)
uint8_t mods = (action.kind.id == ACT_LMODS) ? action.key.mods :
action.key.mods<<4;
if (event.pressed) {
- uint8_t tmp_mods = host_get_mods();
if (mods) {
host_add_mods(mods);
host_send_keyboard_report();
}
register_code(action.key.code);
- if (mods && action.key.code) {
- host_set_mods(tmp_mods);
- host_send_keyboard_report();
- }
} else {
- if (mods && !action.key.code) {
+ unregister_code(action.key.code);
+ if (mods) {
host_del_mods(mods);
host_send_keyboard_report();
}
- unregister_code(action.key.code);
}
}
break;
@@ -93,43 +98,43 @@ void process_action(keyrecord_t *record)
{
uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ? action.key.mods :
action.key.mods<<4;
- switch (action.layer.code) {
+ switch (action.layer_tap.code) {
#ifndef NO_ACTION_ONESHOT
case 0x00:
// Oneshot modifier
if (event.pressed) {
if (tap_count == 0) {
- debug("MODS_TAP: Oneshot: add_mods\n");
+ dprint("MODS_TAP: Oneshot: add_mods\n");
add_mods(mods);
}
else if (tap_count == 1) {
- debug("MODS_TAP: Oneshot: start\n");
+ dprint("MODS_TAP: Oneshot: start\n");
oneshot_start(mods);
}
else if (tap_count == TAPPING_TOGGLE) {
- debug("MODS_TAP: Oneshot: toggle\n");
+ dprint("MODS_TAP: Oneshot: toggle\n");
oneshot_toggle();
}
else {
- debug("MODS_TAP: Oneshot: cancel&add_mods\n");
+ dprint("MODS_TAP: Oneshot: cancel&add_mods\n");
// double tap cancels oneshot and works as normal modifier.
oneshot_cancel();
add_mods(mods);
}
} else {
if (tap_count == 0) {
- debug("MODS_TAP: Oneshot: cancel/del_mods\n");
+ dprint("MODS_TAP: Oneshot: cancel/del_mods\n");
// cancel oneshot on hold
oneshot_cancel();
del_mods(mods);
}
else if (tap_count == 1) {
- debug("MODS_TAP: Oneshot: del_mods\n");
+ dprint("MODS_TAP: Oneshot: del_mods\n");
// retain Oneshot
del_mods(mods);
}
else {
- debug("MODS_TAP: Oneshot: del_mods\n");
+ dprint("MODS_TAP: Oneshot: del_mods\n");
// cancel Mods
del_mods(mods);
}
@@ -140,24 +145,24 @@ void process_action(keyrecord_t *record)
if (event.pressed) {
if (tap_count > 0) {
if (record->tap.interrupted) {
- debug("MODS_TAP: Tap: Cancel: add_mods\n");
+ dprint("MODS_TAP: Tap: Cancel: add_mods\n");
// ad hoc: set 0 to cancel tap
record->tap.count = 0;
add_mods(mods);
} else {
- debug("MODS_TAP: Tap: register_code\n");
+ dprint("MODS_TAP: Tap: register_code\n");
register_code(action.key.code);
}
} else {
- debug("MODS_TAP: No tap: add_mods\n");
+ dprint("MODS_TAP: No tap: add_mods\n");
add_mods(mods);
}
} else {
if (tap_count > 0) {
- debug("MODS_TAP: Tap: unregister_code\n");
+ dprint("MODS_TAP: Tap: unregister_code\n");
unregister_code(action.key.code);
} else {
- debug("MODS_TAP: No tap: add_mods\n");
+ dprint("MODS_TAP: No tap: add_mods\n");
del_mods(mods);
}
}
@@ -199,329 +204,114 @@ void process_action(keyrecord_t *record)
}
break;
#endif
-#ifndef NO_ACTION_KEYMAP
- case ACT_KEYMAP:
- switch (action.layer.code) {
- /* Keymap clear */
- case OP_RESET:
- switch (action.layer.val & 0x03) {
- case 0:
- // NOTE: reserved
- overlay_clear();
- keymap_clear();
- break;
- case ON_PRESS:
- if (event.pressed) {
- overlay_clear();
- keymap_clear();
- }
- break;
- case ON_RELEASE:
- if (!event.pressed) {
- overlay_clear();
- keymap_clear();
- }
- break;
- case ON_BOTH:
- overlay_clear();
- keymap_clear();
- break;
- /* NOTE: 4-7 rserved */
+#ifndef NO_ACTION_LAYER
+ case ACT_LAYER:
+ if (action.layer_bitop.on == 0) {
+ /* Default Layer Bitwise Operation */
+ if (!event.pressed) {
+ uint8_t shift = action.layer_bitop.part*4;
+ uint32_t bits = ((uint32_t)action.layer_bitop.bits)< 0) {
- debug("KEYMAP_TAP_KEY: Tap: register_code\n");
- register_code(action.layer.code);
- } else {
- debug("KEYMAP_TAP_KEY: No tap: On on press\n");
- keymap_on(action.layer.val);
- }
- } else {
- if (tap_count > 0) {
- debug("KEYMAP_TAP_KEY: Tap: unregister_code\n");
- unregister_code(action.layer.code);
- } else {
- debug("KEYMAP_TAP_KEY: No tap: Off on release\n");
- keymap_off(action.layer.val);
- }
+ }
+ } else {
+ /* Layer Bitwise Operation */
+ if (event.pressed ? (action.layer_bitop.on & ON_PRESS) :
+ (action.layer_bitop.on & ON_RELEASE)) {
+ uint8_t shift = action.layer_bitop.part*4;
+ uint32_t bits = ((uint32_t)action.layer_bitop.bits)< 0) {
- debug("OVERLAY_TAP_KEY: Tap: register_code\n");
- register_code(action.layer.code);
+ dprint("KEYMAP_TAP_KEY: Tap: register_code\n");
+ register_code(action.layer_tap.code);
} else {
- debug("OVERLAY_TAP_KEY: No tap: On on press\n");
- overlay_on(action.layer.val);
+ dprint("KEYMAP_TAP_KEY: No tap: On on press\n");
+ layer_on(action.layer_tap.val);
}
} else {
if (tap_count > 0) {
- debug("OVERLAY_TAP_KEY: Tap: unregister_code\n");
- unregister_code(action.layer.code);
+ dprint("KEYMAP_TAP_KEY: Tap: unregister_code\n");
+ unregister_code(action.layer_tap.code);
} else {
- debug("OVERLAY_TAP_KEY: No tap: Off on release\n");
- overlay_off(action.layer.val);
+ dprint("KEYMAP_TAP_KEY: No tap: Off on release\n");
+ layer_off(action.layer_tap.val);
}
}
break;
}
break;
+ #endif
#endif
/* Extentions */
#ifndef NO_ACTION_MACRO
case ACT_MACRO:
action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
break;
+#endif
+#ifdef BACKLIGHT_ENABLE
+ case ACT_BACKLIGHT:
+ if (!event.pressed) {
+ switch (action.backlight.id) {
+ case BACKLIGHT_INCREASE:
+ backlight_increase();
+ break;
+ case BACKLIGHT_DECREASE:
+ backlight_decrease();
+ break;
+ case BACKLIGHT_TOGGLE:
+ backlight_toggle();
+ break;
+ case BACKLIGHT_STEP:
+ backlight_step();
+ break;
+ }
+ }
+ break;
#endif
case ACT_COMMAND:
break;
@@ -667,16 +457,9 @@ bool is_tap_key(key_t key)
switch (action.kind.id) {
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
+ case ACT_LAYER_TAP:
+ case ACT_LAYER_TAP1:
return true;
- case ACT_KEYMAP:
- case ACT_OVERLAY:
- switch (action.layer.code) {
- case 0x04 ... 0xEF: /* tap key */
- case OP_INV:
- return true;
- default:
- return false;
- }
case ACT_MACRO:
case ACT_FUNCTION:
if (action.func.opt & FUNC_TAP) { return true; }
@@ -691,39 +474,33 @@ bool is_tap_key(key_t key)
*/
void debug_event(keyevent_t event)
{
- debug_hex16((event.key.row<<8) | event.key.col);
- if (event.pressed) debug("d("); else debug("u(");
- debug_dec(event.time); debug(")");
+ dprintf("%04X%c(%u)", (event.key.row<<8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time);
}
void debug_record(keyrecord_t record)
{
debug_event(record.event);
#ifndef NO_ACTION_TAPPING
- debug(":"); debug_dec(record.tap.count);
- if (record.tap.interrupted) debug("-");
+ dprintf(":%u%c", record.tap.count, (record.tap.interrupted ? '-' : ' '));
#endif
}
void debug_action(action_t action)
{
switch (action.kind.id) {
- case ACT_LMODS: debug("ACT_LMODS"); break;
- case ACT_RMODS: debug("ACT_RMODS"); break;
- case ACT_LMODS_TAP: debug("ACT_LMODS_TAP"); break;
- case ACT_RMODS_TAP: debug("ACT_RMODS_TAP"); break;
- case ACT_USAGE: debug("ACT_USAGE"); break;
- case ACT_MOUSEKEY: debug("ACT_MOUSEKEY"); break;
- case ACT_KEYMAP: debug("ACT_KEYMAP"); break;
- case ACT_OVERLAY: debug("ACT_OVERLAY"); break;
- case ACT_MACRO: debug("ACT_MACRO"); break;
- case ACT_COMMAND: debug("ACT_COMMAND"); break;
- case ACT_FUNCTION: debug("ACT_FUNCTION"); break;
- default: debug("UNKNOWN"); break;
+ case ACT_LMODS: dprint("ACT_LMODS"); break;
+ case ACT_RMODS: dprint("ACT_RMODS"); break;
+ case ACT_LMODS_TAP: dprint("ACT_LMODS_TAP"); break;
+ case ACT_RMODS_TAP: dprint("ACT_RMODS_TAP"); break;
+ case ACT_USAGE: dprint("ACT_USAGE"); break;
+ case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break;
+ case ACT_LAYER: dprint("ACT_LAYER"); break;
+ case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break;
+ case ACT_LAYER_TAP1: dprint("ACT_LAYER_TAP1"); break;
+ case ACT_MACRO: dprint("ACT_MACRO"); break;
+ case ACT_COMMAND: dprint("ACT_COMMAND"); break;
+ case ACT_FUNCTION: dprint("ACT_FUNCTION"); break;
+ default: dprint("UNKNOWN"); break;
}
- debug("[");
- debug_hex4(action.kind.param>>8);
- debug(":");
- debug_hex8(action.kind.param & 0xff);
- debug("]");
+ dprintf("[%X:%02X]", action.kind.param>>8, action.kind.param&0xff);
}