X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Faction.c;h=fddb97c508dbd96865c73ef08bfd68cc1739b1ac;hb=b9e265368fde73daff069788dcb58c8230d01b32;hp=0651887444c4db8fda91e51ff73a655d9c04f174;hpb=a8c465215fce3dad502da868ca49eb446deadc4e;p=tmk_firmware.git
diff --git a/common/action.c b/common/action.c
index 0651887..fddb97c 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 "backlight.h"
#include "action_layer.h"
#include "action_tapping.h"
-#include "action_oneshot.h"
#include "action_macro.h"
+#include "action_util.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
}
@@ -57,12 +63,12 @@ void process_action(keyrecord_t *record)
if (IS_NOEVENT(event)) { return; }
action_t action = layer_switch_get_action(event.key);
- debug("ACTION: "); debug_action(action);
+ dprint("ACTION: "); debug_action(action);
#ifndef NO_ACTION_LAYER
- debug(" layer_state: "); layer_debug();
- debug(" default_layer_state: "); default_layer_debug();
+ dprint(" layer_state: "); layer_debug();
+ dprint(" default_layer_state: "); default_layer_debug();
#endif
- debug("\n");
+ dprintln();
switch (action.kind.id) {
/* Key and Mods */
@@ -73,15 +79,15 @@ void process_action(keyrecord_t *record)
action.key.mods<<4;
if (event.pressed) {
if (mods) {
- host_add_mods(mods);
- host_send_keyboard_report();
+ add_weak_mods(mods);
+ send_keyboard_report();
}
register_code(action.key.code);
} else {
unregister_code(action.key.code);
if (mods) {
- host_del_mods(mods);
- host_send_keyboard_report();
+ del_weak_mods(mods);
+ send_keyboard_report();
}
}
}
@@ -94,70 +100,68 @@ void process_action(keyrecord_t *record)
action.key.mods<<4;
switch (action.layer_tap.code) {
#ifndef NO_ACTION_ONESHOT
- case 0x00:
+ case MODS_ONESHOT:
// Oneshot modifier
if (event.pressed) {
if (tap_count == 0) {
- debug("MODS_TAP: Oneshot: add_mods\n");
- add_mods(mods);
+ register_mods(mods);
}
else if (tap_count == 1) {
- debug("MODS_TAP: Oneshot: start\n");
- oneshot_start(mods);
- }
- else if (tap_count == TAPPING_TOGGLE) {
- debug("MODS_TAP: Oneshot: toggle\n");
- oneshot_toggle();
+ dprint("MODS_TAP: Oneshot: start\n");
+ set_oneshot_mods(mods);
}
else {
- debug("MODS_TAP: Oneshot: cancel&add_mods\n");
- // double tap cancels oneshot and works as normal modifier.
- oneshot_cancel();
- add_mods(mods);
+ register_mods(mods);
}
} else {
if (tap_count == 0) {
- debug("MODS_TAP: Oneshot: cancel/del_mods\n");
- // cancel oneshot on hold
- oneshot_cancel();
- del_mods(mods);
+ clear_oneshot_mods();
+ unregister_mods(mods);
}
else if (tap_count == 1) {
- debug("MODS_TAP: Oneshot: del_mods\n");
- // retain Oneshot
- del_mods(mods);
+ // Retain Oneshot mods
}
else {
- debug("MODS_TAP: Oneshot: del_mods\n");
- // cancel Mods
- del_mods(mods);
+ clear_oneshot_mods();
+ unregister_mods(mods);
}
}
break;
#endif
+ case MODS_TAP_TOGGLE:
+ if (event.pressed) {
+ if (tap_count <= TAPPING_TOGGLE) {
+ register_mods(mods);
+ }
+ } else {
+ if (tap_count < TAPPING_TOGGLE) {
+ unregister_mods(mods);
+ }
+ }
+ break;
default:
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);
+ register_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");
- add_mods(mods);
+ dprint("MODS_TAP: No tap: add_mods\n");
+ register_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");
- del_mods(mods);
+ dprint("MODS_TAP: No tap: add_mods\n");
+ unregister_mods(mods);
}
}
break;
@@ -231,7 +235,7 @@ void process_action(keyrecord_t *record)
break;
#ifndef NO_ACTION_TAPPING
case ACT_LAYER_TAP:
- case ACT_LAYER_TAP1:
+ case ACT_LAYER_TAP_EXT:
switch (action.layer_tap.code) {
case OP_TAP_TOGGLE:
/* tap toggle */
@@ -261,18 +265,18 @@ void process_action(keyrecord_t *record)
/* tap key */
if (event.pressed) {
if (tap_count > 0) {
- debug("KEYMAP_TAP_KEY: Tap: register_code\n");
+ dprint("KEYMAP_TAP_KEY: Tap: register_code\n");
register_code(action.layer_tap.code);
} else {
- debug("KEYMAP_TAP_KEY: No tap: On on press\n");
+ dprint("KEYMAP_TAP_KEY: No tap: On on press\n");
layer_on(action.layer_tap.val);
}
} else {
if (tap_count > 0) {
- debug("KEYMAP_TAP_KEY: Tap: unregister_code\n");
+ dprint("KEYMAP_TAP_KEY: Tap: unregister_code\n");
unregister_code(action.layer_tap.code);
} else {
- debug("KEYMAP_TAP_KEY: No tap: Off on release\n");
+ dprint("KEYMAP_TAP_KEY: No tap: Off on release\n");
layer_off(action.layer_tap.val);
}
}
@@ -286,6 +290,29 @@ void process_action(keyrecord_t *record)
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.opt) {
+ case BACKLIGHT_INCREASE:
+ backlight_increase();
+ break;
+ case BACKLIGHT_DECREASE:
+ backlight_decrease();
+ break;
+ case BACKLIGHT_TOGGLE:
+ backlight_toggle();
+ break;
+ case BACKLIGHT_STEP:
+ backlight_step();
+ break;
+ case BACKLIGHT_LEVEL:
+ backlight_level(action.backlight.level);
+ break;
+ }
+ }
+ break;
#endif
case ACT_COMMAND:
break;
@@ -310,42 +337,73 @@ void register_code(uint8_t code)
if (code == KC_NO) {
return;
}
-#ifdef CAPSLOCK_LOCKING_ENABLE
+
+#ifdef LOCKING_SUPPORT_ENABLE
else if (KC_LOCKING_CAPS == code) {
-#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE
+#ifdef LOCKING_RESYNC_ENABLE
// Resync: ignore if caps lock already is on
if (host_keyboard_leds() & (1<>8);
- debug(":");
- debug_hex8(action.kind.param & 0xff);
- debug("]");
+ dprintf("[%X:%02X]", action.kind.param>>8, action.kind.param&0xff);
}