From 10f33a3e484e24065ed5eaab1c56c35156bace89 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 31 Mar 2013 22:47:19 +0900 Subject: Remove ACT_KEYMAP and ACT_OVERLAY - Remove ACT_OVERLAY - Rename ACT_KEYMAP to ACT_LAYER - Add ACT_LAYER_BITOP --- common/layer_switch.h | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'common/layer_switch.h') diff --git a/common/layer_switch.h b/common/layer_switch.h index eb4cf61ba3..423dafb5b8 100644 --- a/common/layer_switch.h +++ b/common/layer_switch.h @@ -22,11 +22,6 @@ along with this program. If not, see . #include "action.h" -/* overlays are asigned at layer 16-31 */ -#define OVERLAY_BIT 0x10 -#define OVERLAY_MASK 0x0F - - /* * Default Layer */ @@ -38,7 +33,7 @@ void default_layer_set(uint8_t layer); /* * Keymap Layer */ -#ifndef NO_ACTION_KEYMAP +#ifndef NO_ACTION_LAYER extern uint16_t keymap_stat; /* return current active layer */ uint8_t keymap_get_layer(void); @@ -69,41 +64,6 @@ void keymap_debug(void); #endif -/* - * Overlay Layer - */ -#ifndef NO_ACTION_OVERLAY -extern uint16_t overlay_stat; -/* return current active layer */ -uint8_t overlay_get_layer(void); -void overlay_clear(void); -void overlay_set(uint16_t stat); -void overlay_move(uint8_t layer); -void overlay_on(uint8_t layer); -void overlay_off(uint8_t layer); -void overlay_invert(uint8_t layer); -/* bitwise operation */ -void overlay_or(uint16_t stat); -void overlay_and(uint16_t stat); -void overlay_xor(uint16_t stat); -void overlay_debug(void); -#else -#define overlay_stat 0 -#define overlay_get_layer() -#define overlay_clear() -#define overlay_set(stat) -#define overlay_move(layer) -#define overlay_on(layer) -#define overlay_off(layer) -#define overlay_invert(layer) -#define overlay_or(stat) -#define overlay_and(stat) -#define overlay_xor(stat) -#define overlay_debug() -#endif - - - /* return action depending on current layer status */ action_t layer_switch_get_action(key_t key); -- cgit v1.2.3 From cc8e66754b1a5d0c11985cb0feb51ead49668744 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 2 Apr 2013 16:09:43 +0900 Subject: Refine ACT_LAYER and ACT_LAYER_TAP - Remove ACT_LAYER_BITOP --- common/layer_switch.h | 61 ++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 27 deletions(-) (limited to 'common/layer_switch.h') diff --git a/common/layer_switch.h b/common/layer_switch.h index 423dafb5b8..ed8dfb5025 100644 --- a/common/layer_switch.h +++ b/common/layer_switch.h @@ -25,42 +25,49 @@ along with this program. If not, see . /* * Default Layer */ -/* base layer to fall back */ -extern uint8_t default_layer; +extern uint32_t default_layer_state; +void default_layer_debug(void); void default_layer_set(uint8_t layer); +#ifndef NO_ACTION_LAYER +/* bitwise operation */ +void default_layer_or(uint32_t state); +void default_layer_and(uint32_t state); +void default_layer_xor(uint32_t state); +#else +#define default_layer_or(state) +#define default_layer_and(state) +#define default_layer_xor(state) +#endif + /* * Keymap Layer */ #ifndef NO_ACTION_LAYER -extern uint16_t keymap_stat; -/* return current active layer */ -uint8_t keymap_get_layer(void); -void keymap_clear(void); -void keymap_set(uint16_t stat); -void keymap_move(uint8_t layer); -void keymap_on(uint8_t layer); -void keymap_off(uint8_t layer); -void keymap_invert(uint8_t layer); +extern uint32_t layer_state; +void layer_debug(void); +void layer_clear(void); +void layer_move(uint8_t layer); +void layer_on(uint8_t layer); +void layer_off(uint8_t layer); +void layer_invert(uint8_t layer); /* bitwise operation */ -void keymap_or(uint16_t stat); -void keymap_and(uint16_t stat); -void keymap_xor(uint16_t stat); -void keymap_debug(void); +void layer_or(uint32_t state); +void layer_and(uint32_t state); +void layer_xor(uint32_t state); #else -#define keymap_stat 0 -#define keymap_get_layer() -#define keymap_clear() -#define keymap_set(stat) -#define keymap_move(layer) -#define keymap_on(layer) -#define keymap_off(layer) -#define keymap_invert(layer) -#define keymap_or(stat) -#define keymap_and(stat) -#define keymap_xor(stat) -#define keymap_debug() +#define layer_state 0 +#define layer_clear() +#define layer_move(layer) +#define layer_on(layer) +#define layer_off(layer) +#define layer_invert(layer) + +#define layer_or(state) +#define layer_and(state) +#define layer_xor(state) +#define layer_debug() #endif -- cgit v1.2.3 From c6d88d27956c4b76f8819fcdb076bf94a8f55868 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 2 Apr 2013 17:44:24 +0900 Subject: Rename file layer_switch to action_layer --- common/layer_switch.h | 77 --------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 common/layer_switch.h (limited to 'common/layer_switch.h') diff --git a/common/layer_switch.h b/common/layer_switch.h deleted file mode 100644 index ed8dfb5025..0000000000 --- a/common/layer_switch.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2013 Jun Wako - -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 . -*/ -#ifndef LAYER_SWITCH_H -#define LAYER_SWITCH_H - -#include -#include "keyboard.h" -#include "action.h" - - -/* - * Default Layer - */ -extern uint32_t default_layer_state; -void default_layer_debug(void); -void default_layer_set(uint8_t layer); - -#ifndef NO_ACTION_LAYER -/* bitwise operation */ -void default_layer_or(uint32_t state); -void default_layer_and(uint32_t state); -void default_layer_xor(uint32_t state); -#else -#define default_layer_or(state) -#define default_layer_and(state) -#define default_layer_xor(state) -#endif - - -/* - * Keymap Layer - */ -#ifndef NO_ACTION_LAYER -extern uint32_t layer_state; -void layer_debug(void); -void layer_clear(void); -void layer_move(uint8_t layer); -void layer_on(uint8_t layer); -void layer_off(uint8_t layer); -void layer_invert(uint8_t layer); -/* bitwise operation */ -void layer_or(uint32_t state); -void layer_and(uint32_t state); -void layer_xor(uint32_t state); -#else -#define layer_state 0 -#define layer_clear() -#define layer_move(layer) -#define layer_on(layer) -#define layer_off(layer) -#define layer_invert(layer) - -#define layer_or(state) -#define layer_and(state) -#define layer_xor(state) -#define layer_debug() -#endif - - -/* return action depending on current layer status */ -action_t layer_switch_get_action(key_t key); - -#endif -- cgit v1.2.3