From: Jacob Alexander <haata@kiibohd.com>
Date: Fri, 12 Feb 2016 06:56:25 +0000 (-0800)
Subject: Changed name from MD1_1 to MD1.1
X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-controller.git;a=commitdiff_plain;h=1fd19c48eac0d7fd8834aa91783385c2844dca9a

Changed name from MD1_1 to MD1.1
---

diff --git a/Scan/MD1.1/defaultMap.kll b/Scan/MD1.1/defaultMap.kll
new file mode 100644
index 0000000..f60a4ed
--- /dev/null
+++ b/Scan/MD1.1/defaultMap.kll
@@ -0,0 +1,134 @@
+Name = MD1.1;
+Version = 0.3d;
+Author = "HaaTa (Jacob Alexander) 2014-2016";
+KLL = 0.3c;
+
+# Modified Date
+Date = 2016-02-06;
+
+
+S0x00 : U"Esc";
+S0x01 : U"1";
+S0x02 : U"2";
+S0x03 : U"3";
+S0x04 : U"4";
+S0x05 : U"5";
+S0x06 : U"6";
+S0x07 : U"7";
+S0x08 : U"8";
+S0x09 : U"9";
+S0x0A : U"0";
+S0x0B : U"Minus";
+S0x0C : U"Equal";
+S0x0D : U"Backslash";
+S0x0E : U"Backtick";
+S0x0F : U"Tab";
+S0x10 : U"Q";
+S0x11 : U"W";
+S0x12 : U"E";
+S0x13 : U"R";
+S0x14 : U"T";
+S0x15 : U"Y";
+S0x16 : U"U";
+S0x17 : U"I";
+S0x18 : U"O";
+S0x19 : U"P";
+S0x1A : U"LBrace";
+S0x1B : U"RBrace";
+S0x1C : U"Backspace";
+S0x1D : U"Ctrl";
+S0x1E : U"A";
+S0x1F : U"S";
+S0x20 : U"D";
+S0x21 : U"F";
+S0x22 : U"G";
+S0x23 : U"H";
+S0x24 : U"J";
+S0x25 : U"K";
+S0x26 : U"L";
+S0x27 : U"Semicolon";
+S0x28 : U"Quote";
+S0x29 : U"Enter";
+S0x2A : U"LShift";
+S0x2B : U"Z";
+S0x2C : U"X";
+S0x2D : U"C";
+S0x2E : U"V";
+S0x2F : U"B";
+S0x30 : U"N";
+S0x31 : U"M";
+S0x32 : U"Comma";
+S0x33 : U"Period";
+S0x34 : U"Slash";
+S0x35 : U"RShift";
+S0x36 : U"Function1"; # Fun key
+S0x37 : U"Function2"; # Left Blank Key
+S0x38 : U"LAlt";
+S0x39 : U"LGui";
+S0x3A : U"Space";
+S0x3B : U"RGui";
+S0x3C : U"RAlt";
+S0x3D : U"Function3"; # Right Blank Key 1
+S0x3E : U"Function4"; # Right Blank Key 2
+
+
+# Custom Action Examples
+
+# Example capability, prints to cli
+action1 => CustomAction_action1_capability(); # No arguments
+
+# Blocks given USB Code, must be used with blockLink
+# Simple example, supports only blocking a single key at a time
+# Keys must be specified using numbers see Macro/PartialMap/usb_hid.h
+blockHold => CustomAction_blockHold_capability( usbCode : 1 ); # Single 8-bit argument
+blockKey => CustomAction_blockKey_capability( usbCode : 1 );
+
+
+
+# Defines available to the MD1_1 Scan Module
+
+# LED Default Enable Mask Override
+#
+# Each LED is represented by a single bit
+# See (http://www.issi.com/WW/pdf/31FL3731C.pdf) for details
+ISSILedMask1 = "
+	0xFF, 0x00, /* C1-1 -> C1-16 */
+	0xFF, 0x00, /* C2-1 -> C2-16 */
+	0xFF, 0x00, /* C3-1 -> C3-16 */
+	0xFF, 0x00, /* C4-1 -> C4-16 */
+	0xFF, 0x00, /* C5-1 -> C5-16 */
+	0xFF, 0x00, /* C6-1 -> C6-16 */
+	0xFF, 0x00, /* C7-1 -> C7-16 */
+	0x7F, 0x00, /* C8-1 -> C8-16 */
+	0x00, 0x00, /* C9-1 -> C9-16 */
+";
+
+# LED Brightness Override
+#
+# Each LED channel supports 256 levels (8-bit control)
+# By default, LEDs are set to 0 brightness
+#ISSILedBrightness1 = "
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */
+#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */
+#";
+
+# Full brightness example
+ISSILedBrightness1 = "
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */
+";
+
diff --git a/Scan/MD1.1/matrix.h b/Scan/MD1.1/matrix.h
new file mode 100644
index 0000000..ca33a52
--- /dev/null
+++ b/Scan/MD1.1/matrix.h
@@ -0,0 +1,56 @@
+/* Copyright (C) 2014-2016 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.
+ */
+
+#pragma once
+
+// ----- Includes -----
+
+// Project Includes
+#include <matrix_setup.h>
+
+
+
+// ----- Matrix Definition -----
+
+// Freescale ARM MK20's support GPIO PTA, PTB, PTC, PTD and PTE 0..31
+// Not all chips have access to all of these pins (most don't have 160 pins :P)
+//
+// NOTE:
+// Before using a pin, make sure it supports being a GPIO *and* doesn't have a default pull-up/pull-down
+// Checking this is completely on the ownness of the user
+
+// MD1
+//
+// Columns (Strobe)
+//  PTB0..3,16,17
+//  PTC4,5
+//  PTD0
+//
+// Rows (Sense)
+//  PTD1..7
+
+// Define Rows (Sense) and Columns (Strobes)
+GPIO_Pin Matrix_cols[] = { gpio(C,0), gpio(C,1), gpio(C,2), gpio(C,3), gpio(C,4), gpio(C,5), gpio(C,6), gpio(C,7), gpio(D,0) };
+GPIO_Pin Matrix_rows[] = { gpio(D,1), gpio(D,2), gpio(D,3), gpio(D,4), gpio(D,5), gpio(D,6), gpio(D,7) };
+
+// Define type of scan matrix
+Config Matrix_type = Config_Pulldown;
+
diff --git a/Scan/MD1.1/pinout b/Scan/MD1.1/pinout
new file mode 100644
index 0000000..4b40fe9
--- /dev/null
+++ b/Scan/MD1.1/pinout
@@ -0,0 +1,93 @@
+Pin Usage
+=========
+
+mk20dx128vlf5
+
+ ----
+|Keys|
+ ----
+
+* Strobe (Columns)
+
+TODO
+
+
+* Sense (Rows)
+
+PTD1
+PTD2
+PTD3
+PTD4
+PTD5
+PTD6
+PTD7
+
+
+ ---
+|I2C|
+ ---
+
+* IS31FL3731C
+
+PTB0  - SCL0 (add header pin, label as SCL0)
+PTB1  - SDA0 (add header pin, label as SDA0)
+PTB17 - INTB Chip 1
+PTB16 - SDB (tied to all Chips, hardware shutdown)
+
+
+ -----
+|Debug|
+ -----
+
+* SWD
+
+PTA0 (Pull-down)
+PTA3 (Pull-up)
+
+* LEDs
+
+PTA19 (LED only for PCB, not McHCK) (XTAL)
+
+* UARTs
+
+PTA1 - RX0
+PTA2 - TX0
+
+* Tag Connect
+
+1  - Vdd +5
+2  - PTA3 / SWD_IO
+3  - Vss / Gnd
+4  - PTA0 / SWD_CLK
+5  - +5V
+6  - PTA2 / TRACE_SWO
+7  - N/C
+8  - PTA1 / JTAG_TDI
+9  - N/C
+10 - Reset_b
+
+
+ ------
+|Unused|
+ ------
+
+* GPIO
+
+PTA1 (Not broken out on PCB, available on McHCK) (Pull-up)
+PTA2 (")
+PTA4 (Pull-up)
+PTA18 (EXTAL)
+
+PTC0
+PTC1
+PTC2
+PTC3
+PTC6
+PTC7
+
+* Analog
+
+ADC0_DP0
+ADC0_DM0
+
+
diff --git a/Scan/MD1.1/scan_loop.c b/Scan/MD1.1/scan_loop.c
new file mode 100644
index 0000000..74218a0
--- /dev/null
+++ b/Scan/MD1.1/scan_loop.c
@@ -0,0 +1,168 @@
+/* Copyright (C) 2014,2016 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.
+ */
+
+// ----- Includes -----
+
+// Compiler Includes
+#include <Lib/ScanLib.h>
+
+// Project Includes
+#include <cli.h>
+#include <led.h>
+#include <led_scan.h>
+#include <print.h>
+#include <matrix_scan.h>
+#include <macro.h>
+#include <output_com.h>
+
+// Local Includes
+#include "scan_loop.h"
+
+
+
+// ----- Function Declarations -----
+
+// ----- Variables -----
+
+// Number of scans since the last USB send
+uint16_t Scan_scanCount = 0;
+
+
+
+// ----- Functions -----
+
+// Setup
+inline void Scan_setup()
+{
+	// Setup GPIO pins for matrix scanning
+	Matrix_setup();
+
+	// Setup ISSI chip to control the leds
+	LED_setup();
+
+	// Reset scan count
+	Scan_scanCount = 0;
+}
+
+
+// Main Detection Loop
+inline uint8_t Scan_loop()
+{
+	Matrix_scan( Scan_scanCount++ );
+
+	// Process any LED events
+	LED_scan();
+
+	return 0;
+}
+
+
+// Signal from Macro Module that all keys have been processed (that it knows about)
+inline void Scan_finishedWithMacro( uint8_t sentKeys )
+{
+}
+
+
+// Signal from Output Module that all keys have been processed (that it knows about)
+inline void Scan_finishedWithOutput( uint8_t sentKeys )
+{
+	// Reset scan loop indicator (resets each key debounce state)
+	// TODO should this occur after USB send or Macro processing?
+	Scan_scanCount = 0;
+}
+
+
+
+// ----- Capabilities -----
+
+// Custom capability examples
+// Refer to kll.h in Macros/PartialMap for state and stateType information
+void CustomAction_action1_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+	// Display capability name
+	// XXX This is required for debug cli to give you a list of capabilities
+	if ( stateType == 0xFF && state == 0xFF )
+	{
+		print("CustomAction_action1_capability()");
+		return;
+	}
+
+	// Prints Action1 info message to the debug cli
+	info_print("Action1");
+}
+
+uint8_t CustomAction_blockHold_storage = 0;
+void CustomAction_blockHold_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+	// Display capability name
+	if ( stateType == 0xFF && state == 0xFF )
+	{
+		print("CustomAction_blockHold_capability(usbCode)");
+		return;
+	}
+
+	// Retrieve 8-bit argument
+	uint8_t key = args[0];
+
+	// We only care about normal keys
+	if ( stateType == 0x00 )
+	{
+		// Block given key if we're in the "Press" or "Hold" state
+		if ( ( state == 0x01 || state == 0x02 )
+			&& CustomAction_blockHold_storage == 0 )
+		{
+			CustomAction_blockHold_storage = key;
+			info_msg("Blocking Key: ");
+			printHex( key );
+			print( NL );
+		}
+		// Release if in the "Off" or "Release" state and we're blocking
+		else if ( ( state == 0x00 || state == 0x03 )
+			&& key == CustomAction_blockHold_storage )
+		{
+			info_msg("Unblocking Key: ");
+			printHex( CustomAction_blockHold_storage );
+			print( NL );
+			CustomAction_blockHold_storage = 0;
+		}
+	}
+}
+
+void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+	// Display capability name
+	if ( stateType == 0xFF && state == 0xFF )
+	{
+		print("CustomAction_blockKey_capability(usbCode)");
+		return;
+	}
+
+	// Retrieve 8-bit argument
+	uint8_t key = args[0];
+
+	// If key is not blocked, process
+	if ( key != CustomAction_blockHold_storage )
+	{
+		extern void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+		Output_usbCodeSend_capability( state, stateType, &key );
+	}
+}
+
diff --git a/Scan/MD1.1/scan_loop.h b/Scan/MD1.1/scan_loop.h
new file mode 100644
index 0000000..0c89838
--- /dev/null
+++ b/Scan/MD1.1/scan_loop.h
@@ -0,0 +1,48 @@
+/* Copyright (C) 2014-2015 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.
+ */
+
+#pragma once
+
+// ----- Includes -----
+
+// Compiler Includes
+#include <stdint.h>
+
+
+
+// ----- Functions -----
+
+// Functions to be called by main.c
+void Scan_setup( void );
+uint8_t Scan_loop( void );
+
+// Call-backs
+void Scan_finishedWithMacro( uint8_t sentKeys );  // Called by Macro Module
+void Scan_finishedWithOutput( uint8_t sentKeys ); // Called by Output Module
+
+
+// ----- Capabilities -----
+
+// Example capabilities
+void CustomAction_action1_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void CustomAction_blockHold_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+
diff --git a/Scan/MD1.1/setup.cmake b/Scan/MD1.1/setup.cmake
new file mode 100644
index 0000000..5ca7607
--- /dev/null
+++ b/Scan/MD1.1/setup.cmake
@@ -0,0 +1,33 @@
+###| CMake Kiibohd Controller Scan Module |###
+#
+# Written by Jacob Alexander in 2014,2016 for the Kiibohd Controller
+#
+# Released into the Public Domain
+#
+###
+
+
+###
+# Required Submodules
+#
+
+AddModule ( Scan ISSILed )
+AddModule ( Scan MatrixARM )
+
+
+###
+# Module C files
+#
+
+set ( Module_SRCS
+	scan_loop.c
+)
+
+
+###
+# Compiler Family Compatibility
+#
+set ( ModuleCompatibility
+	arm
+)
+
diff --git a/Scan/MD1_1/defaultMap.kll b/Scan/MD1_1/defaultMap.kll
deleted file mode 100644
index df51d82..0000000
--- a/Scan/MD1_1/defaultMap.kll
+++ /dev/null
@@ -1,134 +0,0 @@
-Name = MD1_1;
-Version = 0.3d;
-Author = "HaaTa (Jacob Alexander) 2014-2016";
-KLL = 0.3c;
-
-# Modified Date
-Date = 2016-02-06;
-
-
-S0x00 : U"Esc";
-S0x01 : U"1";
-S0x02 : U"2";
-S0x03 : U"3";
-S0x04 : U"4";
-S0x05 : U"5";
-S0x06 : U"6";
-S0x07 : U"7";
-S0x08 : U"8";
-S0x09 : U"9";
-S0x0A : U"0";
-S0x0B : U"Minus";
-S0x0C : U"Equal";
-S0x0D : U"Backslash";
-S0x0E : U"Backtick";
-S0x0F : U"Tab";
-S0x10 : U"Q";
-S0x11 : U"W";
-S0x12 : U"E";
-S0x13 : U"R";
-S0x14 : U"T";
-S0x15 : U"Y";
-S0x16 : U"U";
-S0x17 : U"I";
-S0x18 : U"O";
-S0x19 : U"P";
-S0x1A : U"LBrace";
-S0x1B : U"RBrace";
-S0x1C : U"Backspace";
-S0x1D : U"Ctrl";
-S0x1E : U"A";
-S0x1F : U"S";
-S0x20 : U"D";
-S0x21 : U"F";
-S0x22 : U"G";
-S0x23 : U"H";
-S0x24 : U"J";
-S0x25 : U"K";
-S0x26 : U"L";
-S0x27 : U"Semicolon";
-S0x28 : U"Quote";
-S0x29 : U"Enter";
-S0x2A : U"LShift";
-S0x2B : U"Z";
-S0x2C : U"X";
-S0x2D : U"C";
-S0x2E : U"V";
-S0x2F : U"B";
-S0x30 : U"N";
-S0x31 : U"M";
-S0x32 : U"Comma";
-S0x33 : U"Period";
-S0x34 : U"Slash";
-S0x35 : U"RShift";
-S0x36 : U"Function1"; # Fun key
-S0x37 : U"Function2"; # Left Blank Key
-S0x38 : U"LAlt";
-S0x39 : U"LGui";
-S0x3A : U"Space";
-S0x3B : U"RGui";
-S0x3C : U"RAlt";
-S0x3D : U"Function3"; # Right Blank Key 1
-S0x3E : U"Function4"; # Right Blank Key 2
-
-
-# Custom Action Examples
-
-# Example capability, prints to cli
-action1 => CustomAction_action1_capability(); # No arguments
-
-# Blocks given USB Code, must be used with blockLink
-# Simple example, supports only blocking a single key at a time
-# Keys must be specified using numbers see Macro/PartialMap/usb_hid.h
-blockHold => CustomAction_blockHold_capability( usbCode : 1 ); # Single 8-bit argument
-blockKey => CustomAction_blockKey_capability( usbCode : 1 );
-
-
-
-# Defines available to the MD1_1 Scan Module
-
-# LED Default Enable Mask Override
-#
-# Each LED is represented by a single bit
-# See (http://www.issi.com/WW/pdf/31FL3731C.pdf) for details
-ISSILedMask1 = "
-	0xFF, 0x00, /* C1-1 -> C1-16 */
-	0xFF, 0x00, /* C2-1 -> C2-16 */
-	0xFF, 0x00, /* C3-1 -> C3-16 */
-	0xFF, 0x00, /* C4-1 -> C4-16 */
-	0xFF, 0x00, /* C5-1 -> C5-16 */
-	0xFF, 0x00, /* C6-1 -> C6-16 */
-	0xFF, 0x00, /* C7-1 -> C7-16 */
-	0x7F, 0x00, /* C8-1 -> C8-16 */
-	0x00, 0x00, /* C9-1 -> C9-16 */
-";
-
-# LED Brightness Override
-#
-# Each LED channel supports 256 levels (8-bit control)
-# By default, LEDs are set to 0 brightness
-#ISSILedBrightness1 = "
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */
-#0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */
-#";
-
-# Full brightness example
-ISSILedBrightness1 = "
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */
-";
-
diff --git a/Scan/MD1_1/matrix.h b/Scan/MD1_1/matrix.h
deleted file mode 100644
index ca33a52..0000000
--- a/Scan/MD1_1/matrix.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2014-2016 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.
- */
-
-#pragma once
-
-// ----- Includes -----
-
-// Project Includes
-#include <matrix_setup.h>
-
-
-
-// ----- Matrix Definition -----
-
-// Freescale ARM MK20's support GPIO PTA, PTB, PTC, PTD and PTE 0..31
-// Not all chips have access to all of these pins (most don't have 160 pins :P)
-//
-// NOTE:
-// Before using a pin, make sure it supports being a GPIO *and* doesn't have a default pull-up/pull-down
-// Checking this is completely on the ownness of the user
-
-// MD1
-//
-// Columns (Strobe)
-//  PTB0..3,16,17
-//  PTC4,5
-//  PTD0
-//
-// Rows (Sense)
-//  PTD1..7
-
-// Define Rows (Sense) and Columns (Strobes)
-GPIO_Pin Matrix_cols[] = { gpio(C,0), gpio(C,1), gpio(C,2), gpio(C,3), gpio(C,4), gpio(C,5), gpio(C,6), gpio(C,7), gpio(D,0) };
-GPIO_Pin Matrix_rows[] = { gpio(D,1), gpio(D,2), gpio(D,3), gpio(D,4), gpio(D,5), gpio(D,6), gpio(D,7) };
-
-// Define type of scan matrix
-Config Matrix_type = Config_Pulldown;
-
diff --git a/Scan/MD1_1/pinout b/Scan/MD1_1/pinout
deleted file mode 100644
index 4b40fe9..0000000
--- a/Scan/MD1_1/pinout
+++ /dev/null
@@ -1,93 +0,0 @@
-Pin Usage
-=========
-
-mk20dx128vlf5
-
- ----
-|Keys|
- ----
-
-* Strobe (Columns)
-
-TODO
-
-
-* Sense (Rows)
-
-PTD1
-PTD2
-PTD3
-PTD4
-PTD5
-PTD6
-PTD7
-
-
- ---
-|I2C|
- ---
-
-* IS31FL3731C
-
-PTB0  - SCL0 (add header pin, label as SCL0)
-PTB1  - SDA0 (add header pin, label as SDA0)
-PTB17 - INTB Chip 1
-PTB16 - SDB (tied to all Chips, hardware shutdown)
-
-
- -----
-|Debug|
- -----
-
-* SWD
-
-PTA0 (Pull-down)
-PTA3 (Pull-up)
-
-* LEDs
-
-PTA19 (LED only for PCB, not McHCK) (XTAL)
-
-* UARTs
-
-PTA1 - RX0
-PTA2 - TX0
-
-* Tag Connect
-
-1  - Vdd +5
-2  - PTA3 / SWD_IO
-3  - Vss / Gnd
-4  - PTA0 / SWD_CLK
-5  - +5V
-6  - PTA2 / TRACE_SWO
-7  - N/C
-8  - PTA1 / JTAG_TDI
-9  - N/C
-10 - Reset_b
-
-
- ------
-|Unused|
- ------
-
-* GPIO
-
-PTA1 (Not broken out on PCB, available on McHCK) (Pull-up)
-PTA2 (")
-PTA4 (Pull-up)
-PTA18 (EXTAL)
-
-PTC0
-PTC1
-PTC2
-PTC3
-PTC6
-PTC7
-
-* Analog
-
-ADC0_DP0
-ADC0_DM0
-
-
diff --git a/Scan/MD1_1/scan_loop.c b/Scan/MD1_1/scan_loop.c
deleted file mode 100644
index 74218a0..0000000
--- a/Scan/MD1_1/scan_loop.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Copyright (C) 2014,2016 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.
- */
-
-// ----- Includes -----
-
-// Compiler Includes
-#include <Lib/ScanLib.h>
-
-// Project Includes
-#include <cli.h>
-#include <led.h>
-#include <led_scan.h>
-#include <print.h>
-#include <matrix_scan.h>
-#include <macro.h>
-#include <output_com.h>
-
-// Local Includes
-#include "scan_loop.h"
-
-
-
-// ----- Function Declarations -----
-
-// ----- Variables -----
-
-// Number of scans since the last USB send
-uint16_t Scan_scanCount = 0;
-
-
-
-// ----- Functions -----
-
-// Setup
-inline void Scan_setup()
-{
-	// Setup GPIO pins for matrix scanning
-	Matrix_setup();
-
-	// Setup ISSI chip to control the leds
-	LED_setup();
-
-	// Reset scan count
-	Scan_scanCount = 0;
-}
-
-
-// Main Detection Loop
-inline uint8_t Scan_loop()
-{
-	Matrix_scan( Scan_scanCount++ );
-
-	// Process any LED events
-	LED_scan();
-
-	return 0;
-}
-
-
-// Signal from Macro Module that all keys have been processed (that it knows about)
-inline void Scan_finishedWithMacro( uint8_t sentKeys )
-{
-}
-
-
-// Signal from Output Module that all keys have been processed (that it knows about)
-inline void Scan_finishedWithOutput( uint8_t sentKeys )
-{
-	// Reset scan loop indicator (resets each key debounce state)
-	// TODO should this occur after USB send or Macro processing?
-	Scan_scanCount = 0;
-}
-
-
-
-// ----- Capabilities -----
-
-// Custom capability examples
-// Refer to kll.h in Macros/PartialMap for state and stateType information
-void CustomAction_action1_capability( uint8_t state, uint8_t stateType, uint8_t *args )
-{
-	// Display capability name
-	// XXX This is required for debug cli to give you a list of capabilities
-	if ( stateType == 0xFF && state == 0xFF )
-	{
-		print("CustomAction_action1_capability()");
-		return;
-	}
-
-	// Prints Action1 info message to the debug cli
-	info_print("Action1");
-}
-
-uint8_t CustomAction_blockHold_storage = 0;
-void CustomAction_blockHold_capability( uint8_t state, uint8_t stateType, uint8_t *args )
-{
-	// Display capability name
-	if ( stateType == 0xFF && state == 0xFF )
-	{
-		print("CustomAction_blockHold_capability(usbCode)");
-		return;
-	}
-
-	// Retrieve 8-bit argument
-	uint8_t key = args[0];
-
-	// We only care about normal keys
-	if ( stateType == 0x00 )
-	{
-		// Block given key if we're in the "Press" or "Hold" state
-		if ( ( state == 0x01 || state == 0x02 )
-			&& CustomAction_blockHold_storage == 0 )
-		{
-			CustomAction_blockHold_storage = key;
-			info_msg("Blocking Key: ");
-			printHex( key );
-			print( NL );
-		}
-		// Release if in the "Off" or "Release" state and we're blocking
-		else if ( ( state == 0x00 || state == 0x03 )
-			&& key == CustomAction_blockHold_storage )
-		{
-			info_msg("Unblocking Key: ");
-			printHex( CustomAction_blockHold_storage );
-			print( NL );
-			CustomAction_blockHold_storage = 0;
-		}
-	}
-}
-
-void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t *args )
-{
-	// Display capability name
-	if ( stateType == 0xFF && state == 0xFF )
-	{
-		print("CustomAction_blockKey_capability(usbCode)");
-		return;
-	}
-
-	// Retrieve 8-bit argument
-	uint8_t key = args[0];
-
-	// If key is not blocked, process
-	if ( key != CustomAction_blockHold_storage )
-	{
-		extern void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-		Output_usbCodeSend_capability( state, stateType, &key );
-	}
-}
-
diff --git a/Scan/MD1_1/scan_loop.h b/Scan/MD1_1/scan_loop.h
deleted file mode 100644
index 0c89838..0000000
--- a/Scan/MD1_1/scan_loop.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 2014-2015 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.
- */
-
-#pragma once
-
-// ----- Includes -----
-
-// Compiler Includes
-#include <stdint.h>
-
-
-
-// ----- Functions -----
-
-// Functions to be called by main.c
-void Scan_setup( void );
-uint8_t Scan_loop( void );
-
-// Call-backs
-void Scan_finishedWithMacro( uint8_t sentKeys );  // Called by Macro Module
-void Scan_finishedWithOutput( uint8_t sentKeys ); // Called by Output Module
-
-
-// ----- Capabilities -----
-
-// Example capabilities
-void CustomAction_action1_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-void CustomAction_blockHold_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t *args );
-
diff --git a/Scan/MD1_1/setup.cmake b/Scan/MD1_1/setup.cmake
deleted file mode 100644
index 5ca7607..0000000
--- a/Scan/MD1_1/setup.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-###| CMake Kiibohd Controller Scan Module |###
-#
-# Written by Jacob Alexander in 2014,2016 for the Kiibohd Controller
-#
-# Released into the Public Domain
-#
-###
-
-
-###
-# Required Submodules
-#
-
-AddModule ( Scan ISSILed )
-AddModule ( Scan MatrixARM )
-
-
-###
-# Module C files
-#
-
-set ( Module_SRCS
-	scan_loop.c
-)
-
-
-###
-# Compiler Family Compatibility
-#
-set ( ModuleCompatibility
-	arm
-)
-