summaryrefslogtreecommitdiff
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/rules.mk3
-rw-r--r--keyboards/hhkb/ansi/32u4/info.json4
-rw-r--r--keyboards/hhkb/ansi/32u4/rules.mk0
-rw-r--r--keyboards/hhkb/ansi/config.h12
-rw-r--r--keyboards/hhkb/ansi/info.json1
-rw-r--r--keyboards/hhkb/ansi/keymaps/mjt/keymap.c8
-rw-r--r--keyboards/hhkb/ansi/matrix.c4
-rw-r--r--keyboards/hhkb/ansi/rules.mk8
-rw-r--r--keyboards/hhkb/jp/config.h12
-rw-r--r--keyboards/hhkb/jp/info.json2
-rw-r--r--keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c22
-rw-r--r--keyboards/hhkb/jp/matrix.c4
-rw-r--r--keyboards/hhkb/jp/rules.mk6
-rw-r--r--keyboards/hhkb/yang/config.h42
-rw-r--r--keyboards/hhkb/yang/info.json7
-rw-r--r--keyboards/hhkb/yang/rules.mk8
17 files changed, 27 insertions, 120 deletions
diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/info.json
new file mode 100644
index 0000000000..dd190d18ee
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u2/info.json
@@ -0,0 +1,4 @@
+{
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk
index 0c0b4c37c2..95a1d66061 100644
--- a/keyboards/hhkb/ansi/32u2/rules.mk
+++ b/keyboards/hhkb/ansi/32u2/rules.mk
@@ -1,5 +1,2 @@
-# MCU name
-MCU = atmega32u2
-
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
new file mode 100644
index 0000000000..042c41f34d
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u4/info.json
@@ -0,0 +1,4 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u4/rules.mk
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h
index f2ba9fd74a..306b1df200 100644
--- a/keyboards/hhkb/ansi/config.h
+++ b/keyboards/hhkb/ansi/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8
@@ -25,17 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
#ifdef HHKB_RN42_ENABLE
// rn42 support -- acquired from the tmk repo. This is almost certainly not
// integrated with qmk in the correct way.
diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json
index fdc8363141..c892d2b14b 100644
--- a/keyboards/hhkb/ansi/info.json
+++ b/keyboards/hhkb/ansi/info.json
@@ -8,6 +8,7 @@
"pid": "0x0001",
"device_version": "1.0.4"
},
+ "community_layouts": ["60_hhkb"],
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
index b4a36c97ee..54a041b93c 100644
--- a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
@@ -61,10 +61,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[HHKB] = LAYOUT(
- KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \
- KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \
- KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \
+ KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+ KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
*/
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c
index 8b0e4606bc..a1bda95841 100644
--- a/keyboards/hhkb/ansi/matrix.c
+++ b/keyboards/hhkb/ansi/matrix.c
@@ -71,7 +71,7 @@ void matrix_init(void)
matrix = _matrix0;
matrix_prev = _matrix1;
- matrix_init_quantum();
+ matrix_init_kb();
}
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
@@ -158,7 +158,7 @@ uint8_t matrix_scan(void)
suspend_power_down();
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index 40a34662bc..efe5ab4456 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -35,4 +29,4 @@ SRC = matrix.c
# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
# debug-off: all
-LAYOUTS = 60_hhkb
+DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h
index a3e7dbd3a6..4ab0c5058c 100644
--- a/keyboards/hhkb/jp/config.h
+++ b/keyboards/hhkb/jp/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 16
@@ -25,17 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
#ifdef HHKB_RN42_ENABLE
// rn42 support -- acquired from the tmk repo. This is almost certainly not
// integrated with qmk in the correct way.
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index dd1cfbc870..cc05d105bf 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -8,6 +8,8 @@
"pid": "0x0002",
"device_version": "1.0.4"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_jp": {
"layout": [
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
index 1b8e41de0e..1852920345 100644
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
@@ -42,25 +42,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT,
_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
-
-/*void matrix_scan_user(void) {
- LEADER_DICTIONARY() {
- leading = false;
- leader_end();
-
- SEQ_ONE_KEY(KC_RSFT) {
- register_code(KC_S);
- unregister_code(KC_S);
- }
- SEQ_TWO_KEYS(KC_A, KC_S) {
- register_code(KC_H);
- unregister_code(KC_H);
- }
- SEQ_THREE_KEYS(KC_A, KC_S, KC_D) {
- register_code(KC_LGUI);
- register_code(KC_S);
- unregister_code(KC_S);
- unregister_code(KC_LGUI);
- }
- }
-}*/
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c
index 9d04d62849..caedeef008 100644
--- a/keyboards/hhkb/jp/matrix.c
+++ b/keyboards/hhkb/jp/matrix.c
@@ -71,7 +71,7 @@ void matrix_init(void)
matrix = _matrix0;
matrix_prev = _matrix1;
- matrix_init_quantum();
+ matrix_init_kb();
}
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
@@ -159,7 +159,7 @@ uint8_t matrix_scan(void)
suspend_power_down();
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index ae0710e028..2979c855c7 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/hhkb/yang/config.h b/keyboards/hhkb/yang/config.h
index e1fa406a0b..e1f24c8c25 100644
--- a/keyboards/hhkb/yang/config.h
+++ b/keyboards/hhkb/yang/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8
@@ -29,8 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_POWER_SAVE_TIMEOUT_L2_MS 1800000
#define MATRIX_POWER_SAVE_TIMEOUT_L3_MS 7200000
-#define LED_CAPS_LOCK_PIN F4
-
#ifdef BLUETOOTH_ENABLE
# define OUTPUT_DEFAULT OUTPUT_AUTO
@@ -65,37 +62,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
} while (0)
#endif
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
@@ -112,12 +78,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
-
//#define DEBUG_MATRIX_SCAN_RATE
-
-// Disable debounce
-#define DEBOUNCE 0
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index 23e26fe2cb..dc465cea96 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -8,6 +8,13 @@
"pid": "0x0001",
"device_version": "1.0.4"
},
+ "indicators": {
+ "caps_lock": "F4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "debounce": 0,
+ "community_layouts": ["60_hhkb"],
"layouts": {
"LAYOUT_60_hhkb": {
"layout": [
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 6027a07176..71ec705822 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
# MCU frequency
F_CPU = 8000000
-# Bootloader selection
-BOOTLOADER = lufa-ms
-
# Build Options
# change yes to no to disable
#
@@ -17,8 +11,6 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # USB Nkey Rollover
-LAYOUTS = 60_hhkb
-
# Disable bluetooth until the UART code is merged
BLUETOOTH_DRIVER = BluefruitLE
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 18:25:15 +0000