summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-20 00:26:01 +0900
committertmk <nobody@nowhere>2013-03-20 00:26:01 +0900
commitb057511f45de020c43021f2991569a53c2b929c9 (patch)
treef68be1f393692a9235a76f6d98739d8a614ad13c
parent16870412679225d1a3b46c78928757deb713ae08 (diff)
downloadqmk_firmware-b057511f45de020c43021f2991569a53c2b929c9.tar.gz
qmk_firmware-b057511f45de020c43021f2991569a53c2b929c9.zip
Add NO_ACTION_OVERLAY config option
-rw-r--r--common/action.c2
-rw-r--r--common/layer_switch.c4
-rw-r--r--common/layer_switch.h15
-rw-r--r--keyboard/gh60/config.h3
4 files changed, 23 insertions, 1 deletions
diff --git a/common/action.c b/common/action.c
index 4fafbfa79f..1b84d1e884 100644
--- a/common/action.c
+++ b/common/action.c
@@ -517,6 +517,7 @@ static void process_action(keyrecord_t *record)
}
break;
+#ifndef NO_ACTION_OVERLAY
case ACT_OVERLAY:
switch (action.layer.code) {
// Overlay Invert bit4
@@ -670,6 +671,7 @@ static void process_action(keyrecord_t *record)
break;
}
break;
+#endif
/* Extentions */
case ACT_MACRO:
diff --git a/common/layer_switch.c b/common/layer_switch.c
index 19e286f885..815d1e5f28 100644
--- a/common/layer_switch.c
+++ b/common/layer_switch.c
@@ -98,6 +98,7 @@ void keymap_debug(void)
+#ifndef NO_ACTION_OVERLAY
/*
* Overlay Layer (16-31 = 0-15|0x10)
*/
@@ -169,12 +170,14 @@ void overlay_debug(void)
{
debug_hex16(overlay_stat); debug("("); debug_dec(overlay_get_layer()); debug(")");
}
+#endif
action_t layer_switch_get_action(key_t key)
{
action_t action;
action.code = ACTION_TRANSPARENT;
+#ifndef NO_ACTION_OVERLAY
/* overlay: top layer first */
for (int8_t i = 15; i >= 0; i--) {
if (overlay_stat & (1<<i)) {
@@ -184,6 +187,7 @@ action_t layer_switch_get_action(key_t key)
}
}
}
+#endif
/* keymap: top layer first */
for (int8_t i = 15; i >= 0; i--) {
diff --git a/common/layer_switch.h b/common/layer_switch.h
index a566ab12b7..5de6cb01c3 100644
--- a/common/layer_switch.h
+++ b/common/layer_switch.h
@@ -57,6 +57,7 @@ void keymap_debug(void);
/*
* Overlay Layer
*/
+#ifndef NO_ACTION_OVERLAY
extern uint16_t overlay_stat;
/* return current active layer */
uint8_t overlay_get_layer(void);
@@ -71,6 +72,20 @@ 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
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h
index 64a080e1c2..bb4277ae66 100644
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -58,8 +58,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* disable debug print */
//#define NO_DEBUG
-
/* disable print */
//#define NO_PRINT
+#define NO_ACTION_OVERLAY
+
#endif