Browse Source

Debounce bug fixed

tags/v1.9
Jeffrey Sung 11 years ago
parent
commit
caed32df80
2 changed files with 12 additions and 7 deletions
  1. 1
    1
      keyboard/IIgs_Standard/config.h
  2. 11
    6
      keyboard/IIgs_Standard/matrix.c

+ 1
- 1
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 MATRIX_HAS_GHOST
/* Set 0 if need no debouncing */
#define DEBOUNCE 0
#define DEBOUNCE 5
/* key combination for command */

+ 11
- 6
keyboard/IIgs_Standard/matrix.c View File

@@ -130,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();

@@ -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 |= (PINA << 4 ) & 0b00010000; // CAPSLOCK
tmp |= (PINB << 3 ) & 0b00100000; // POWER
//tmp |= (PINE << 1 ) & 0b00010000; // Caps Lock(Should not be in modifier
} else {
tmp = 0x00;
tmp = (PINE >> 1)&0b00000001;

Loading…
Cancel
Save