Refactoring and bugfixes.

2016-11-13 11:25:29 +01:00
parent b3bc436bbb
commit 190d555221
8 changed files with 171 additions and 109 deletions
@@ -0,0 +1,57 @@
+#ifndef KEYBOARD_LAYOUT_H_
+#define KEYBOARD_LAYOUT_H_
+
+#include <stdint.h>
+#include "lufa/HIDClassCommon.h"
+
+/**
+ * Keyboard layout is a 2D array of scan codes.
+ *
+ * First dimension is the Key ID of a given key. Key IDs are the indices of the
+ * of the active keys of the key_matrix_t structure. In case of left half, an
+ * offset of 35 is added.
+ *
+ * For each Key ID, there are 4 different possible scan codes:
+ * 		- default, when no modifiers are pressed
+ * 		- mod layer
+ * 		- fn layer
+ * 		- mod+fn layer
+ *
+ */
+
+#define KEY_STATE_COUNT (5*7)
+
+#define LAYOUT_KEY_COUNT 70
+#define LAYOUT_MOD_COUNT 4
+
+#define LAYOUT_LEFT_OFFSET KEY_STATE_COUNT
+
+#define KEYBOARD_LAYOUT(name) const uint8_t name[LAYOUT_KEY_COUNT][LAYOUT_MOD_COUNT]
+
+#define KEYID_LEFT_MOD 33
+#define KEYID_LEFT_FN 31
+#define KEYID_RIGHT_FN 31
+
+#define MODIFIER_MOD_PRESSED 1
+#define MODIFIER_FN_PRESSED 2
+
+
+static inline __attribute__((always_inline)) uint8_t getKeycode(KEYBOARD_LAYOUT(layout), uint8_t keyId, uint8_t modifierState)
+{
+	if (keyId<LAYOUT_KEY_COUNT)
+		return layout[keyId][modifierState];
+	else
+		return 0;
+}
+
+static inline __attribute__((always_inline)) uint8_t getModifierState(const uint8_t *leftKeyStates, const uint8_t *rightKeyStates){
+	uint8_t mod=0;
+	if (leftKeyStates[KEYID_LEFT_MOD])
+		mod |= MODIFIER_MOD_PRESSED;
+	if (leftKeyStates[KEYID_LEFT_FN] | rightKeyStates[KEYID_RIGHT_FN])
+		mod |= MODIFIER_FN_PRESSED;
+
+	return mod;
+}
+
+#endif