From c77027992b98eb0228f3900690b9cba0b356248a Mon Sep 17 00:00:00 2001
From: Gergely Nagy <algernon@madhouse-project.org>
Date: Tue, 13 Dec 2016 19:54:34 +0100
Subject: [PATCH] Move layer handling back to keyboard_layout.c

And while there, also drop the helper functions, and just do the activation in
the handler function. This simplifies the code a bit, as there is little point
in lifting out an assignment into a function at this time.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
---
 right/src/keyboard_layout.c |  5 +++--
 right/src/layer.c           | 11 -----------
 right/src/layer.h           |  3 ---
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 right/src/layer.c

diff --git a/right/src/keyboard_layout.c b/right/src/keyboard_layout.c
index 2658061..9941b28 100644
--- a/right/src/keyboard_layout.c
+++ b/right/src/keyboard_layout.c
@@ -4,6 +4,7 @@
 
 static uint8_t keyMasks[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
 
+uint8_t ActiveLayer = LAYER_ID_BASE;
 uint8_t prevKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
 
 static inline __attribute__((always_inline)) uhk_key_t getKeycode(uint8_t slotId, uint8_t keyId)
@@ -76,10 +77,10 @@ bool handleKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *report, co
         break;
     case UHK_KEY_LAYER:
         if (key_toggled_on(prevKeyStates, currKeyStates, keyId)) {
-            Layer_MoveTo(key.layer.target);
+            ActiveLayer = layer;
         }
         if (key_toggled_off(prevKeyStates, currKeyStates, keyId)) {
-            Layer_MoveToBase();
+            ActiveLayer = LAYER_ID_BASE;
         }
         return false;
         break;
diff --git a/right/src/layer.c b/right/src/layer.c
deleted file mode 100644
index dbb3cad..0000000
--- a/right/src/layer.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "layer.h"
-
-uint8_t ActiveLayer = LAYER_ID_BASE;
-
-void Layer_MoveTo(uint8_t layer) {
-    ActiveLayer = layer;
-}
-
-void Layer_MoveToBase() {
-    Layer_MoveTo(LAYER_ID_BASE);
-}
diff --git a/right/src/layer.h b/right/src/layer.h
index 73848ae..2f35890 100644
--- a/right/src/layer.h
+++ b/right/src/layer.h
@@ -14,7 +14,4 @@
 
     extern uint8_t ActiveLayer;
 
-    void Layer_MoveTo(uint8_t layer);
-    void Layer_MoveToBase();
-
 #endif