X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2FIIgs_Standard%2Fmatrix.c;h=6ca55b7ea24d3bf9f9e97dcbc0545a2ca5fc7aac;hb=6215727b0bd827a18456b21a26d6175abe365ada;hp=89a09877db7fc8eb9059184665585cfca5fa4ba0;hpb=3830de7839890e78c150971e4fa2649968f3ed2a;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/IIgs_Standard/matrix.c b/keyboard/IIgs_Standard/matrix.c
index 89a09877..6ca55b7e 100644
--- a/keyboard/IIgs_Standard/matrix.c
+++ b/keyboard/IIgs_Standard/matrix.c
@@ -86,6 +86,8 @@ void matrix_init(void)
     PORTC |= 0b01111111;
     DDRE &= ~0b00000010;
     PORTE |= 0b00000010;
+	//DDRB &= ~0b00000100;
+	//PORTB |= 0b00000100;
 	// modifier	B3/4,F4/5,E4	always input
 	// 			A0
     //DDRA |=  0b00000001;
@@ -128,17 +130,23 @@ uint8_t matrix_scan(void)
 					matrix[i] = ~read_col(i) | 0b00010000;						// send fake caps lock down
 				}
 			} else {													// CAPS LOCK is OFF on HOST
-				matrix[i] = ~read_col(i);								
+        		if (matrix[i] != (uint8_t)~read_col(i)) {
+           			matrix[i] = (uint8_t)~read_col(i);
+        			if (debouncing) {
+        				debug("bounce!: "); debug_hex(debouncing); print("\n");
+					}
+       				debouncing = DEBOUNCE;
+				}
 			}
 		} else {
         	if (matrix[i] != (uint8_t)~read_col(i)) {
            		matrix[i] = (uint8_t)~read_col(i);
+        		if (debouncing) {
+        			debug("bounce!: "); debug_hex(debouncing); print("\n");
+				}
+       			debouncing = DEBOUNCE;
 			}
 		}
-        if (debouncing) {
-        	debug("bounce!: "); debug_hex(debouncing); print("\n");
-		}
-       	debouncing = DEBOUNCE;
 	}
     unselect_rows();
 
@@ -255,13 +263,13 @@ static uint8_t read_col(uint8_t row)
 	// Modifier would be copied to report->mods except E4(CAPSLOCK)
 	uint8_t tmp;
 	if ( row == 10 ) {
-		tmp = 0xE0;
+		tmp = 0xC0;
 		tmp |= (PINB >> 3 ) & 0b00000011;	// LEFT CTRL  is 0bit in modifier (HID Spec)
 											// LEFT SHIFT is 1bit in modifier (HID Spec)
 		tmp |= (PINF >> 3 ) & 0b00000100;	// LEFT ALT   is 2bit in modifier (HID Spec)
 		tmp |= (PINF >> 1 ) & 0b00001000;	// LEFT GUI   is 3bit in modifier (HID Spec)
-		tmp |= (PINA << 4 ) & 0b00010000;	// 
-		//tmp |= (PINE << 1 ) & 0b00010000;	// Caps Lock(Should not be in modifier
+		tmp |= (PINA << 4 ) & 0b00010000;	// CAPSLOCK
+		tmp |= (PINB << 3 ) & 0b00100000;	// POWER 	 
 	} else {
 		tmp = 0x00;
 		tmp = (PINE >> 1)&0b00000001; 
@@ -284,10 +292,10 @@ static void unselect_rows(void)
     DDRF  &= ~0b11000111; // PF: 7,6,2,1,0 
     PORTF &= ~0b11000111;
 	// to unselect virtual row(modifier), set port to output with low
-    DDRA  |=  0b00000001; // PA: 0
+    DDRA  |=  0b00000001; // PA: 0 for CAPSLOCK
     PORTA &= ~0b00000001;
-    DDRB  |=  0b00011000; // PB: 3,4 for modifier(row10)
-    PORTB &= ~0b00011000;
+    DDRB  |=  0b00011100; // PB: 3,4 for modifier(row10)
+    PORTB &= ~0b00011100; // PB: 2 for power
     DDRF  |=  0b00110000; // PF: 4,5 for modifier
     PORTF &= ~0b00110000;
 }
@@ -345,8 +353,8 @@ static void select_row(uint8_t row)
 			// to select virtual row, set port as input
 		    DDRA &= ~0b00000001;
 		    PORTA |= 0b00000001;
-		    DDRB &= ~0b00011000;
-		    PORTB |= 0b00011000;
+		    DDRB &= ~0b00011100;
+		    PORTB |= 0b00011100;
 		    DDRF &= ~0b00110000;
 		    PORTF |= 0b00110000;
             break;