Mercurial > louis > kiibohd-controller

changeset 5:a8be29294c26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updating for the latest pinout
author Jacob Alexander <triplehaata@gmail.com>
date Sun, 13 Mar 2011 19:57:22 -0700
parents b97797936037
children 9df636be6feb
files load main.c
diffstat 2 files changed, 173 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/load	Sun Mar 13 19:57:22 2011 -0700
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#| Loads the hex file onto the teensy++ 2.0
+
+sudo teensy-loader-cli -mmcu=at90usb1286 -w Build/main.hex
+
+exit 0
+
--- a/main.c	Sat Mar 12 17:45:51 2011 -0800
+++ b/main.c	Sun Mar 13 19:57:22 2011 -0700
@@ -32,8 +32,8 @@
 #define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))
 
 // Sleep defined in milliseconds
-#define PRE_DRIVE_SLEEP  10
-#define POST_DRIVE_SLEEP 10
+#define PRE_DRIVE_SLEEP  50
+#define POST_DRIVE_SLEEP 50
 
 
 // Drive Pin Defines
@@ -77,19 +77,20 @@
 #define DETECT_group_11 <blank>
 #define DETECT_group_12 <blank>
 
-#define DETECT_group_size_1 4
-#define DETECT_group_size_2 8
-#define DETECT_group_size_3 8
-#define DETECT_group_size_4 7
+#define DETECT_group_size_1 7
+#define DETECT_group_size_2 7
+#define DETECT_group_size_3 6
+#define DETECT_group_size_4 8
 #define DETECT_group_size_5 7
-#define DETECT_group_size_6 8
-#define DETECT_group_size_7 6
-#define DETECT_group_size_8 7
-#define DETECT_group_size_9 7
+#define DETECT_group_size_6 7
+#define DETECT_group_size_7 8
+#define DETECT_group_size_8 8
+#define DETECT_group_size_9 4
 #define DETECT_group_size_10 <blank>
 #define DETECT_group_size_11 <blank>
 #define DETECT_group_size_12 <blank>
 
+/*
 #define DETECT_group_array_1 {{KEY_ESC,KEY_CTRL,KEY_CAPS_LOCK,KEY_SHIFT},{0,1,0,1}}
 #define DETECT_group_array_2 {{KEY_BACKSPACE,KEY_UP,KEY_DOWN,KEY_A,KEY_INSERT,KEY_ALT,KEY_Z,KEY_RIGHT},{0,0,0,0,0,1,0,0}}
 #define DETECT_group_array_3 {{KEY_TILDE,KEY_DELETE,KEY_LEFT,KEY_SPACE,KEY_X,KEY_S,KEY_TAB,KEY_1},{0,0,0,0,0,0,0,0}}
@@ -99,6 +100,17 @@
 #define DETECT_group_array_7 {{KEY_8,KEY_U,KEY_K,KEY_7,KEY_Y,KEY_COMMA},{0,0,0,0,0,0}}
 #define DETECT_group_array_8 {{KEY_9,KEY_I,KEY_PERIOD,KEY_J,KEY_6,KEY_T,KEY_M},{0,0,0,0,0,0,0}}
 #define DETECT_group_array_9 {{KEY_0,KEY_O,KEY_L,KEY_H,KEY_5,KEY_R,KEY_N},{0,0,0,0,0,0,0}}
+*/
+// Switch Codes
+#define DETECT_group_array_1 {11,27,43,40,6, 22,55}
+#define DETECT_group_array_2 {10,26,58,41,7, 23,56}
+#define DETECT_group_array_3 {9, 25,42,8, 24,57}
+#define DETECT_group_array_4 {12,28,44,39,5, 21,54,59}
+#define DETECT_group_array_5 {13,29,45,38,4, 20,53}
+#define DETECT_group_array_6 {14,30,46,37,3, 19,52}
+#define DETECT_group_array_7 {15,31,61,63,51,36,18,2}
+#define DETECT_group_array_8 {16,32,47,35,1, 17,50,62}
+#define DETECT_group_array_9 {48,34,33,49} // 49/60 are the same line
 #define DETECT_group_array_10 <blank>
 #define DETECT_group_array_11 <blank>
 #define DETECT_group_array_12 <blank>
@@ -114,7 +126,7 @@
 
 #define DD_CASE(number) \
 			case number:\
-				DRIVE_DETECT(DRIVE_reg##_##number, DRIVE_pin##_##number, DETECT_group##_##number)
+				DRIVE_DETECT(DRIVE_reg_##number, DRIVE_pin_##number, DETECT_group_##number)
 
 #define DD_CASE_ORD(number) \
 			DD_CASE(number) \
@@ -129,86 +141,81 @@
 // Detection Macros (Probably don't need to be changed, but depending the matrix, may have to be)
 // Determine if key is either normal or a modifier
 #define DET_GROUP_CHECK(index) \
-			{ \
-			if ( groupArray[1][index] ) \
-				curDetect.modifiers |= groupArray[0][index]; \
-			else \
-				curDetect.keyDetectArray[curDetect.keyDetectCount++] = groupArray[0][index]; \
-			}
+			curDetect.keyDetectArray[curDetect.keyDetectCount++] = groupArray[index];
 
 
 // XXX - Detection Groups
 // Checks each of the specified pins, and then if press detected, determine if the key is normal or a modifier
 // Inverse logic applies for the PINs
 
-// Used for 1 detection group
+// Used for 1 detection group (Special group)
 #define DET_GROUP_1 \
+			if ( !( PINB & (1 << 7) ) ) \
+				DET_GROUP_CHECK(0) \
 			if ( !( PINC & (1 << 0) ) ) \
-				DET_GROUP_CHECK(3) \
-			if ( !( PINE & (1 << 1) ) ) \
+				DET_GROUP_CHECK(1) \
+			if ( !( PIND & (1 << 0) ) ) \
 				DET_GROUP_CHECK(2) \
-			if ( !( PINE & (1 << 0) ) ) \
-				DET_GROUP_CHECK(1) \
-			if ( !( PINB & (1 << 7) ) ) \
-				DET_GROUP_CHECK(0)
+			if ( !( PIND & (1 << 1) ) ) \
+				DET_GROUP_CHECK(3)
 
-// Used for 4 detection groups
+// Used for 4 detection groups (Skips J1 P9)
 #define DET_GROUP_2 \
-			if ( !( PINC & (1 << 0) ) ) \
+			if ( !( PINE & (1 << 7) ) ) \
 				DET_GROUP_CHECK(0) \
-			if ( !( PINC & (1 << 1) ) ) \
+			if ( !( PINB & (1 << 0) ) ) \
 				DET_GROUP_CHECK(1) \
-			if ( !( PINC & (1 << 2) ) ) \
+			if ( !( PINB & (1 << 1) ) ) \
 				DET_GROUP_CHECK(2) \
-			if ( !( PINC & (1 << 3) ) ) \
+			if ( !( PINB & (1 << 2) ) ) \
 				DET_GROUP_CHECK(3) \
-			if ( !( PINC & (1 << 4) ) ) \
+			if ( !( PINB & (1 << 3) ) ) \
 				DET_GROUP_CHECK(4) \
-			if ( !( PINC & (1 << 5) ) ) \
+			if ( !( PINB & (1 << 4) ) ) \
 				DET_GROUP_CHECK(5) \
-			if ( !( PINC & (1 << 6) ) ) \
+			if ( !( PINB & (1 << 5) ) ) \
 				DET_GROUP_CHECK(6) \
 
-// Used for 1 detection group
+// Used for 1 detection group (Skips J1 P6 and J1 P9)
 #define DET_GROUP_3 \
-			if ( !( PINC & (1 << 0) ) ) \
+			if ( !( PINE & (1 << 7) ) ) \
 				DET_GROUP_CHECK(0) \
-			if ( !( PINC & (1 << 1) ) ) \
+			if ( !( PINB & (1 << 0) ) ) \
 				DET_GROUP_CHECK(1) \
-			if ( !( PINC & (1 << 3) ) ) \
+			if ( !( PINB & (1 << 1) ) ) \
 				DET_GROUP_CHECK(2) \
-			if ( !( PINC & (1 << 4) ) ) \
+			if ( !( PINB & (1 << 2) ) ) \
 				DET_GROUP_CHECK(3) \
-			if ( !( PINC & (1 << 5) ) ) \
+			if ( !( PINB & (1 << 4) ) ) \
 				DET_GROUP_CHECK(4) \
-			if ( !( PINC & (1 << 6) ) ) \
+			if ( !( PINB & (1 << 5) ) ) \
 				DET_GROUP_CHECK(5) \
 
-// Used for 3 detection groups
+// Used for 3 detection groups (No skips, except special group 1)
 #define DET_GROUP_4 \
-			if ( !( PINC & (1 << 0) ) ) \
+			if ( !( PINE & (1 << 7) ) ) \
 				DET_GROUP_CHECK(0) \
-			if ( !( PINC & (1 << 1) ) ) \
+			if ( !( PINB & (1 << 0) ) ) \
 				DET_GROUP_CHECK(1) \
-			if ( !( PINC & (1 << 2) ) ) \
+			if ( !( PINB & (1 << 1) ) ) \
 				DET_GROUP_CHECK(2) \
-			if ( !( PINC & (1 << 3) ) ) \
+			if ( !( PINB & (1 << 2) ) ) \
 				DET_GROUP_CHECK(3) \
-			if ( !( PINC & (1 << 4) ) ) \
+			if ( !( PINB & (1 << 3) ) ) \
 				DET_GROUP_CHECK(4) \
-			if ( !( PINC & (1 << 5) ) ) \
+			if ( !( PINB & (1 << 4) ) ) \
 				DET_GROUP_CHECK(5) \
-			if ( !( PINC & (1 << 6) ) ) \
+			if ( !( PINB & (1 << 5) ) ) \
 				DET_GROUP_CHECK(6) \
-			if ( !( PINE & (1 << 1) ) ) \
+			if ( !( PINB & (1 << 6) ) ) \
 				DET_GROUP_CHECK(7) \
 
 // Combines the DET_GROUP_Xs above for the given groupArray
 #define DET_GROUP(group,det_group) \
 			case group: \
 				{ \
-					uint8_t groupArray[2][DETECT_group_size##_##group] = DETECT_group_array##_##group; \
-					DET_GROUP##_##det_group \
+					uint8_t groupArray[DETECT_group_size_##group] = DETECT_group_array_##group; \
+					DET_GROUP_##det_group \
 				} \
 				break;
 
@@ -218,39 +225,92 @@
 	uint8_t modifiers;
 } curDetect, prevDetect;
 
+
+// Scan Code Decoder (for debug)
+void printDecodeScancode( int code )
+{
+	static const uint8_t defaultMap[] = { 0,
+					KEY_INSERT,
+					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_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_LOCK,
+					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 const char* decodeArray[] = { "", "", "", "", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Enter", "Esc", "Backspace", "Tab", "Space", "-_", "=+", "[{", "]}", "\\", "#", ";:", "'\"", "`~", ",<", ".>", "/?", "Caps Lock", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "Print Screen", "Scroll Lock", "Pause", "Insert", "Home", "Page Up", "Delete", "End", "Page Down", "Right", "Left", "Down", "Up", "Num Lock", "K1", "K2", "K3", "K4", "K5", "K6", "K7", "K8", "K9", "K0", "K." };
+	print_P( decodeArray[ defaultMap[code] ] );
+}
+
 void detection( int group )
 {
 	_delay_ms(PRE_DRIVE_SLEEP);
 
 	// XXX Modify for different detection groups <-> groupArray mappings
 	switch ( group ) {
-		DET_GROUP(1,1)
-		/*
-		DET_GROUP(2,4)
-		DET_GROUP(3,4)
-		DET_GROUP(4,1)
-		DET_GROUP(5,4)
+		DET_GROUP(1,2)
+		DET_GROUP(2,2)
+		DET_GROUP(3,3)
+		DET_GROUP(4,4)
+		DET_GROUP(5,2)
 		DET_GROUP(6,2)
-		DET_GROUP(7,2)
-		DET_GROUP(8,3)
-		DET_GROUP(9,2)
-		*/
-	}
-
-
-	// Print out the current keys pressed
-	if ( curDetect.keyDetectCount > 0 ) {
-		print("Keys: ");
-		for ( int c = 0; c < curDetect.keyDetectCount; c++ ) {
-			phex( curDetect.keyDetectArray[c] );
-			print(" ");
-		}
-		print("\n");
-	}
-	if ( curDetect.modifiers ) {
-		print("Modifiers: ");
-		phex( curDetect.modifiers );
-		print("\n");
+		DET_GROUP(7,4)
+		DET_GROUP(8,4)
+		DET_GROUP(9,1)
 	}
 }
 
@@ -261,19 +321,19 @@
 {
 	// For each pin, 0=input, 1=output
 	DDRA = 0x00;
-	DDRB = 0x07;
-	DDRC = 0x80;
-	DDRD = 0x00;
-	DDRE = 0xC0;
-	DDRF = 0x31;
+	DDRB = 0x00;
+	DDRC = 0x00;
+	DDRD = 0xFC;
+	DDRE = 0x43;
+	DDRF = 0x00;
 
 	// Setting pins to either high or pull-up resistor
 	PORTA = 0x00;
-	PORTB = 0x0F;
-	PORTC = 0xFF;
-	PORTD = 0x00;
-	PORTE = 0xC2;
-	PORTF = 0x3F;
+	PORTB = 0xFF;
+	PORTC = 0x01;
+	PORTD = 0xFF;
+	PORTE = 0xC3;
+	PORTF = 0x00;
 }
 
 int main( void )
@@ -303,7 +363,6 @@
 	for ( int group = 1;;group++ ) {
 		// Determine which keys are being pressed
 		switch ( group ) {
-			/*
 			DD_CASE_ORD(1)
 			DD_CASE_ORD(2)
 			DD_CASE_ORD(3)
@@ -312,13 +371,30 @@
 			DD_CASE_ORD(6)
 			DD_CASE_ORD(7)
 			DD_CASE_ORD(8)
-			*/
 			DD_CASE_END(9,group)
 		}
 
 		if ( group != -1 )
 			continue;
 
+		// Print out the current keys pressed
+		if ( curDetect.keyDetectCount > 0 ) {
+			print("Switch: ");
+			for ( int c = 0; c < curDetect.keyDetectCount; c++ ) {
+				print("0x");
+				phex( curDetect.keyDetectArray[c] );
+				print("|");
+				//printDecodeScancode( curDetect.keyDetectArray[c] );
+				print(" ");
+			}
+			print("\n");
+		}
+		if ( curDetect.modifiers ) {
+			print("Modifiers: ");
+			phex( curDetect.modifiers );
+			print("\n");
+		}
+
 		// After going through each of the key groups, send the detected keys and modifiers
 		// Currently limited to the USB spec (6 keys + modifiers)
 		// Making sure to pass zeros when there are no keys being pressed
@@ -329,7 +405,7 @@
 		keyboard_modifier_keys = curDetect.modifiers;
 
 		// Send keypresses
-		usb_keyboard_send();
+		//usb_keyboard_send();
 
 		// Cleanup
 		curDetect.keyDetectCount = 0;