onekey: Fix for V-USB of ATtiny85 and key scan

keyboard/onekey/Makefile

@@ -49,7 +49,7 @@ TARGET_DIR = .
 
 # project specific files
 SRC =	keymap.c \
-	matrix.c \
+	onekey.c \
 	led.c
 
 CONFIG_H = config.h

keyboard/onekey/Makefile.pjrc

@@ -49,7 +49,7 @@ TARGET_DIR = .
 
 # project specific files
 SRC =	keymap.c \
-	matrix.c \
+	onekey.c \
 	led.c
 
 CONFIG_H = config.h

keyboard/onekey/Makefile.vusb

@@ -9,7 +9,7 @@ TARGET_DIR = .
 
 # keyboard dependent files
 SRC = 	keymap.c \
-    	matrix.c \
+	onekey.c \
 	led.c
 
 CONFIG_H = config.h
@@ -18,7 +18,8 @@ CONFIG_H = config.h
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
 #MCU = atmega168p
-MCU = atmega328p
+#MCU = atmega328p
+MCU = attiny85
 
 
 # Processor frequency.
@@ -35,6 +36,11 @@ F_CPU = 12000000
 #MOUSEKEY_ENABLE = yes	# Mouse keys
 #EXTRAKEY_ENABLE = yes	# Audio control and System control
 #NKRO_ENABLE = yes	# USB Nkey Rollover
+NO_UART = yes		# No UART debug(V-USB)
+
+OPT_DEFS += -DNO_ACTION_TAPPING
+OPT_DEFS += -DNO_ACTION_LAYER
+OPT_DEFS += -DNO_ACTION_MACRO
 
 
 

keyboard/onekey/README.md

@@ -1,5 +1,5 @@
 Onekey
 ======
-Just one key keyboard for example. It sends 'a' key if pins PB0 and PB1 are short-circuited.
+Just one key keyboard for example. It sends 'a' key if pins PB0 and GND are short-circuited.
 
 https://github.com/tmk/tmk_keyboard/issues/56

keyboard/onekey/onekey.c

@@ -0,0 +1,70 @@
+/*
+Copyright 2017 Jun Wako <[email protected]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include "debug.h"
+#include "timer.h"
+#include "matrix.h"
+
+
+#ifndef DEBOUNCE
+#   define DEBOUNCE	5
+#endif
+/* matrix state(1:on, 0:off) */
+static matrix_row_t row_debounced = 0;
+static matrix_row_t row_debouncing = 0;
+static bool debouncing = false;
+static uint16_t debouncing_time = 0;
+
+
+void matrix_init(void)
+{
+    debug_enable = true;
+    debug_matrix = true;
+    debug_mouse = true;
+
+    // PB0: Input with pull-up(DDR:0, PORT:1)
+    DDRB  &= ~(1<<0);
+    PORTB |=  (1<<0);
+}
+
+uint8_t matrix_scan(void)
+{
+    matrix_row_t r = (PINB&(1<<0) ? 0 : 1);
+    if (row_debouncing != r) {
+        row_debouncing = r;
+        debouncing = true;
+        debouncing_time = timer_read();
+    }
+
+    if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
+        row_debounced = row_debouncing;
+        debouncing = false;
+    }
+    return 1;
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    return row_debounced;
+}

keyboard/onekey/usbconfig.h

@@ -24,11 +24,11 @@ section at the end of this file).
 
 /* ---------------------------- Hardware Config ---------------------------- */
 
-#define USB_CFG_IOPORTNAME      D
+#define USB_CFG_IOPORTNAME      B
 /* This is the port where the USB bus is connected. When you configure it to
  * "B", the registers PORTB, PINB and DDRB will be used.
  */
-#define USB_CFG_DMINUS_BIT      3
+#define USB_CFG_DMINUS_BIT      1
 /* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected.
  * This may be any bit in the port.
  */