eqmk/qmk_firmware
1
0
Fork 0
forked from mfulz_github/qmk_firmware
Code Issues Pull Requests Projects Releases Wiki Activity

Debounce bug fixed

Browse Source
This commit is contained in:
Jeffrey Sung 2012-10-09 00:28:33 +09:00
parent d1117dca32
commit caed32df80
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboard/IIgs_Standard/config.h
View File

@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* define if matrix has ghost */ /* define if matrix has ghost */
#define MATRIX_HAS_GHOST #define MATRIX_HAS_GHOST
/* Set 0 if need no debouncing */ /* Set 0 if need no debouncing */
#define DEBOUNCE 0 #define DEBOUNCE 5
/* key combination for command */ /* key combination for command */

17
keyboard/IIgs_Standard/matrix.c
View File

@ -130,18 +130,24 @@ uint8_t matrix_scan(void)
matrix[i] = ~read_col(i) | 0b00010000; // send fake caps lock down matrix[i] = ~read_col(i) | 0b00010000; // send fake caps lock down
} }
} else { // CAPS LOCK is OFF on HOST } else { // CAPS LOCK is OFF on HOST
matrix[i] = ~read_col(i);
}
} else {
if (matrix[i] != (uint8_t)~read_col(i)) { if (matrix[i] != (uint8_t)~read_col(i)) {
matrix[i] = (uint8_t)~read_col(i); matrix[i] = (uint8_t)~read_col(i);
}
}
if (debouncing) { if (debouncing) {
debug("bounce!: "); debug_hex(debouncing); print("\n"); debug("bounce!: "); debug_hex(debouncing); print("\n");
} }
debouncing = DEBOUNCE; 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;
}
}
}
unselect_rows(); unselect_rows();
if (debouncing) { if (debouncing) {
@ -264,7 +270,6 @@ static uint8_t read_col(uint8_t row)
tmp |= (PINF >> 1 ) & 0b00001000; // LEFT GUI is 3bit in modifier (HID Spec) tmp |= (PINF >> 1 ) & 0b00001000; // LEFT GUI is 3bit in modifier (HID Spec)
tmp |= (PINA << 4 ) & 0b00010000; // CAPSLOCK tmp |= (PINA << 4 ) & 0b00010000; // CAPSLOCK
tmp |= (PINB << 3 ) & 0b00100000; // POWER tmp |= (PINB << 3 ) & 0b00100000; // POWER
//tmp |= (PINE << 1 ) & 0b00010000; // Caps Lock(Should not be in modifier
} else { } else {
tmp = 0x00; tmp = 0x00;
tmp = (PINE >> 1)&0b00000001; tmp = (PINE >> 1)&0b00000001;