diff options
| author | tmk <nobody@nowhere> | 2013-03-20 00:37:32 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-20 00:37:32 +0900 |
| commit | ecb7550a91a7fb9a2e7e717f3c0d40d30fd92121 (patch) | |
| tree | 9d7ed14772aa3faedce7e3993b62950f3d3be1e2 | |
| parent | 9757f960f9f50841df6651a1a52f63eb9aae242b (diff) | |
| download | qmk_firmware-ecb7550a91a7fb9a2e7e717f3c0d40d30fd92121.tar.gz qmk_firmware-ecb7550a91a7fb9a2e7e717f3c0d40d30fd92121.zip | |
Add NO_ACTION_FUNCTION config option
| -rw-r--r-- | common/action.c | 4 | ||||
| -rw-r--r-- | keyboard/gh60/config.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/common/action.c b/common/action.c index eda3a6d32..51b11d1bc 100644 --- a/common/action.c +++ b/common/action.c | |||
| @@ -688,14 +688,18 @@ static void process_action(keyrecord_t *record) | |||
| 688 | #endif | 688 | #endif |
| 689 | 689 | ||
| 690 | /* Extentions */ | 690 | /* Extentions */ |
| 691 | #ifndef NO_ACTION_MACRO | ||
| 691 | case ACT_MACRO: | 692 | case ACT_MACRO: |
| 692 | action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); | 693 | action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); |
| 693 | break; | 694 | break; |
| 695 | #endif | ||
| 694 | case ACT_COMMAND: | 696 | case ACT_COMMAND: |
| 695 | break; | 697 | break; |
| 698 | #ifndef NO_ACTION_FUNCTION | ||
| 696 | case ACT_FUNCTION: | 699 | case ACT_FUNCTION: |
| 697 | action_function(record, action.func.id, action.func.opt); | 700 | action_function(record, action.func.id, action.func.opt); |
| 698 | break; | 701 | break; |
| 702 | #endif | ||
| 699 | default: | 703 | default: |
| 700 | break; | 704 | break; |
| 701 | } | 705 | } |
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index bf5807644..2e2387aa2 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h | |||
| @@ -64,5 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 64 | #define NO_ACTION_OVERLAY | 64 | #define NO_ACTION_OVERLAY |
| 65 | #define NO_ACTION_TAPPING | 65 | #define NO_ACTION_TAPPING |
| 66 | #define NO_ACTION_MACRO | 66 | #define NO_ACTION_MACRO |
| 67 | #define NO_ACTION_FUNCTION | ||
| 67 | 68 | ||
| 68 | #endif | 69 | #endif |
