aboutsummaryrefslogtreecommitdiff
path: root/keyboards/hhkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hhkb')
-rw-r--r--keyboards/hhkb/ansi/32u2/info.json4
-rw-r--r--keyboards/hhkb/ansi/32u2/keyboard.json10
-rw-r--r--keyboards/hhkb/ansi/32u2/rules.mk2
-rw-r--r--keyboards/hhkb/ansi/32u4/info.json4
-rw-r--r--keyboards/hhkb/ansi/32u4/keyboard.json12
-rw-r--r--keyboards/hhkb/ansi/32u4/rules.mk0
-rw-r--r--keyboards/hhkb/ansi/rules.mk19
-rw-r--r--keyboards/hhkb/jp/keyboard.json (renamed from keyboards/hhkb/jp/info.json)7
-rw-r--r--keyboards/hhkb/jp/rules.mk7
-rw-r--r--keyboards/hhkb/yang/keyboard.json (renamed from keyboards/hhkb/yang/info.json)6
-rw-r--r--keyboards/hhkb/yang/matrix.c7
-rw-r--r--keyboards/hhkb/yang/rules.mk10
12 files changed, 42 insertions, 46 deletions
diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/info.json
deleted file mode 100644
index dd190d18ee..0000000000
--- a/keyboards/hhkb/ansi/32u2/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/hhkb/ansi/32u2/keyboard.json b/keyboards/hhkb/ansi/32u2/keyboard.json
new file mode 100644
index 0000000000..d210808d98
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u2/keyboard.json
@@ -0,0 +1,10 @@
+{
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ }
+}
diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk
deleted file mode 100644
index 95a1d66061..0000000000
--- a/keyboards/hhkb/ansi/32u2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
diff --git a/keyboards/hhkb/ansi/32u4/info.json b/keyboards/hhkb/ansi/32u4/info.json
deleted file mode 100644
index 042c41f34d..0000000000
--- a/keyboards/hhkb/ansi/32u4/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/hhkb/ansi/32u4/keyboard.json b/keyboards/hhkb/ansi/32u4/keyboard.json
new file mode 100644
index 0000000000..1e47ddd20f
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u4/keyboard.json
@@ -0,0 +1,12 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ }
+}
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/hhkb/ansi/32u4/rules.mk
+++ /dev/null
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index f5a147ccb9..841565b846 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -1,23 +1,6 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+CUSTOM_MATRIX = yes
# project specific files
SRC = matrix.c
-# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
-# debug-on: all
-
-# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
-# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
-# debug-off: all
-
DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/keyboard.json
index 589cf98dde..d745f21d20 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/keyboard.json
@@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"layouts": {
"LAYOUT_jp": {
"layout": [
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 5c65964341..9e74e1cfb9 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -1,14 +1,7 @@
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
-NKRO_ENABLE = no # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
# project specific files
SRC = matrix.c
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/keyboard.json
index 24cd750e09..a5725d6afa 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/keyboard.json
@@ -16,6 +16,12 @@
},
"processor": "atmega32u4",
"bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
"debounce": 0,
"community_layouts": ["60_hhkb"],
"layouts": {
diff --git a/keyboards/hhkb/yang/matrix.c b/keyboards/hhkb/yang/matrix.c
index f0eccc899d..c82c77bed3 100644
--- a/keyboards/hhkb/yang/matrix.c
+++ b/keyboards/hhkb/yang/matrix.c
@@ -16,7 +16,12 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "matrix.h"
+#include "debug.h"
+#include "timer.h"
+#include "wait.h"
+#include "suspend.h"
+#include <avr/interrupt.h>
#ifdef BLUETOOTH_ENABLE
# include "adafruit_ble.h"
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 99f77d0c16..d8acce0a36 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,16 +1,6 @@
# MCU frequency
F_CPU = 8000000
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # USB Nkey Rollover
-
# Custom matrix file for the HHKB
CUSTOM_MATRIX = lite
SRC += matrix.c