summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/matrix.h2
-rw-r--r--keyboard/gh60/matrix.c44
-rw-r--r--keyboard/hbkb/config.h19
-rw-r--r--keyboard/hbkb/matrix.c65
-rw-r--r--keyboard/hid_liber/config.h11
-rw-r--r--keyboard/hid_liber/matrix.c2
-rw-r--r--keyboard/macway/config.h25
-rw-r--r--keyboard/macway/matrix.c77
-rw-r--r--keyboard/phantom/config.h13
-rw-r--r--keyboard/phantom/matrix.c34
10 files changed, 127 insertions, 165 deletions
diff --git a/common/matrix.h b/common/matrix.h
index d62acb6683..d1d14a6ead 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -44,7 +44,7 @@ void matrix_init(void);
/* scan all key states on matrix */
uint8_t matrix_scan(void);
/* whether modified from previous scan. used after matrix_scan. */
-bool matrix_is_modified(void);
+bool matrix_is_modified(void) __attribute__ ((deprecated));
/* whether a swtich is on */
bool matrix_is_on(uint8_t row, uint8_t col);
/* matrix state on row */
diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c
index 09a051aa66..3ba6801fbf 100644
--- a/keyboard/gh60/matrix.c
+++ b/keyboard/gh60/matrix.c
@@ -34,13 +34,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static uint8_t debouncing = DEBOUNCE;
/* matrix state(1:on, 0:off) */
-static uint16_t *matrix;
-static uint16_t *matrix_debouncing;
-static uint16_t matrix0[MATRIX_ROWS];
-static uint16_t matrix1[MATRIX_ROWS];
-static bool is_modified;
+static matrix_row_t *matrix;
+static matrix_row_t *matrix_debouncing;
+static matrix_row_t matrix0[MATRIX_ROWS];
+static matrix_row_t matrix1[MATRIX_ROWS];
-static uint16_t read_cols(void);
+static matrix_row_t read_cols(void);
static void init_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
@@ -71,36 +70,32 @@ void matrix_init(void)
matrix[i] = 0;
matrix_debouncing[i] = 0;
}
- is_modified = false;
}
uint8_t matrix_scan(void)
{
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- //unselect_rows();
select_row(i);
_delay_us(30); // without this wait read unstable value.
- uint16_t cols = read_cols();
+ matrix_row_t cols = read_cols();
if (matrix_debouncing[i] != cols) {
matrix_debouncing[i] = cols;
if (debouncing) {
debug("bounce!: "); debug_hex(debouncing); debug("\n");
}
debouncing = DEBOUNCE;
- is_modified = false;
}
unselect_rows();
}
- //unselect_rows();
if (debouncing) {
- debouncing--;
- _delay_ms(1);
- } else {
- uint16_t *tmp = matrix;
- matrix = matrix_debouncing;
- matrix_debouncing = tmp;
- is_modified = true;
+ if (--debouncing) {
+ _delay_ms(1);
+ } else {
+ matrix_row_t *tmp = matrix;
+ matrix = matrix_debouncing;
+ matrix_debouncing = tmp;
+ }
}
return 1;
@@ -108,13 +103,8 @@ uint8_t matrix_scan(void)
bool matrix_is_modified(void)
{
- return is_modified;
-}
-
-inline
-bool matrix_has_ghost(void)
-{
- return false;
+ if (debouncing) return false;
+ return true;
}
inline
@@ -124,7 +114,7 @@ bool matrix_is_on(uint8_t row, uint8_t col)
}
inline
-uint16_t matrix_get_row(uint8_t row)
+matrix_row_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
@@ -167,7 +157,7 @@ static void init_cols(void)
PORTB |= (1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
}
-static uint16_t read_cols(void)
+static matrix_row_t read_cols(void)
{
return (PINF&(1<<0) ? 0 : (1<<0)) |
(PINF&(1<<1) ? 0 : (1<<1)) |
diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h
index 57adecfa5e..aa3af30c14 100644
--- a/keyboard/hbkb/config.h
+++ b/keyboard/hbkb/config.h
@@ -27,18 +27,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0100
#define PRODUCT Happy Buckling Keyboard
-
#define DESCRIPTION mod version of IBM Model M keyboard
-
/* matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 8
+
/* define if matrix has ghost */
#define MATRIX_HAS_GHOST
+
/* Set 0 if need no debouncing */
#define DEBOUNCE 10
+/* legacy keymap support */
+#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
@@ -46,10 +48,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \
)
-
-/* mouse keys */
-#ifdef MOUSEKEY_ENABLE
-# define MOUSEKEY_DELAY_TIME 128
-#endif
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 4096
#endif
diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c
index a24d24b8c3..f6830a0f71 100644
--- a/keyboard/hbkb/matrix.c
+++ b/keyboard/hbkb/matrix.c
@@ -32,32 +32,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* COL: PD0-7
* ROW: PB0-7, PF4-7
*/
-
-#if (MATRIX_COLS > 16)
-# error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-# error "MATRIX_ROWS must not exceed 255"
-#endif
-
-
#ifndef DEBOUNCE
-# define DEBOUNCE 0
+# define DEBOUNCE 10
#endif
static uint8_t debouncing = DEBOUNCE;
// matrix state buffer(1:on, 0:off)
-#if (MATRIX_COLS <= 8)
static uint8_t *matrix;
-static uint8_t *matrix_prev;
-static uint8_t _matrix0[MATRIX_ROWS];
-static uint8_t _matrix1[MATRIX_ROWS];
-#else
-static uint16_t *matrix;
-static uint16_t *matrix_prev;
-static uint16_t _matrix0[MATRIX_ROWS];
-static uint16_t _matrix1[MATRIX_ROWS];
-#endif
+static uint8_t *matrix_debouncing;
+static uint8_t matrix0[MATRIX_ROWS];
+static uint8_t matrix1[MATRIX_ROWS];
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
@@ -100,37 +84,35 @@ void matrix_init(void)
PORTD = 0xFF;
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
- matrix = _matrix0;
- matrix_prev = _matrix1;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix0[i] = 0x00;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix1[i] = 0x00;
+ matrix = matrix0;
+ matrix_debouncing = matrix1;
}
uint8_t matrix_scan(void)
{
- if (!debouncing) {
- uint8_t *tmp = matrix_prev;
- matrix_prev = matrix;
- matrix = tmp;
- }
-
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- unselect_rows();
select_row(i);
_delay_us(30); // without this wait read unstable value.
- if (matrix[i] != (uint8_t)~read_col()) {
- matrix[i] = (uint8_t)~read_col();
+ if (matrix_debouncing[i] != read_col()) {
+ matrix_debouncing[i] = read_col();
if (debouncing) {
- debug("bounce!: "); debug_hex(debouncing); print("\n");
+ debug("bounce!: "); debug_hex(debouncing); debug("\n");
}
- _delay_ms(1); // TODO: work around. HAHAHAHAHAAHA
debouncing = DEBOUNCE;
}
+ unselect_rows();
}
- unselect_rows();
if (debouncing) {
- debouncing--;
+ if (--debouncing) {
+ _delay_ms(1);
+ } else {
+ uint8_t *tmp = matrix;
+ matrix = matrix_debouncing;
+ matrix_debouncing = tmp;
+ }
}
return 1;
@@ -139,12 +121,7 @@ uint8_t matrix_scan(void)
bool matrix_is_modified(void)
{
if (debouncing) return false;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix[i] != matrix_prev[i]) {
- return true;
- }
- }
- return false;
+ return true;
}
inline
@@ -202,7 +179,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
inline
static uint8_t read_col(void)
{
- return PIND;
+ return ~PIND;
}
inline
diff --git a/keyboard/hid_liber/config.h b/keyboard/hid_liber/config.h
index a9b77c7dca..61a75dd0cf 100644
--- a/keyboard/hid_liber/config.h
+++ b/keyboard/hid_liber/config.h
@@ -41,12 +41,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if need no debouncing */
#define DEBOUNCE 8
+/* legacy keymap support */
+#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 4096
+
// TODO: configurable
#define DEBUG_LED 0
#define DEBUG_LED_CONFIG
diff --git a/keyboard/hid_liber/matrix.c b/keyboard/hid_liber/matrix.c
index 2d939ef63b..12ade33027 100644
--- a/keyboard/hid_liber/matrix.c
+++ b/keyboard/hid_liber/matrix.c
@@ -173,7 +173,6 @@ uint8_t matrix_scan(void)
if (debouncing) {
debug("bounce!: "); debug_hex(debouncing); print("\n");
}
- _delay_ms(1); // improved affect on bouncing
debouncing = DEBOUNCE;
}
}
@@ -181,6 +180,7 @@ uint8_t matrix_scan(void)
}
if (debouncing) {
+ _delay_ms(1);
debouncing--;
}
diff --git a/keyboard/macway/config.h b/keyboard/macway/config.h
index 6ab0dec927..b88f898e2c 100644
--- a/keyboard/macway/config.h
+++ b/keyboard/macway/config.h
@@ -29,19 +29,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER t.m.k.
#define PRODUCT Macway mod
-
/* message strings */
#define DESCRIPTION t.m.k. keyboard firmware for Macway mod
-
/* matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 8
+
/* define if matrix has ghost */
#define MATRIX_HAS_GHOST
+
/* Set 0 if need no debouncing */
#define DEBOUNCE 5
+/* legacy keymap support */
+#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
@@ -49,17 +51,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
-
-/* layer switching */
-#define LAYER_SWITCH_DELAY 100
-#define LAYER_SEND_FN_TERM 300
-
-
-/* mouse keys */
-#ifdef MOUSEKEY_ENABLE
-# define MOUSEKEY_DELAY_TIME 192
-#endif
-
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 4096
/* PS/2 mouse */
#ifdef PS2_MOUSE_ENABLE
diff --git a/keyboard/macway/matrix.c b/keyboard/macway/matrix.c
index 4b0fd98f0f..0f57bfeae7 100644
--- a/keyboard/macway/matrix.c
+++ b/keyboard/macway/matrix.c
@@ -37,27 +37,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef DEBOUNCE
-# define DEBOUNCE 0
+# define DEBOUNCE 5
#endif
static uint8_t debouncing = DEBOUNCE;
// matrix state buffer(1:on, 0:off)
-#if (MATRIX_COLS <= 8)
-static uint8_t *matrix;
-static uint8_t *matrix_prev;
-static uint8_t _matrix0[MATRIX_ROWS];
-static uint8_t _matrix1[MATRIX_ROWS];
-#else
-static uint16_t *matrix;
-static uint16_t *matrix_prev;
-static uint16_t _matrix0[MATRIX_ROWS];
-static uint16_t _matrix1[MATRIX_ROWS];
-#endif
+static matrix_row_t *matrix;
+static matrix_row_t *matrix_debouncing;
+static matrix_row_t matrix0[MATRIX_ROWS];
+static matrix_row_t matrix1[MATRIX_ROWS];
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif
-static uint8_t read_col(void);
+static matrix_row_t read_col(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
@@ -83,26 +76,22 @@ void matrix_init(void)
PORTB = 0xFF;
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
- matrix = _matrix0;
- matrix_prev = _matrix1;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+ matrix0[i] = 0;
+ matrix1[i] = 0;
+ }
+ matrix = matrix0;
+ matrix_debouncing = matrix1;
}
uint8_t matrix_scan(void)
{
- if (!debouncing) {
- uint8_t *tmp = matrix_prev;
- matrix_prev = matrix;
- matrix = tmp;
- }
-
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
unselect_rows();
select_row(i);
_delay_us(30); // without this wait read unstable value.
- if (matrix[i] != (uint8_t)~read_col()) {
- matrix[i] = (uint8_t)~read_col();
+ if (matrix[i] != read_col()) {
+ matrix[i] = read_col();
if (debouncing) {
debug("bounce!: "); debug_hex(debouncing); print("\n");
}
@@ -112,7 +101,14 @@ uint8_t matrix_scan(void)
unselect_rows();
if (debouncing) {
- debouncing--;
+ if (--debouncing) {
+ _delay_ms(1);
+ } else {
+ matrix_row_t *tmp = matrix;
+ matrix = matrix_debouncing;
+ matrix_debouncing = tmp;
+ }
+
}
return 1;
@@ -121,24 +117,7 @@ uint8_t matrix_scan(void)
bool matrix_is_modified(void)
{
if (debouncing) return false;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix[i] != matrix_prev[i]) {
- return true;
- }
- }
- return false;
-}
-
-inline
-bool matrix_has_ghost(void)
-{
-#ifdef MATRIX_HAS_GHOST
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix_has_ghost_in_row(i))
- return true;
- }
-#endif
- return false;
+ return true;
}
inline
@@ -148,11 +127,7 @@ bool matrix_is_on(uint8_t row, uint8_t col)
}
inline
-#if (MATRIX_COLS <= 8)
-uint8_t matrix_get_row(uint8_t row)
-#else
-uint16_t matrix_get_row(uint8_t row)
-#endif
+matrix_row_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
@@ -207,9 +182,9 @@ static bool matrix_has_ghost_in_row(uint8_t row)
#endif
inline
-static uint8_t read_col(void)
+static matrix_row_t read_col(void)
{
- return PINB;
+ return ~PINB;
}
inline
diff --git a/keyboard/phantom/config.h b/keyboard/phantom/config.h
index 9e8a823d7c..a5d472979a 100644
--- a/keyboard/phantom/config.h
+++ b/keyboard/phantom/config.h
@@ -26,11 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER t.m.k.
#define PRODUCT Phantom
-
/* message strings */
#define DESCRIPTION t.m.k. keyboard firmware for Phantom
-
/* matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
@@ -41,12 +39,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if need no debouncing */
#define DEBOUNCE 7
+/* legacy keymap support */
+#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 4096
+
// TODO: configurable
#define DEBUG_LED 0
#define DEBUG_LED_CONFIG
diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c
index 07f3f42892..7ea494a7e2 100644
--- a/keyboard/phantom/matrix.c
+++ b/keyboard/phantom/matrix.c
@@ -26,8 +26,8 @@ static uint8_t debouncing = DEBOUNCE;
// bit array of key state(1:on, 0:off)
static matrix_row_t *matrix;
static matrix_row_t *matrix_debounced;
-static matrix_row_t _matrix0[MATRIX_ROWS];
-static matrix_row_t _matrix1[MATRIX_ROWS];
+static matrix_row_t matrix0[MATRIX_ROWS];
+static matrix_row_t matrix1[MATRIX_ROWS];
#define _DDRA (uint8_t *const)&DDRA
@@ -164,20 +164,16 @@ void matrix_init(void)
setup_leds();
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
- matrix = _matrix0;
- matrix_debounced = _matrix1;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+ matrix0[i] = 0;
+ matrix1[i] = 0;
+ }
+ matrix = matrix0;
+ matrix_debounced = matrix1;
}
uint8_t matrix_scan(void)
{
- if (!debouncing) {
- matrix_row_t *tmp = matrix_debounced;
- matrix_debounced = matrix;
- matrix = tmp;
- }
-
for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-16
pull_column(col); // output hi on theline
_delay_us(3); // without this wait it won't read stable value.
@@ -196,7 +192,13 @@ uint8_t matrix_scan(void)
}
if (debouncing) {
- debouncing--;
+ if (--debouncing) {
+ _delay_ms(1);
+ } else {
+ matrix_row_t *tmp = matrix_debounced;
+ matrix_debounced = matrix;
+ matrix = tmp;
+ }
}
return 1;
@@ -209,12 +211,6 @@ bool matrix_is_modified(void)
}
inline
-bool matrix_has_ghost(void)
-{
- return false;
-}
-
-inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix_debounced[row] & ((matrix_row_t)1<<col));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:08:00 +0000