summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-11-28 06:42:41 +0100
committertmk <nobody@nowhere>2013-11-28 06:43:47 +0100
commit05be3d85d1b29e0bbca243cc194a8f162c8e48f7 (patch)
tree14c04dbddbe8d313f38a8b900394b0fde34821a8 /keyboard
parent4eb27ee89038e934dcb498df7508199efd9c93f1 (diff)
downloadqmk_firmware-05be3d85d1b29e0bbca243cc194a8f162c8e48f7.tar.gz
qmk_firmware-05be3d85d1b29e0bbca243cc194a8f162c8e48f7.tar.xz
Fix pin configuration of onekey for PS/2 mouse
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/onekey/Makefile (renamed from keyboard/onekey/Makefile.lufa)4
-rw-r--r--keyboard/onekey/README.md2
-rw-r--r--keyboard/onekey/config.h4
-rw-r--r--keyboard/onekey/matrix.c18
4 files changed, 14 insertions, 14 deletions
diff --git a/keyboard/onekey/Makefile.lufa b/keyboard/onekey/Makefile
index 60a84ba00..78732e470 100644
--- a/keyboard/onekey/Makefile.lufa
+++ b/keyboard/onekey/Makefile
@@ -116,8 +116,8 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
-PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
-PS2_USE_BUSYWAIT = yes # uses primitive reference code
+#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
+#PS2_USE_BUSYWAIT = yes # uses primitive reference code
#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
diff --git a/keyboard/onekey/README.md b/keyboard/onekey/README.md
index 6ccc99929..7413f3880 100644
--- a/keyboard/onekey/README.md
+++ b/keyboard/onekey/README.md
@@ -1,5 +1,5 @@
Onekey
======
-Just one key keyboard for example. It sends 'a' key if pins PD0 and PD1 are short-circuited.
+Just one key keyboard for example. It sends 'a' key if pins PB0 and PB1 are short-circuited.
https://github.com/tmk/tmk_keyboard/issues/56
diff --git a/keyboard/onekey/config.h b/keyboard/onekey/config.h
index 1d2e052bf..bf1d2b1ed 100644
--- a/keyboard/onekey/config.h
+++ b/keyboard/onekey/config.h
@@ -73,7 +73,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define PS2_CLOCK_PORT PORTD
# define PS2_CLOCK_PIN PIND
# define PS2_CLOCK_DDR DDRD
-# define PS2_CLOCK_BIT 5
+# define PS2_CLOCK_BIT 1
# define PS2_DATA_PORT PORTD
# define PS2_DATA_PIN PIND
# define PS2_DATA_DDR DDRD
@@ -87,7 +87,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
-#define PS2_CLOCK_BIT 5
+#define PS2_CLOCK_BIT 1
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
diff --git a/keyboard/onekey/matrix.c b/keyboard/onekey/matrix.c
index a0a14ff82..29df86832 100644
--- a/keyboard/onekey/matrix.c
+++ b/keyboard/onekey/matrix.c
@@ -139,29 +139,29 @@ uint8_t matrix_key_count(void)
/* Column pin configuration
* col: 0
- * pin: D0
+ * pin: B0
*/
static void init_cols(void)
{
// Input with pull-up(DDR:0, PORT:1)
- DDRD &= ~(1<<0);
- PORTD |= (1<<0);
+ DDRB &= ~(1<<0);
+ PORTB |= (1<<0);
}
static matrix_row_t read_cols(void)
{
- return (PIND&(1<<0) ? 0 : (1<<0));
+ return (PINB&(1<<0) ? 0 : (1<<0));
}
/* Row pin configuration
* row: 0
- * pin: D1
+ * pin: B1
*/
static void unselect_rows(void)
{
// Hi-Z(DDR:0, PORT:0) to unselect
- DDRD &= ~0b00000010;
- PORTD &= ~0b00000010;
+ DDRB &= ~0b00000010;
+ PORTB &= ~0b00000010;
}
static void select_row(uint8_t row)
@@ -169,8 +169,8 @@ static void select_row(uint8_t row)
// Output low(DDR:1, PORT:0) to select
switch (row) {
case 0:
- DDRD |= (1<<1);
- PORTD &= ~(1<<1);
+ DDRB |= (1<<1);
+ PORTB &= ~(1<<1);
break;
}
}