Mercurial > louis > kiibohd-controller

changeset 29:f32c9b3061e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added TheProfosist's layout, and split up the current layouts - Layouts should be changed as per defines in the Scan modules - Which are then mapped using the macro module (if possible)
author Jacob Alexander <triplehaata@gmail.com>
date Sun, 16 Oct 2011 01:18:08 -0700
parents 6ca5b1a395df
children 91901960eac4
files Keymap/budkeypad.h Keymap/heathzenith.h Keymap/keymap.h Keymap/tandy1000.h Scan/matrix/setup.cmake
diffstat 5 files changed, 540 insertions(+), 414 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Keymap/budkeypad.h	Sun Oct 16 01:18:08 2011 -0700
@@ -0,0 +1,74 @@
+/* Copyright (C) 2011 by Jacob Alexander
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __BUDKEYPAD_H
+#define __BUDKEYPAD_H
+
+// This file contains various key layouts for the Bud Hall Effect Keypad (16 key)
+
+
+// ----- Variables -----
+
+static uint8_t budkeypad_ModifierMask[] = {};
+
+// Default 1-indexed key mappings
+static uint8_t budkeypad_DefaultMap[] = { 0,
+				KEYPAD_7,
+				KEYPAD_8,
+				KEYPAD_9,
+				KEYPAD_SLASH,
+				KEYPAD_4,
+				KEYPAD_5,
+				KEYPAD_6,
+				KEYPAD_ASTERIX,
+				KEYPAD_1,
+				KEYPAD_2,
+				KEYPAD_3,
+				KEYPAD_MINUS,
+				KEYPAD_ENTER,
+				KEYPAD_0,
+				KEYPAD_PERIOD,
+				KEYPAD_PLUS,
+};
+
+static uint8_t budkeypad_TheProfosistMap[] = { 0,
+				KEY_7,
+				KEY_8,
+				KEY_9,
+				KEYPAD_SLASH,
+				KEY_4,
+				KEY_5,
+				KEY_6,
+				KEYPAD_ASTERIX,
+				KEY_1,
+				KEY_2,
+				KEY_3,
+				KEYPAD_MINUS,
+				KEY_0,
+				KEYPAD_PERIOD,
+				KEYPAD_ENTER,
+				KEYPAD_PLUS,
+};
+
+
+
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Keymap/heathzenith.h	Sun Oct 16 01:18:08 2011 -0700
@@ -0,0 +1,234 @@
+/* Copyright (C) 2011 by Jacob Alexander
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __HEATHZENITH_H
+#define __HEATHZENITH_H
+
+// This file contains various key layouts for the custom Heath-Zenith Keyboard
+
+
+// ----- Variables -----
+
+static uint8_t  keyboard_modifierMask[] = { 1, 17, 33, 49 };
+static uint8_t alternate_modifierMask[] = { 1, 17, 33, 49, 62 };
+
+// Default 1-indexed key mappings
+static uint8_t defaultMap[] = { 0,
+				KEY_GUI,
+				KEY_1,
+				KEY_2,
+				KEY_3,
+				KEY_4,
+				KEY_5,
+				KEY_6,
+				KEY_7,
+				KEY_8,
+				KEY_9,
+				KEY_0,
+				KEY_MINUS,
+				KEY_EQUAL,
+				KEY_BACKSLASH,
+				KEY_TILDE,
+				KEY_BACKSPACE,
+				KEY_ALT,
+				KEY_TAB,
+				KEY_Q,
+				KEY_W,
+				KEY_E,
+				KEY_R,
+				KEY_T,
+				KEY_Y,
+				KEY_U,
+				KEY_I,
+				KEY_O,
+				KEY_P,
+				KEY_LEFT_BRACE,
+				KEY_RIGHT_BRACE,
+				KEY_DELETE,
+				KEY_UP,
+				KEY_CTRL,
+				KEY_CAPS_LLOCK,
+				KEY_A,
+				KEY_S,
+				KEY_D,
+				KEY_F,
+				KEY_G,
+				KEY_H,
+				KEY_J,
+				KEY_K,
+				KEY_L,
+				KEY_SEMICOLON,
+				KEY_QUOTE,
+				KEY_ENTER,
+				KEY_DOWN,
+				KEY_ESC,
+				KEY_LEFT_SHIFT,
+				KEY_Z,
+				KEY_X,
+				KEY_C,
+				KEY_V,
+				KEY_B,
+				KEY_N,
+				KEY_M,
+				KEY_COMMA,
+				KEY_PERIOD,
+				KEY_SLASH,
+				KEY_RIGHT_SHIFT,
+				KEY_LEFT,
+				KEY_RIGHT,
+				KEY_SPACE
+};
+static uint8_t navigationMap[] = { 0,
+				KEY_GUI,
+				KEY_F1,
+				KEY_F2,
+				KEY_F3,
+				KEY_F4,
+				KEY_F5,
+				KEY_F6,
+				KEY_F7,
+				KEY_F8,
+				KEY_F9,
+				KEY_F10,
+				KEY_F11,
+				KEY_F12,
+				KEY_INSERT,
+				KEY_DELETE,
+				KEY_BACKSPACE,
+				KEY_ALT,
+				KEY_CAPS_LOCK,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				KEY_SYSREQ_ATT,
+				KEY_SCROLL_LOCK,
+				KEY_PAUSE,
+				KEY_UP,
+				0,
+				0,
+				0,
+				KEY_CTRL,
+				KEY_CAPS_LLOCK,
+				0,
+				0,
+				0,
+				0,
+				0,
+				KEYPAD_ASTERIX,
+				KEYPAD_SLASH,
+				KEY_HOME,
+				KEY_PAGE_UP,
+				KEY_LEFT,
+				KEY_RIGHT,
+				KEY_ENTER,
+				0,
+				KEY_ESC,
+				KEY_LEFT_SHIFT,
+				0,
+				0,
+				0,
+				0,
+				0,
+				KEYPAD_PLUS,
+				KEYPAD_MINUS,
+				KEY_END,
+				KEY_PAGE_DOWN,
+				KEY_DOWN,
+				KEY_RIGHT_SHIFT,
+				165,
+				KEY_RIGHT_ALT,
+				KEY_SPACE
+};
+
+static uint8_t colemakMap[] = { 0,
+				KEY_GUI,
+				KEY_1,
+				KEY_2,
+				KEY_3,
+				KEY_4,
+				KEY_5,
+				KEY_6,
+				KEY_7,
+				KEY_8,
+				KEY_9,
+				KEY_0,
+				KEY_MINUS,
+				KEY_EQUAL,
+				KEY_BACKSLASH,
+				KEY_TILDE,
+				KEY_BACKSPACE,
+				KEY_ALT,
+				KEY_TAB,
+				KEY_Q,
+				KEY_W,
+				KEY_F,
+				KEY_P,
+				KEY_G,
+				KEY_J,
+				KEY_L,
+				KEY_U,
+				KEY_Y,
+				KEY_SEMICOLON,
+				KEY_LEFT_BRACE,
+				KEY_RIGHT_BRACE,
+				KEY_DELETE,
+				KEY_PAGE_UP,
+				KEY_CTRL,
+				KEY_CAPS_LLOCK,
+				KEY_A,
+				KEY_R,
+				KEY_S,
+				KEY_T,
+				KEY_D,
+				KEY_H,
+				KEY_N,
+				KEY_E,
+				KEY_I,
+				KEY_O,
+				KEY_QUOTE,
+				KEY_ENTER,
+				KEY_PAGE_DOWN,
+				KEY_ESC,
+				KEY_LEFT_SHIFT,
+				KEY_Z,
+				KEY_X,
+				KEY_C,
+				KEY_V,
+				KEY_B,
+				KEY_K,
+				KEY_M,
+				KEY_COMMA,
+				KEY_PERIOD,
+				KEY_SLASH,
+				KEY_RIGHT_SHIFT,
+				165,
+				KEY_RIGHT_ALT,
+				KEY_SPACE
+};
+
+
+
+#endif
+
--- a/Keymap/keymap.h	Sun Oct 16 00:45:10 2011 -0700
+++ b/Keymap/keymap.h	Sun Oct 16 01:18:08 2011 -0700
@@ -19,8 +19,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __KEYMAP_h
-#define __KEYMAP_h
+#ifndef __KEYMAP_H
+#define __KEYMAP_H
 
 // ----- Includes -----
 
@@ -39,422 +39,18 @@
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic push
 
-static uint8_t tandy1000_modifierMask[] = { 0x1D, 0x2A, 0x36, 0x38, 0x46 };
 
-static uint8_t tandy1000_map[] = { 0,
-				KEY_ESC,
-				KEY_1,
-				KEY_2,
-				KEY_3,
-				KEY_4,
-				KEY_5,
-				KEY_6,
-				KEY_7,
-				KEY_8,
-				KEY_9,
-				KEY_0,
-				KEY_MINUS,
-				KEY_EQUAL,
-				KEY_BACKSPACE,
-				KEY_TAB,
-				KEY_Q,
-				KEY_W,
-				KEY_E,
-				KEY_R,
-				KEY_T,
-				KEY_Y,
-				KEY_U,
-				KEY_I,
-				KEY_O,
-				KEY_P,
-				KEY_LEFT_BRACE,
-				KEY_RIGHT_BRACE,
-				KEY_ENTER,
-				KEY_CTRL, // 0x1D
-				KEY_A,
-				KEY_S,
-				KEY_D,
-				KEY_F,
-				KEY_G,
-				KEY_H,
-				KEY_J,
-				KEY_K,
-				KEY_L,
-				KEY_SEMICOLON,
-				KEY_QUOTE,
-				KEY_UP,
-				KEY_LEFT_SHIFT, // 0x2A
-				KEY_LEFT,
-				KEY_Z,
-				KEY_X,
-				KEY_C,
-				KEY_V,
-				KEY_B,
-				KEY_N,
-				KEY_M,
-				KEY_COMMA,
-				KEY_PERIOD,
-				KEY_SLASH,
-				KEY_RIGHT_SHIFT, // 0x36
-				KEY_PRINTSCREEN,
-				KEY_ALT, // 0x38
-				KEY_SPACE,
-				KEY_CAPS_LOCK,
-				KEY_F1,
-				KEY_F2,
-				KEY_F3,
-				KEY_F4,
-				KEY_F5,
-				KEY_F6,
-				KEY_F7,
-				KEY_F8,
-				KEY_F9,
-				KEY_F10,
-				KEY_NUM_LOCK,
-				KEY_GUI, // Actually Hold... 0x48
-				KEY_BACKSLASH, // Also KEYPAD_7
-				KEY_TILDE, // Also KEYPAD_8
-				KEYPAD_9,
-				KEY_UP,
-				KEY_BACKSLASH, // Actually | and KEYPAD_4
-				KEYPAD_5,
-				KEYPAD_6,
-				KEY_RIGHT,
-				KEYPAD_1,
-				KEY_TILDE, // Actually ` and KEYPAD_2
-				KEYPAD_3,
-				KEYPAD_0,
-				KEY_DELETE,
-				KEY_PAUSE,
-				KEY_INSERT,
-				KEYPAD_PERIOD,
-				KEYPAD_ENTER,
-				KEY_HOME,
-				KEY_F11,
-				KEY_F12, // 0x5A
-};
-
-static uint8_t tandy1000_colemak[] = { 0,
-				KEY_ESC,
-				KEY_1,
-				KEY_2,
-				KEY_3,
-				KEY_4,
-				KEY_5,
-				KEY_6,
-				KEY_7,
-				KEY_8,
-				KEY_9,
-				KEY_0,
-				KEY_MINUS,
-				KEY_EQUAL,
-				KEY_BACKSPACE,
-				KEY_TAB,
-				KEY_Q,
-				KEY_W,
-				KEY_F,
-				KEY_P,
-				KEY_G,
-				KEY_J,
-				KEY_L,
-				KEY_U,
-				KEY_Y,
-				KEY_SEMICOLON,
-				KEY_LEFT_BRACE,
-				KEY_RIGHT_BRACE,
-				KEY_ENTER,
-				KEY_CTRL, // 0x1D
-				KEY_A,
-				KEY_R,
-				KEY_S,
-				KEY_T,
-				KEY_D,
-				KEY_H,
-				KEY_N,
-				KEY_E,
-				KEY_I,
-				KEY_O,
-				KEY_QUOTE,
-				KEY_UP,
-				KEY_LEFT_SHIFT, // 0x2A
-				KEY_LEFT,
-				KEY_Z,
-				KEY_X,
-				KEY_C,
-				KEY_V,
-				KEY_B,
-				KEY_K,
-				KEY_M,
-				KEY_COMMA,
-				KEY_PERIOD,
-				KEY_SLASH,
-				KEY_RIGHT_SHIFT, // 0x36
-				KEY_PRINTSCREEN,
-				KEY_ALT, // 0x38
-				KEY_SPACE,
-				0, //KEY_CAPS_LOCK,
-				KEY_F1,
-				KEY_F2,
-				KEY_F3,
-				KEY_F4,
-				KEY_F5,
-				KEY_F6,
-				KEY_F7,
-				KEY_F8,
-				KEY_F9,
-				KEY_F10,
-				0, //KEY_NUM_LOCK,
-				KEY_GUI, // Actually Hold... 0x48
-				KEY_BACKSLASH, // Also KEYPAD_7
-				KEY_TILDE, // Also KEYPAD_8
-				KEYPAD_9,
-				KEY_DOWN,
-				KEY_BACKSLASH, // Actually | and KEYPAD_4
-				KEYPAD_5,
-				KEYPAD_6,
-				KEY_RIGHT,
-				KEYPAD_1,
-				KEY_TILDE, // Actually ` and KEYPAD_2
-				KEYPAD_3,
-				KEYPAD_0,
-				KEY_DELETE,
-				KEY_PAUSE,
-				KEY_INSERT,
-				KEYPAD_PERIOD,
-				KEYPAD_ENTER,
-				KEY_HOME,
-				KEY_F11,
-				KEY_F12, // 0x5A
-};
-
-
-
-
-
+// See files for full layout descriptions
+#include "budkeypad.h"
+#include "heathzenith.h"
+#include "tandy1000.h"
 
 
-//static uint8_t    keypad_modifierMask[] = {};
-//static uint8_t  keyboard_modifierMask[] = { 1, 17, 33, 49 };
-//static uint8_t alternate_modifierMask[] = { 1, 17, 33, 49, 62 };
-
-// Default 1-indexed key mappings
-/*
-static uint8_t keypadDefaultMap[] = { 0,
-				KEYPAD_7,
-				KEYPAD_8,
-				KEYPAD_9,
-				KEYPAD_SLASH,
-				KEYPAD_4,
-				KEYPAD_5,
-				KEYPAD_6,
-				KEYPAD_ASTERIX,
-				KEYPAD_1,
-				KEYPAD_2,
-				KEYPAD_3,
-				KEYPAD_MINUS,
-				KEYPAD_ENTER,
-				KEYPAD_0,
-				KEYPAD_PERIOD,
-				KEYPAD_PLUS };
-static uint8_t defaultMap[] = { 0,
-				KEY_GUI,
-				KEY_1,
-				KEY_2,
-				KEY_3,
-				KEY_4,
-				KEY_5,
-				KEY_6,
-				KEY_7,
-				KEY_8,
-				KEY_9,
-				KEY_0,
-				KEY_MINUS,
-				KEY_EQUAL,
-				KEY_BACKSLASH,
-				KEY_TILDE,
-				KEY_BACKSPACE,
-				KEY_ALT,
-				KEY_TAB,
-				KEY_Q,
-				KEY_W,
-				KEY_E,
-				KEY_R,
-				KEY_T,
-				KEY_Y,
-				KEY_U,
-				KEY_I,
-				KEY_O,
-				KEY_P,
-				KEY_LEFT_BRACE,
-				KEY_RIGHT_BRACE,
-				KEY_DELETE,
-				KEY_UP,
-				KEY_CTRL,
-				KEY_CAPS_LLOCK,
-				KEY_A,
-				KEY_S,
-				KEY_D,
-				KEY_F,
-				KEY_G,
-				KEY_H,
-				KEY_J,
-				KEY_K,
-				KEY_L,
-				KEY_SEMICOLON,
-				KEY_QUOTE,
-				KEY_ENTER,
-				KEY_DOWN,
-				KEY_ESC,
-				KEY_LEFT_SHIFT,
-				KEY_Z,
-				KEY_X,
-				KEY_C,
-				KEY_V,
-				KEY_B,
-				KEY_N,
-				KEY_M,
-				KEY_COMMA,
-				KEY_PERIOD,
-				KEY_SLASH,
-				KEY_RIGHT_SHIFT,
-				KEY_LEFT,
-				KEY_RIGHT,
-				KEY_SPACE };
-*/
-/*
-static uint8_t navigationMap[] = { 0,
-				KEY_GUI,
-				KEY_F1,
-				KEY_F2,
-				KEY_F3,
-				KEY_F4,
-				KEY_F5,
-				KEY_F6,
-				KEY_F7,
-				KEY_F8,
-				KEY_F9,
-				KEY_F10,
-				KEY_F11,
-				KEY_F12,
-				KEY_INSERT,
-				KEY_DELETE,
-				KEY_BACKSPACE,
-				KEY_ALT,
-				KEY_CAPS_LOCK,
-				0,
-				0,
-				0,
-				0,
-				0,
-				0,
-				0,
-				KEY_SYSREQ_ATT,
-				KEY_SCROLL_LOCK,
-				KEY_PAUSE,
-				KEY_UP,
-				0,
-				0,
-				0,
-				KEY_CTRL,
-				KEY_CAPS_LLOCK,
-				0,
-				0,
-				0,
-				0,
-				0,
-				KEYPAD_ASTERIX,
-				KEYPAD_SLASH,
-				KEY_HOME,
-				KEY_PAGE_UP,
-				KEY_LEFT,
-				KEY_RIGHT,
-				KEY_ENTER,
-				0,
-				KEY_ESC,
-				KEY_LEFT_SHIFT,
-				0,
-				0,
-				0,
-				0,
-				0,
-				KEYPAD_PLUS,
-				KEYPAD_MINUS,
-				KEY_END,
-				KEY_PAGE_DOWN,
-				KEY_DOWN,
-				KEY_RIGHT_SHIFT,
-				165,
-				KEY_RIGHT_ALT,
-				KEY_SPACE };
-
-static uint8_t colemakMap[] = { 0,
-				KEY_GUI,
-				KEY_1,
-				KEY_2,
-				KEY_3,
-				KEY_4,
-				KEY_5,
-				KEY_6,
-				KEY_7,
-				KEY_8,
-				KEY_9,
-				KEY_0,
-				KEY_MINUS,
-				KEY_EQUAL,
-				KEY_BACKSLASH,
-				KEY_TILDE,
-				KEY_BACKSPACE,
-				KEY_ALT,
-				KEY_TAB,
-				KEY_Q,
-				KEY_W,
-				KEY_F,
-				KEY_P,
-				KEY_G,
-				KEY_J,
-				KEY_L,
-				KEY_U,
-				KEY_Y,
-				KEY_SEMICOLON,
-				KEY_LEFT_BRACE,
-				KEY_RIGHT_BRACE,
-				KEY_DELETE,
-				KEY_PAGE_UP,
-				KEY_CTRL,
-				KEY_CAPS_LLOCK,
-				KEY_A,
-				KEY_R,
-				KEY_S,
-				KEY_T,
-				KEY_D,
-				KEY_H,
-				KEY_N,
-				KEY_E,
-				KEY_I,
-				KEY_O,
-				KEY_QUOTE,
-				KEY_ENTER,
-				KEY_PAGE_DOWN,
-				KEY_ESC,
-				KEY_LEFT_SHIFT,
-				KEY_Z,
-				KEY_X,
-				KEY_C,
-				KEY_V,
-				KEY_B,
-				KEY_K,
-				KEY_M,
-				KEY_COMMA,
-				KEY_PERIOD,
-				KEY_SLASH,
-				KEY_RIGHT_SHIFT,
-				165,
-				KEY_RIGHT_ALT,
-				KEY_SPACE };
-*/
 
 // Only ignore unused warnings for the above variables
 #pragma GCC diagnostic pop
 
+
+
 #endif
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Keymap/tandy1000.h	Sun Oct 16 01:18:08 2011 -0700
@@ -0,0 +1,221 @@
+/* Copyright (C) 2011 by Jacob Alexander
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __TANDY1000_H
+#define __TANDY1000_H
+
+// This file contains various key layouts for the Tandy 1000 keyboard
+
+
+// ----- Variables -----
+
+static uint8_t tandy1000_modifierMask[] = { 0x1D, 0x2A, 0x36, 0x38, 0x46 };
+
+static uint8_t tandy1000_map[] = { 0,
+				KEY_ESC,
+				KEY_1,
+				KEY_2,
+				KEY_3,
+				KEY_4,
+				KEY_5,
+				KEY_6,
+				KEY_7,
+				KEY_8,
+				KEY_9,
+				KEY_0,
+				KEY_MINUS,
+				KEY_EQUAL,
+				KEY_BACKSPACE,
+				KEY_TAB,
+				KEY_Q,
+				KEY_W,
+				KEY_E,
+				KEY_R,
+				KEY_T,
+				KEY_Y,
+				KEY_U,
+				KEY_I,
+				KEY_O,
+				KEY_P,
+				KEY_LEFT_BRACE,
+				KEY_RIGHT_BRACE,
+				KEY_ENTER,
+				KEY_CTRL, // 0x1D
+				KEY_A,
+				KEY_S,
+				KEY_D,
+				KEY_F,
+				KEY_G,
+				KEY_H,
+				KEY_J,
+				KEY_K,
+				KEY_L,
+				KEY_SEMICOLON,
+				KEY_QUOTE,
+				KEY_UP,
+				KEY_LEFT_SHIFT, // 0x2A
+				KEY_LEFT,
+				KEY_Z,
+				KEY_X,
+				KEY_C,
+				KEY_V,
+				KEY_B,
+				KEY_N,
+				KEY_M,
+				KEY_COMMA,
+				KEY_PERIOD,
+				KEY_SLASH,
+				KEY_RIGHT_SHIFT, // 0x36
+				KEY_PRINTSCREEN,
+				KEY_ALT, // 0x38
+				KEY_SPACE,
+				KEY_CAPS_LOCK,
+				KEY_F1,
+				KEY_F2,
+				KEY_F3,
+				KEY_F4,
+				KEY_F5,
+				KEY_F6,
+				KEY_F7,
+				KEY_F8,
+				KEY_F9,
+				KEY_F10,
+				KEY_NUM_LOCK,
+				KEY_GUI, // Actually Hold... 0x48
+				KEY_BACKSLASH, // Also KEYPAD_7
+				KEY_TILDE, // Also KEYPAD_8
+				KEYPAD_9,
+				KEY_UP,
+				KEY_BACKSLASH, // Actually | and KEYPAD_4
+				KEYPAD_5,
+				KEYPAD_6,
+				KEY_RIGHT,
+				KEYPAD_1,
+				KEY_TILDE, // Actually ` and KEYPAD_2
+				KEYPAD_3,
+				KEYPAD_0,
+				KEY_DELETE,
+				KEY_PAUSE,
+				KEY_INSERT,
+				KEYPAD_PERIOD,
+				KEYPAD_ENTER,
+				KEY_HOME,
+				KEY_F11,
+				KEY_F12, // 0x5A
+};
+
+static uint8_t tandy1000_colemak[] = { 0,
+				KEY_ESC,
+				KEY_1,
+				KEY_2,
+				KEY_3,
+				KEY_4,
+				KEY_5,
+				KEY_6,
+				KEY_7,
+				KEY_8,
+				KEY_9,
+				KEY_0,
+				KEY_MINUS,
+				KEY_EQUAL,
+				KEY_BACKSPACE,
+				KEY_TAB,
+				KEY_Q,
+				KEY_W,
+				KEY_F,
+				KEY_P,
+				KEY_G,
+				KEY_J,
+				KEY_L,
+				KEY_U,
+				KEY_Y,
+				KEY_SEMICOLON,
+				KEY_LEFT_BRACE,
+				KEY_RIGHT_BRACE,
+				KEY_ENTER,
+				KEY_CTRL, // 0x1D
+				KEY_A,
+				KEY_R,
+				KEY_S,
+				KEY_T,
+				KEY_D,
+				KEY_H,
+				KEY_N,
+				KEY_E,
+				KEY_I,
+				KEY_O,
+				KEY_QUOTE,
+				KEY_UP,
+				KEY_LEFT_SHIFT, // 0x2A
+				KEY_LEFT,
+				KEY_Z,
+				KEY_X,
+				KEY_C,
+				KEY_V,
+				KEY_B,
+				KEY_K,
+				KEY_M,
+				KEY_COMMA,
+				KEY_PERIOD,
+				KEY_SLASH,
+				KEY_RIGHT_SHIFT, // 0x36
+				KEY_PRINTSCREEN,
+				KEY_ALT, // 0x38
+				KEY_SPACE,
+				0, //KEY_CAPS_LOCK,
+				KEY_F1,
+				KEY_F2,
+				KEY_F3,
+				KEY_F4,
+				KEY_F5,
+				KEY_F6,
+				KEY_F7,
+				KEY_F8,
+				KEY_F9,
+				KEY_F10,
+				0, //KEY_NUM_LOCK,
+				KEY_GUI, // Actually Hold... 0x48
+				KEY_BACKSLASH, // Also KEYPAD_7
+				KEY_TILDE, // Also KEYPAD_8
+				KEYPAD_9,
+				KEY_DOWN,
+				KEY_BACKSLASH, // Actually | and KEYPAD_4
+				KEYPAD_5,
+				KEYPAD_6,
+				KEY_RIGHT,
+				KEYPAD_1,
+				KEY_TILDE, // Actually ` and KEYPAD_2
+				KEYPAD_3,
+				KEYPAD_0,
+				KEY_DELETE,
+				KEY_PAUSE,
+				KEY_INSERT,
+				KEYPAD_PERIOD,
+				KEYPAD_ENTER,
+				KEY_HOME,
+				KEY_F11,
+				KEY_F12, // 0x5A
+};
+
+
+
+#endif
+
--- a/Scan/matrix/setup.cmake	Sun Oct 16 00:45:10 2011 -0700
+++ b/Scan/matrix/setup.cmake	Sun Oct 16 01:18:08 2011 -0700
@@ -24,7 +24,8 @@
 
 #| Keymap Settings
 add_definitions(
-	-DMODIFIER_MASK=tandy1000_modifierMask
-	-DKEYINDEX_MASK=tandy1000_colemak
+	-DMODIFIER_MASK=budkeypad_ModifierMask
+	#-DKEYINDEX_MASK=budkeypad_TheProfosistMap
+	-DKEYINDEX_MASK=budkeypad_DefaultMap
 )