From 393e99671e3f94e9fbfc06bddee33a2349900a99 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 7 Aug 2021 18:34:31 +0900 Subject: [PATCH 01/12] New template --- keyboards/ai03/JP60/JP60.c | 17 ++ keyboards/ai03/JP60/JP60.h | 35 ++++ keyboards/ai03/JP60/config.h | 152 ++++++++++++++++++ keyboards/ai03/JP60/info.json | 19 +++ keyboards/ai03/JP60/keymaps/default/keymap.c | 62 +++++++ keyboards/ai03/JP60/keymaps/default/readme.md | 1 + keyboards/ai03/JP60/readme.md | 27 ++++ keyboards/ai03/JP60/rules.mk | 22 +++ 8 files changed, 335 insertions(+) create mode 100644 keyboards/ai03/JP60/JP60.c create mode 100644 keyboards/ai03/JP60/JP60.h create mode 100644 keyboards/ai03/JP60/config.h create mode 100644 keyboards/ai03/JP60/info.json create mode 100644 keyboards/ai03/JP60/keymaps/default/keymap.c create mode 100644 keyboards/ai03/JP60/keymaps/default/readme.md create mode 100644 keyboards/ai03/JP60/readme.md create mode 100644 keyboards/ai03/JP60/rules.mk diff --git a/keyboards/ai03/JP60/JP60.c b/keyboards/ai03/JP60/JP60.c new file mode 100644 index 000000000000..c162395c1c1a --- /dev/null +++ b/keyboards/ai03/JP60/JP60.c @@ -0,0 +1,17 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ + +#include "JP60.h" diff --git a/keyboards/ai03/JP60/JP60.h b/keyboards/ai03/JP60/JP60.h new file mode 100644 index 000000000000..aefdc40544a7 --- /dev/null +++ b/keyboards/ai03/JP60/JP60.h @@ -0,0 +1,35 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k10, k12 \ +) { \ + { k00, k01, k02 }, \ + { k10, KC_NO, k12 } \ +} diff --git a/keyboards/ai03/JP60/config.h b/keyboards/ai03/JP60/config.h new file mode 100644 index 000000000000..122308af53f3 --- /dev/null +++ b/keyboards/ai03/JP60/config.h @@ -0,0 +1,152 @@ +/* +Copyright 2021 ai03 + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER ai03 +#define PRODUCT JP60 + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 3 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D0, D5 } +#define MATRIX_COL_PINS { F1, F0, B0 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING + +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +//# define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +//# define RGBLIGHT_EFFECT_BREATHING +//# define RGBLIGHT_EFFECT_RAINBOW_MOOD +//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +//# define RGBLIGHT_EFFECT_CHRISTMAS +//# define RGBLIGHT_EFFECT_STATIC_GRADIENT +//# define RGBLIGHT_EFFECT_RGB_TEST +//# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* 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. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/ai03/JP60/info.json b/keyboards/ai03/JP60/info.json new file mode 100644 index 000000000000..7b35ae8f3805 --- /dev/null +++ b/keyboards/ai03/JP60/info.json @@ -0,0 +1,19 @@ +{ + "keyboard_name": "JP60", + "url": "", + "maintainer": "ai03", + "width": 3, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + ] + } + } +} diff --git a/keyboards/ai03/JP60/keymaps/default/keymap.c b/keyboards/ai03/JP60/keymaps/default/keymap.c new file mode 100644 index 000000000000..678e78f816f7 --- /dev/null +++ b/keyboards/ai03/JP60/keymaps/default/keymap.c @@ -0,0 +1,62 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + QMKBEST = SAFE_RANGE, + QMKURL +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_A, KC_1, MO(_FN), + KC_TAB, KC_SPC + ), + [_FN] = LAYOUT( + QMKBEST, QMKURL, _______, + RESET, XXXXXXX + ) +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QMKBEST: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING("QMK is the best thing ever!"); + } else { + // when keycode QMKBEST is released + } + break; + case QMKURL: + if (record->event.pressed) { + // when keycode QMKURL is pressed + SEND_STRING("https://qmk.fm/\n"); + } else { + // when keycode QMKURL is released + } + break; + } + return true; +} diff --git a/keyboards/ai03/JP60/keymaps/default/readme.md b/keyboards/ai03/JP60/keymaps/default/readme.md new file mode 100644 index 000000000000..168729a40e6e --- /dev/null +++ b/keyboards/ai03/JP60/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for JP60 diff --git a/keyboards/ai03/JP60/readme.md b/keyboards/ai03/JP60/readme.md new file mode 100644 index 000000000000..67dab5f985c7 --- /dev/null +++ b/keyboards/ai03/JP60/readme.md @@ -0,0 +1,27 @@ +# JP60 + +![JP60](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [ai03](https://github.com/yourusername) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make JP60:default + +Flashing example for this keyboard: + + make JP60:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/ai03/JP60/rules.mk b/keyboards/ai03/JP60/rules.mk new file mode 100644 index 000000000000..5c0d8f307c54 --- /dev/null +++ b/keyboards/ai03/JP60/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From 7edfe7201aa13938ef264517435ac9a7a11e40d1 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 7 Aug 2021 20:56:10 +0900 Subject: [PATCH 02/12] Make it compile --- keyboards/ai03/JP60/JP60.h | 17 ++++-- keyboards/ai03/JP60/config.h | 52 +++---------------- keyboards/ai03/JP60/keymaps/default/keymap.c | 48 +++++------------ keyboards/ai03/JP60/keymaps/default/readme.md | 2 + keyboards/ai03/JP60/keymaps/via/keymap.c | 40 ++++++++++++++ keyboards/ai03/JP60/keymaps/via/readme.md | 3 ++ keyboards/ai03/JP60/keymaps/via/rules.mk | 1 + keyboards/ai03/JP60/rules.mk | 2 +- 8 files changed, 79 insertions(+), 86 deletions(-) create mode 100644 keyboards/ai03/JP60/keymaps/via/keymap.c create mode 100644 keyboards/ai03/JP60/keymaps/via/readme.md create mode 100644 keyboards/ai03/JP60/keymaps/via/rules.mk diff --git a/keyboards/ai03/JP60/JP60.h b/keyboards/ai03/JP60/JP60.h index aefdc40544a7..f65531bd43c0 100644 --- a/keyboards/ai03/JP60/JP60.h +++ b/keyboards/ai03/JP60/JP60.h @@ -27,9 +27,16 @@ * represents the switch matrix. */ #define LAYOUT( \ - k00, k01, k02, \ - k10, k12 \ -) { \ - { k00, k01, k02 }, \ - { k10, KC_NO, k12 } \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, \ + K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ + K400, K401, K402, K403, K407, K410, K411, K412, K413 \ +) \ +{ \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ + { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ + { K400, K401, K402, K403, KC_NO, KC_NO, KC_NO, K407, KC_NO, KC_NO, K410, K411, K412, K413 } \ } diff --git a/keyboards/ai03/JP60/config.h b/keyboards/ai03/JP60/config.h index 122308af53f3..fc0a0f6a5ef9 100644 --- a/keyboards/ai03/JP60/config.h +++ b/keyboards/ai03/JP60/config.h @@ -20,15 +20,15 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0xA103 +#define PRODUCT_ID 0x0024 #define DEVICE_VER 0x0001 -#define MANUFACTURER ai03 +#define MANUFACTURER ai03 Design Studio #define PRODUCT JP60 /* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 /* * Keyboard Matrix Assignments @@ -40,8 +40,8 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS { D0, D5 } -#define MATRIX_COL_PINS { F1, F0, B0 } +#define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 } +#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ @@ -52,44 +52,6 @@ along with this program. If not, see . */ #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose animations ==*/ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 diff --git a/keyboards/ai03/JP60/keymaps/default/keymap.c b/keyboards/ai03/JP60/keymaps/default/keymap.c index 678e78f816f7..f26c2a9080e5 100644 --- a/keyboards/ai03/JP60/keymaps/default/keymap.c +++ b/keyboards/ai03/JP60/keymaps/default/keymap.c @@ -14,6 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H +#include "keymap_jp.h" // Defines names for use in layer keycodes and the keymap enum layer_names { @@ -21,42 +22,19 @@ enum layer_names { _FN }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_A, KC_1, MO(_FN), - KC_TAB, KC_SPC + [_BASE] = LAYOUT( /* Base */ + KC_ESC, JP_1, JP_2, JP_3, JP_4, JP_5, JP_6, JP_7, JP_8, JP_9, JP_0, JP_MINS, JP_CIRC, JP_YEN, KC_DEL, + KC_TAB, JP_Q, JP_W, JP_E, JP_R, JP_T, JP_Y, JP_U, JP_I, JP_O, JP_P, JP_AT, JP_LBRC, + MO(1), JP_A, JP_S, JP_D, JP_F, JP_G, JP_H, JP_J, JP_K, JP_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT, + KC_LSFT, JP_Z, JP_X, JP_C, JP_V, JP_B, JP_N, JP_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, JP_ZKHK, JP_EISU ), - [_FN] = LAYOUT( - QMKBEST, QMKURL, _______, - RESET, XXXXXXX + [_FN] = LAYOUT( /* FN */ + RESET, 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_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, + _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/\n"); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/ai03/JP60/keymaps/default/readme.md b/keyboards/ai03/JP60/keymaps/default/readme.md index 168729a40e6e..a240bd905277 100644 --- a/keyboards/ai03/JP60/keymaps/default/readme.md +++ b/keyboards/ai03/JP60/keymaps/default/readme.md @@ -1 +1,3 @@ # The default keymap for JP60 + +Configured for JIS input. \ No newline at end of file diff --git a/keyboards/ai03/JP60/keymaps/via/keymap.c b/keyboards/ai03/JP60/keymaps/via/keymap.c new file mode 100644 index 000000000000..e3fdbaabaf0d --- /dev/null +++ b/keyboards/ai03/JP60/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "keymap_jp.h" + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_GRV, KC_CAPS + ), + [_FN] = LAYOUT_all( /* FN */ + RESET, 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_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, + _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/ai03/JP60/keymaps/via/readme.md b/keyboards/ai03/JP60/keymaps/via/readme.md new file mode 100644 index 000000000000..f6e9c3d8c61e --- /dev/null +++ b/keyboards/ai03/JP60/keymaps/via/readme.md @@ -0,0 +1,3 @@ +# The via keymap for JP60 + +For use with VIA configurator and compatible keymap editors. \ No newline at end of file diff --git a/keyboards/ai03/JP60/keymaps/via/rules.mk b/keyboards/ai03/JP60/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/ai03/JP60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ai03/JP60/rules.mk b/keyboards/ai03/JP60/rules.mk index 5c0d8f307c54..32981133b2eb 100644 --- a/keyboards/ai03/JP60/rules.mk +++ b/keyboards/ai03/JP60/rules.mk @@ -15,7 +15,7 @@ COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth From d0bb8f95c7e1451bc7de3f0d61af8724914a841e Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 7 Aug 2021 21:37:54 +0900 Subject: [PATCH 03/12] Prepare for rename to lowercase --- keyboards/ai03/JP60/JP60.c | 2 +- keyboards/ai03/JP60/config.h | 4 +++ keyboards/ai03/JP60/keymaps/via/keymap.c | 33 ++++++++++++++++++------ keyboards/ai03/JP60/readme.md | 4 +-- keyboards/ai03/JP60/rules.mk | 3 +++ 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/keyboards/ai03/JP60/JP60.c b/keyboards/ai03/JP60/JP60.c index c162395c1c1a..c18a99c6a6cc 100644 --- a/keyboards/ai03/JP60/JP60.c +++ b/keyboards/ai03/JP60/JP60.c @@ -14,4 +14,4 @@ * along with this program. If not, see . */ -#include "JP60.h" +#include "jp60.h" diff --git a/keyboards/ai03/JP60/config.h b/keyboards/ai03/JP60/config.h index fc0a0f6a5ef9..77e97d8253db 100644 --- a/keyboards/ai03/JP60/config.h +++ b/keyboards/ai03/JP60/config.h @@ -63,6 +63,10 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE +/* Increase polling and scanning rates */ +#define USB_POLLING_INTERVAL_MS 1 +#define QMK_KEYS_PER_SCAN 12 + /* 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). */ diff --git a/keyboards/ai03/JP60/keymaps/via/keymap.c b/keyboards/ai03/JP60/keymaps/via/keymap.c index e3fdbaabaf0d..5c8f9ecf65bd 100644 --- a/keyboards/ai03/JP60/keymaps/via/keymap.c +++ b/keyboards/ai03/JP60/keymaps/via/keymap.c @@ -19,22 +19,39 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN + _FN1, + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_all( /* Base */ + [_BASE] = LAYOUT( /* Base */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_GRV, KC_CAPS ), - [_FN] = LAYOUT_all( /* FN */ + [_FN1] = LAYOUT( /* FN1 */ RESET, 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_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, - _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) + _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, + _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_FN2] = LAYOUT( /* FN2 */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_FN3] = LAYOUT( /* FN3 */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + }; diff --git a/keyboards/ai03/JP60/readme.md b/keyboards/ai03/JP60/readme.md index 67dab5f985c7..1cf80ae6a1ee 100644 --- a/keyboards/ai03/JP60/readme.md +++ b/keyboards/ai03/JP60/readme.md @@ -10,11 +10,11 @@ Make example for this keyboard (after setting up your build environment): - make JP60:default + make jp60:default Flashing example for this keyboard: - make JP60:default:flash + make jp60:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ai03/JP60/rules.mk b/keyboards/ai03/JP60/rules.mk index 32981133b2eb..0f3a697d076f 100644 --- a/keyboards/ai03/JP60/rules.mk +++ b/keyboards/ai03/JP60/rules.mk @@ -20,3 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +DEBOUNCE_TYPE = sym_defer_pk +LTO_ENABLE = yes \ No newline at end of file From db311e3ebf59416cd2332070f576dc2d1304367e Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 7 Aug 2021 21:38:43 +0900 Subject: [PATCH 04/12] Temporarily rename since git mv fails --- keyboards/ai03/{JP60/JP60.c => a/a.c} | 0 keyboards/ai03/{JP60/JP60.h => a/a.h} | 0 keyboards/ai03/{JP60 => a}/config.h | 0 keyboards/ai03/{JP60 => a}/info.json | 0 keyboards/ai03/{JP60 => a}/keymaps/default/keymap.c | 0 keyboards/ai03/{JP60 => a}/keymaps/default/readme.md | 0 keyboards/ai03/{JP60 => a}/keymaps/via/keymap.c | 0 keyboards/ai03/{JP60 => a}/keymaps/via/readme.md | 0 keyboards/ai03/{JP60 => a}/keymaps/via/rules.mk | 0 keyboards/ai03/{JP60 => a}/readme.md | 0 keyboards/ai03/{JP60 => a}/rules.mk | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/ai03/{JP60/JP60.c => a/a.c} (100%) rename keyboards/ai03/{JP60/JP60.h => a/a.h} (100%) rename keyboards/ai03/{JP60 => a}/config.h (100%) rename keyboards/ai03/{JP60 => a}/info.json (100%) rename keyboards/ai03/{JP60 => a}/keymaps/default/keymap.c (100%) rename keyboards/ai03/{JP60 => a}/keymaps/default/readme.md (100%) rename keyboards/ai03/{JP60 => a}/keymaps/via/keymap.c (100%) rename keyboards/ai03/{JP60 => a}/keymaps/via/readme.md (100%) rename keyboards/ai03/{JP60 => a}/keymaps/via/rules.mk (100%) rename keyboards/ai03/{JP60 => a}/readme.md (100%) rename keyboards/ai03/{JP60 => a}/rules.mk (100%) diff --git a/keyboards/ai03/JP60/JP60.c b/keyboards/ai03/a/a.c similarity index 100% rename from keyboards/ai03/JP60/JP60.c rename to keyboards/ai03/a/a.c diff --git a/keyboards/ai03/JP60/JP60.h b/keyboards/ai03/a/a.h similarity index 100% rename from keyboards/ai03/JP60/JP60.h rename to keyboards/ai03/a/a.h diff --git a/keyboards/ai03/JP60/config.h b/keyboards/ai03/a/config.h similarity index 100% rename from keyboards/ai03/JP60/config.h rename to keyboards/ai03/a/config.h diff --git a/keyboards/ai03/JP60/info.json b/keyboards/ai03/a/info.json similarity index 100% rename from keyboards/ai03/JP60/info.json rename to keyboards/ai03/a/info.json diff --git a/keyboards/ai03/JP60/keymaps/default/keymap.c b/keyboards/ai03/a/keymaps/default/keymap.c similarity index 100% rename from keyboards/ai03/JP60/keymaps/default/keymap.c rename to keyboards/ai03/a/keymaps/default/keymap.c diff --git a/keyboards/ai03/JP60/keymaps/default/readme.md b/keyboards/ai03/a/keymaps/default/readme.md similarity index 100% rename from keyboards/ai03/JP60/keymaps/default/readme.md rename to keyboards/ai03/a/keymaps/default/readme.md diff --git a/keyboards/ai03/JP60/keymaps/via/keymap.c b/keyboards/ai03/a/keymaps/via/keymap.c similarity index 100% rename from keyboards/ai03/JP60/keymaps/via/keymap.c rename to keyboards/ai03/a/keymaps/via/keymap.c diff --git a/keyboards/ai03/JP60/keymaps/via/readme.md b/keyboards/ai03/a/keymaps/via/readme.md similarity index 100% rename from keyboards/ai03/JP60/keymaps/via/readme.md rename to keyboards/ai03/a/keymaps/via/readme.md diff --git a/keyboards/ai03/JP60/keymaps/via/rules.mk b/keyboards/ai03/a/keymaps/via/rules.mk similarity index 100% rename from keyboards/ai03/JP60/keymaps/via/rules.mk rename to keyboards/ai03/a/keymaps/via/rules.mk diff --git a/keyboards/ai03/JP60/readme.md b/keyboards/ai03/a/readme.md similarity index 100% rename from keyboards/ai03/JP60/readme.md rename to keyboards/ai03/a/readme.md diff --git a/keyboards/ai03/JP60/rules.mk b/keyboards/ai03/a/rules.mk similarity index 100% rename from keyboards/ai03/JP60/rules.mk rename to keyboards/ai03/a/rules.mk From 7cdeaea47097e1555020fa1efa0317952fe95842 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 7 Aug 2021 21:39:01 +0900 Subject: [PATCH 05/12] Rename back --- keyboards/ai03/{a => jp60}/config.h | 0 keyboards/ai03/{a => jp60}/info.json | 0 keyboards/ai03/{a/a.c => jp60/jp60.c} | 0 keyboards/ai03/{a/a.h => jp60/jp60.h} | 0 keyboards/ai03/{a => jp60}/keymaps/default/keymap.c | 0 keyboards/ai03/{a => jp60}/keymaps/default/readme.md | 0 keyboards/ai03/{a => jp60}/keymaps/via/keymap.c | 0 keyboards/ai03/{a => jp60}/keymaps/via/readme.md | 0 keyboards/ai03/{a => jp60}/keymaps/via/rules.mk | 0 keyboards/ai03/{a => jp60}/readme.md | 0 keyboards/ai03/{a => jp60}/rules.mk | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/ai03/{a => jp60}/config.h (100%) rename keyboards/ai03/{a => jp60}/info.json (100%) rename keyboards/ai03/{a/a.c => jp60/jp60.c} (100%) rename keyboards/ai03/{a/a.h => jp60/jp60.h} (100%) rename keyboards/ai03/{a => jp60}/keymaps/default/keymap.c (100%) rename keyboards/ai03/{a => jp60}/keymaps/default/readme.md (100%) rename keyboards/ai03/{a => jp60}/keymaps/via/keymap.c (100%) rename keyboards/ai03/{a => jp60}/keymaps/via/readme.md (100%) rename keyboards/ai03/{a => jp60}/keymaps/via/rules.mk (100%) rename keyboards/ai03/{a => jp60}/readme.md (100%) rename keyboards/ai03/{a => jp60}/rules.mk (100%) diff --git a/keyboards/ai03/a/config.h b/keyboards/ai03/jp60/config.h similarity index 100% rename from keyboards/ai03/a/config.h rename to keyboards/ai03/jp60/config.h diff --git a/keyboards/ai03/a/info.json b/keyboards/ai03/jp60/info.json similarity index 100% rename from keyboards/ai03/a/info.json rename to keyboards/ai03/jp60/info.json diff --git a/keyboards/ai03/a/a.c b/keyboards/ai03/jp60/jp60.c similarity index 100% rename from keyboards/ai03/a/a.c rename to keyboards/ai03/jp60/jp60.c diff --git a/keyboards/ai03/a/a.h b/keyboards/ai03/jp60/jp60.h similarity index 100% rename from keyboards/ai03/a/a.h rename to keyboards/ai03/jp60/jp60.h diff --git a/keyboards/ai03/a/keymaps/default/keymap.c b/keyboards/ai03/jp60/keymaps/default/keymap.c similarity index 100% rename from keyboards/ai03/a/keymaps/default/keymap.c rename to keyboards/ai03/jp60/keymaps/default/keymap.c diff --git a/keyboards/ai03/a/keymaps/default/readme.md b/keyboards/ai03/jp60/keymaps/default/readme.md similarity index 100% rename from keyboards/ai03/a/keymaps/default/readme.md rename to keyboards/ai03/jp60/keymaps/default/readme.md diff --git a/keyboards/ai03/a/keymaps/via/keymap.c b/keyboards/ai03/jp60/keymaps/via/keymap.c similarity index 100% rename from keyboards/ai03/a/keymaps/via/keymap.c rename to keyboards/ai03/jp60/keymaps/via/keymap.c diff --git a/keyboards/ai03/a/keymaps/via/readme.md b/keyboards/ai03/jp60/keymaps/via/readme.md similarity index 100% rename from keyboards/ai03/a/keymaps/via/readme.md rename to keyboards/ai03/jp60/keymaps/via/readme.md diff --git a/keyboards/ai03/a/keymaps/via/rules.mk b/keyboards/ai03/jp60/keymaps/via/rules.mk similarity index 100% rename from keyboards/ai03/a/keymaps/via/rules.mk rename to keyboards/ai03/jp60/keymaps/via/rules.mk diff --git a/keyboards/ai03/a/readme.md b/keyboards/ai03/jp60/readme.md similarity index 100% rename from keyboards/ai03/a/readme.md rename to keyboards/ai03/jp60/readme.md diff --git a/keyboards/ai03/a/rules.mk b/keyboards/ai03/jp60/rules.mk similarity index 100% rename from keyboards/ai03/a/rules.mk rename to keyboards/ai03/jp60/rules.mk From bebcfd2555878120c978e2554829949ab49fd9fe Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 29 Aug 2021 21:51:37 +0900 Subject: [PATCH 06/12] Prepare for PR --- keyboards/ai03/jp60/config.h | 7 +- keyboards/ai03/jp60/info.json | 345 +++++++++++++++++++++++++++++++++- keyboards/ai03/jp60/readme.md | 8 +- keyboards/ai03/jp60/rules.mk | 5 +- 4 files changed, 342 insertions(+), 23 deletions(-) diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h index 77e97d8253db..eb7ac0dca73c 100644 --- a/keyboards/ai03/jp60/config.h +++ b/keyboards/ai03/jp60/config.h @@ -47,11 +47,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 @@ -63,7 +58,7 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Increase polling and scanning rates */ +/* Increase polling rates and scan quantity for improved performance */ #define USB_POLLING_INTERVAL_MS 1 #define QMK_KEYS_PER_SCAN 12 diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index 7b35ae8f3805..19164cbe756e 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -1,19 +1,344 @@ { "keyboard_name": "JP60", - "url": "", + "url": "https://github.com/ai03-2725/JP60", "maintainer": "ai03", - "width": 3, - "height": 2, + "width": 15, + "height": 5, "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + { + "label": "Esc", + "x": 0, + "y": 0 + }, + { + "label": "!", + "x": 1, + "y": 0 + }, + { + "label": "\"", + "x": 2, + "y": 0 + }, + { + "label": "#", + "x": 3, + "y": 0 + }, + { + "label": "$", + "x": 4, + "y": 0 + }, + { + "label": "%", + "x": 5, + "y": 0 + }, + { + "label": "&", + "x": 6, + "y": 0 + }, + { + "label": "'", + "x": 7, + "y": 0 + }, + { + "label": "(", + "x": 8, + "y": 0 + }, + { + "label": ")", + "x": 9, + "y": 0 + }, + { + "label": "", + "x": 10, + "y": 0 + }, + { + "label": "=", + "x": 11, + "y": 0 + }, + { + "label": "~", + "x": 12, + "y": 0 + }, + { + "label": "|", + "x": 13, + "y": 0 + }, + { + "label": "Back Space", + "x": 14, + "y": 0 + }, + { + "label": "Tab", + "x": 0, + "y": 1, + "w": 1.5 + }, + { + "label": "Q", + "x": 1.5, + "y": 1 + }, + { + "label": "W", + "x": 2.5, + "y": 1 + }, + { + "label": "E", + "x": 3.5, + "y": 1 + }, + { + "label": "R", + "x": 4.5, + "y": 1 + }, + { + "label": "T", + "x": 5.5, + "y": 1 + }, + { + "label": "Y", + "x": 6.5, + "y": 1 + }, + { + "label": "U", + "x": 7.5, + "y": 1 + }, + { + "label": "I", + "x": 8.5, + "y": 1 + }, + { + "label": "O", + "x": 9.5, + "y": 1 + }, + { + "label": "P", + "x": 10.5, + "y": 1 + }, + { + "label": "`", + "x": 11.5, + "y": 1 + }, + { + "label": "{", + "x": 12.5, + "y": 1 + }, + { + "label": "Enter", + "x": 13.75, + "y": 1, + "w": 1.25, + "h": 2 + }, + { + "label": "Fn", + "x": 0, + "y": 2, + "w": 1.75 + }, + { + "label": "A", + "x": 1.75, + "y": 2 + }, + { + "label": "S", + "x": 2.75, + "y": 2 + }, + { + "label": "D", + "x": 3.75, + "y": 2 + }, + { + "label": "F", + "x": 4.75, + "y": 2 + }, + { + "label": "G", + "x": 5.75, + "y": 2 + }, + { + "label": "H", + "x": 6.75, + "y": 2 + }, + { + "label": "J", + "x": 7.75, + "y": 2 + }, + { + "label": "K", + "x": 8.75, + "y": 2 + }, + { + "label": "L", + "x": 9.75, + "y": 2 + }, + { + "label": "+", + "x": 10.75, + "y": 2 + }, + { + "label": "*", + "x": 11.75, + "y": 2 + }, + { + "label": "}", + "x": 12.75, + "y": 2 + }, + { + "label": "Shift", + "x": 0, + "y": 3, + "w": 2.25 + }, + { + "label": "Z", + "x": 2.25, + "y": 3 + }, + { + "label": "X", + "x": 3.25, + "y": 3 + }, + { + "label": "C", + "x": 4.25, + "y": 3 + }, + { + "label": "V", + "x": 5.25, + "y": 3 + }, + { + "label": "B", + "x": 6.25, + "y": 3 + }, + { + "label": "N", + "x": 7.25, + "y": 3 + }, + { + "label": "M", + "x": 8.25, + "y": 3 + }, + { + "label": "<", + "x": 9.25, + "y": 3 + }, + { + "label": ">", + "x": 10.25, + "y": 3 + }, + { + "label": "?", + "x": 11.25, + "y": 3 + }, + { + "label": "_", + "x": 12.25, + "y": 3 + }, + { + "label": "Shift", + "x": 13.25, + "y": 3, + "w": 1.75 + }, + { + "label": "Ctrl", + "x": 0, + "y": 4, + "w": 1.25 + }, + { + "label": "Win", + "x": 1.25, + "y": 4 + }, + { + "label": "Alt", + "x": 2.25, + "y": 4 + }, + { + "label": "\u7121\u5909\u63db", + "x": 3.25, + "y": 4, + "w": 1.25 + }, + { + "label": "", + "x": 4.5, + "y": 4, + "w": 6 + }, + { + "label": "\u5909\u63db", + "x": 10.5, + "y": 4, + "w": 1.25 + }, + { + "label": "\u304b\u306a", + "x": 11.75, + "y": 4 + }, + { + "label": "\u534a\u89d2 \u5168\u89d2 \u6f22\u5b57", + "x": 12.75, + "y": 4 + }, + { + "label": "Caps Lock", + "x": 13.75, + "y": 4, + "w": 1.25 + } ] } } -} +} \ No newline at end of file diff --git a/keyboards/ai03/jp60/readme.md b/keyboards/ai03/jp60/readme.md index 1cf80ae6a1ee..4674bc5dfeb0 100644 --- a/keyboards/ai03/jp60/readme.md +++ b/keyboards/ai03/jp60/readme.md @@ -1,12 +1,12 @@ # JP60 -![JP60](imgur.com image replace me!) +![JP60](https://github.com/ai03-2725/JP60/raw/main/Render/Front.png) -*A short description of the keyboard/project* +GH60-compatible JIS-like hotswap keyboard PCB * Keyboard Maintainer: [ai03](https://github.com/yourusername) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: [JP60 PCB](https://github.com/ai03-2725/JP60) +* Hardware Availability: To be made available in JP market soon; will be listed in the repo above Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk index 0f3a697d076f..e02970225068 100644 --- a/keyboards/ai03/jp60/rules.mk +++ b/keyboards/ai03/jp60/rules.mk @@ -20,6 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - -DEBOUNCE_TYPE = sym_defer_pk -LTO_ENABLE = yes \ No newline at end of file +DEBOUNCE_TYPE = sym_defer_pk # Specify per-key debounce for improved responsiveness +LTO_ENABLE = yes # Optimize firmware at link time \ No newline at end of file From b1eb6c10624d9f1c291c69a0b4c8df6107ae8732 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 29 Aug 2021 21:57:59 +0900 Subject: [PATCH 07/12] Replace tabs with spaces --- keyboards/ai03/jp60/jp60.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/ai03/jp60/jp60.h b/keyboards/ai03/jp60/jp60.h index f65531bd43c0..9635e2f3cea4 100644 --- a/keyboards/ai03/jp60/jp60.h +++ b/keyboards/ai03/jp60/jp60.h @@ -27,16 +27,16 @@ * represents the switch matrix. */ #define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K407, K410, K411, K412, K413 \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, \ + K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ + K400, K401, K402, K403, K407, K410, K411, K412, K413 \ ) \ { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, KC_NO, KC_NO, KC_NO, K407, KC_NO, KC_NO, K410, K411, K412, K413 } \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ + { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ + { K400, K401, K402, K403, KC_NO, KC_NO, KC_NO, K407, KC_NO, KC_NO, K410, K411, K412, K413 } \ } From 71b443b7c185da2ed02a5dca7f7f85e8c5e72116 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 29 Aug 2021 22:00:37 +0900 Subject: [PATCH 08/12] Move performance changes to per-keymap --- keyboards/ai03/jp60/config.h | 4 ---- keyboards/ai03/jp60/keymaps/default/config.h | 21 ++++++++++++++++++++ keyboards/ai03/jp60/keymaps/via/config.h | 21 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 keyboards/ai03/jp60/keymaps/default/config.h create mode 100644 keyboards/ai03/jp60/keymaps/via/config.h diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h index eb7ac0dca73c..a06d75c8e513 100644 --- a/keyboards/ai03/jp60/config.h +++ b/keyboards/ai03/jp60/config.h @@ -58,10 +58,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Increase polling rates and scan quantity for improved performance */ -#define USB_POLLING_INTERVAL_MS 1 -#define QMK_KEYS_PER_SCAN 12 - /* 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). */ diff --git a/keyboards/ai03/jp60/keymaps/default/config.h b/keyboards/ai03/jp60/keymaps/default/config.h new file mode 100644 index 000000000000..6aea297a5bce --- /dev/null +++ b/keyboards/ai03/jp60/keymaps/default/config.h @@ -0,0 +1,21 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ + +#pragma once + +/* Increase polling rates and scan quantity for improved performance */ +#define USB_POLLING_INTERVAL_MS 1 +#define QMK_KEYS_PER_SCAN 12 \ No newline at end of file diff --git a/keyboards/ai03/jp60/keymaps/via/config.h b/keyboards/ai03/jp60/keymaps/via/config.h new file mode 100644 index 000000000000..6aea297a5bce --- /dev/null +++ b/keyboards/ai03/jp60/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* Copyright 2021 ai03 + * + * 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 . + */ + +#pragma once + +/* Increase polling rates and scan quantity for improved performance */ +#define USB_POLLING_INTERVAL_MS 1 +#define QMK_KEYS_PER_SCAN 12 \ No newline at end of file From 37c8ca0be5f4d5fecdf9548800d723c12311301b Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 29 Aug 2021 22:05:34 +0900 Subject: [PATCH 09/12] Move debounce method out of main rules.mk to per-keymap --- keyboards/ai03/jp60/keymaps/default/rules.mk | 1 + keyboards/ai03/jp60/keymaps/via/rules.mk | 3 ++- keyboards/ai03/jp60/readme.md | 2 +- keyboards/ai03/jp60/rules.mk | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 keyboards/ai03/jp60/keymaps/default/rules.mk diff --git a/keyboards/ai03/jp60/keymaps/default/rules.mk b/keyboards/ai03/jp60/keymaps/default/rules.mk new file mode 100644 index 000000000000..edac26d087f5 --- /dev/null +++ b/keyboards/ai03/jp60/keymaps/default/rules.mk @@ -0,0 +1 @@ +DEBOUNCE_TYPE = asym_eager_defer_pk # Specify per-key debounce for improved responsiveness \ No newline at end of file diff --git a/keyboards/ai03/jp60/keymaps/via/rules.mk b/keyboards/ai03/jp60/keymaps/via/rules.mk index 036bd6d1c3ec..4956961bef7a 100644 --- a/keyboards/ai03/jp60/keymaps/via/rules.mk +++ b/keyboards/ai03/jp60/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes # Enable compatibility with VIA-protocol configurators +DEBOUNCE_TYPE = asym_eager_defer_pk # Specify per-key debounce for improved responsiveness \ No newline at end of file diff --git a/keyboards/ai03/jp60/readme.md b/keyboards/ai03/jp60/readme.md index 4674bc5dfeb0..9af4477b714a 100644 --- a/keyboards/ai03/jp60/readme.md +++ b/keyboards/ai03/jp60/readme.md @@ -4,7 +4,7 @@ GH60-compatible JIS-like hotswap keyboard PCB -* Keyboard Maintainer: [ai03](https://github.com/yourusername) +* Keyboard Maintainer: [ai03](https://github.com/ai03-2725) * Hardware Supported: [JP60 PCB](https://github.com/ai03-2725/JP60) * Hardware Availability: To be made available in JP market soon; will be listed in the repo above diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk index e02970225068..1a9cc7ea60af 100644 --- a/keyboards/ai03/jp60/rules.mk +++ b/keyboards/ai03/jp60/rules.mk @@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -DEBOUNCE_TYPE = sym_defer_pk # Specify per-key debounce for improved responsiveness LTO_ENABLE = yes # Optimize firmware at link time \ No newline at end of file From e558964fd92bbf655aabe4414929ed96d569a4bb Mon Sep 17 00:00:00 2001 From: ai03 Date: Mon, 30 Aug 2021 10:14:01 +0900 Subject: [PATCH 10/12] Oops --- keyboards/ai03/jp60/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ai03/jp60/readme.md b/keyboards/ai03/jp60/readme.md index 9af4477b714a..25a3b164136c 100644 --- a/keyboards/ai03/jp60/readme.md +++ b/keyboards/ai03/jp60/readme.md @@ -10,11 +10,11 @@ GH60-compatible JIS-like hotswap keyboard PCB Make example for this keyboard (after setting up your build environment): - make jp60:default + make ai03/jp60:default Flashing example for this keyboard: - make jp60:default:flash + make ai03/jp60:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From a42136d43f804ff00c5a2513cccc2633d2e65417 Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 2 Sep 2021 03:58:52 +0900 Subject: [PATCH 11/12] Apply changes from code review Co-authored-by: Drashna Jaelre --- keyboards/ai03/jp60/keymaps/default/config.h | 2 +- keyboards/ai03/jp60/keymaps/via/config.h | 2 +- keyboards/ai03/jp60/rules.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ai03/jp60/keymaps/default/config.h b/keyboards/ai03/jp60/keymaps/default/config.h index 6aea297a5bce..ee63d9feee1f 100644 --- a/keyboards/ai03/jp60/keymaps/default/config.h +++ b/keyboards/ai03/jp60/keymaps/default/config.h @@ -18,4 +18,4 @@ /* Increase polling rates and scan quantity for improved performance */ #define USB_POLLING_INTERVAL_MS 1 -#define QMK_KEYS_PER_SCAN 12 \ No newline at end of file +#define QMK_KEYS_PER_SCAN 12 diff --git a/keyboards/ai03/jp60/keymaps/via/config.h b/keyboards/ai03/jp60/keymaps/via/config.h index 6aea297a5bce..ee63d9feee1f 100644 --- a/keyboards/ai03/jp60/keymaps/via/config.h +++ b/keyboards/ai03/jp60/keymaps/via/config.h @@ -18,4 +18,4 @@ /* Increase polling rates and scan quantity for improved performance */ #define USB_POLLING_INTERVAL_MS 1 -#define QMK_KEYS_PER_SCAN 12 \ No newline at end of file +#define QMK_KEYS_PER_SCAN 12 diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk index 1a9cc7ea60af..d45b44a58b77 100644 --- a/keyboards/ai03/jp60/rules.mk +++ b/keyboards/ai03/jp60/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 From 8f011eca36d932aecf5e8a12301d8013f281fc88 Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 30 Sep 2021 00:18:43 +0900 Subject: [PATCH 12/12] Apply suggestions from code review Co-authored-by: Drashna Jaelre Co-authored-by: Ryan --- keyboards/ai03/jp60/info.json | 2 -- keyboards/ai03/jp60/rules.mk | 1 - 2 files changed, 3 deletions(-) diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index 19164cbe756e..d5453de73416 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -2,8 +2,6 @@ "keyboard_name": "JP60", "url": "https://github.com/ai03-2725/JP60", "maintainer": "ai03", - "width": 15, - "height": 5, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk index d45b44a58b77..2dcf0bf77c1d 100644 --- a/keyboards/ai03/jp60/rules.mk +++ b/keyboards/ai03/jp60/rules.mk @@ -18,6 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Optimize firmware at link time \ No newline at end of file