From 44731b57051c8ec696c96dfd69c9100c487449be Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 27 Jun 2020 21:18:43 +0800 Subject: [PATCH 01/48] Port Arisu to QMK --- keyboards/arisu/arisu.c | 1 + keyboards/arisu/arisu.h | 30 +++ keyboards/arisu/config.h | 58 +++++ keyboards/arisu/info.json | 291 +++++++++++++++++++++++ keyboards/arisu/keymaps/default/keymap.c | 198 +++++++++++++++ keyboards/arisu/keymaps/via/keymap.c | 54 +++++ keyboards/arisu/keymaps/via/rules.mk | 2 + keyboards/arisu/readme.md | 21 ++ keyboards/arisu/rules.mk | 56 +++++ 9 files changed, 711 insertions(+) create mode 100644 keyboards/arisu/arisu.c create mode 100644 keyboards/arisu/arisu.h create mode 100644 keyboards/arisu/config.h create mode 100644 keyboards/arisu/info.json create mode 100644 keyboards/arisu/keymaps/default/keymap.c create mode 100644 keyboards/arisu/keymaps/via/keymap.c create mode 100644 keyboards/arisu/keymaps/via/rules.mk create mode 100644 keyboards/arisu/readme.md create mode 100644 keyboards/arisu/rules.mk diff --git a/keyboards/arisu/arisu.c b/keyboards/arisu/arisu.c new file mode 100644 index 000000000000..f566924a65a3 --- /dev/null +++ b/keyboards/arisu/arisu.c @@ -0,0 +1 @@ +#include "arisu.h" diff --git a/keyboards/arisu/arisu.h b/keyboards/arisu/arisu.h new file mode 100644 index 000000000000..3aad3edb0830 --- /dev/null +++ b/keyboards/arisu/arisu.h @@ -0,0 +1,30 @@ +#ifndef ARISU_H +#define ARISU_H + +#include "quantum.h" + +#define KEYMAP( \ + K000, K001, K002, K003, K004, K005, K006, K007, \ + K010, K011, K012, K013, K014, K015, K016, \ + K020, K021, K022, K023, K024, K025, K026, K027, \ + K030, K031, K032, K033, K034, K035, K036, \ + K040, K041, K042, K043, K044, K045, K046, K047, \ + K050, K051, K052, K053, K054, K055, \ + K060, K061, K062, K063, K064, K065, K067, \ + K070, K071, K072, K073, K074, K075, K076, \ + K080, K081, K082, K086, K087, \ + K092, K093, K094, K096 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007 }, \ + { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \ + { K020, K021, K022, K023, K024, K025, K026, K027 }, \ + { K030, K031, K032, K033, K034, K035, K036, KC_NO }, \ + { K040, K041, K042, K043, K044, K045, K046, K047 }, \ + { K050, K051, K052, K053, K054, K055, KC_NO, KC_NO }, \ + { K060, K061, K062, K063, K064, K065, KC_NO, K067 }, \ + { K070, K071, K072, K073, K074, K075, K076, KC_NO }, \ + { K080, K081, K082, KC_NO, KC_NO, KC_NO, K086, K087 }, \ + { KC_NO, KC_NO, K092, K093, K094, KC_NO, K096, KC_NO } \ +} + +#endif diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h new file mode 100644 index 000000000000..f9374a7734e7 --- /dev/null +++ b/keyboards/arisu/config.h @@ -0,0 +1,58 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x6172 +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER qmkbuilder +#define PRODUCT keyboard +#define DESCRIPTION Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 10 +#define MATRIX_COLS 8 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* number of backlight levels */ + +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 0 +#endif + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* prevent stuck modifiers */ +#define PREVENT_STUCK_MODIFIERS + + +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 0 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif + +#endif diff --git a/keyboards/arisu/info.json b/keyboards/arisu/info.json new file mode 100644 index 000000000000..58b53bc4c70c --- /dev/null +++ b/keyboards/arisu/info.json @@ -0,0 +1,291 @@ +{ + "keyboard_name": "Arisu", + "url": "https://github.com/FateNozomi/arisu-pcb", + "maintainer": "qmk", + "width": 19.75, + "height": 5.25, + "layouts": { + "LAYOUT_default": { + "layout": + [ + [ + { + "y": 0.9, + "x": 17.8, + "c": "#777777" + }, + "2,7" + ], + [ + { + "y": -0.95, + "x": 3.7, + "c": "#cccccc" + }, + "0,1", + { + "x": 8.45 + }, + "1,5" + ], + [ + { + "y": -0.95, + "x": 1.7 + }, + "0,0", + "1,0", + { + "x": 10.45 + }, + "0,6", + { + "x": 1.7763568394002505e-15 + }, + "1,6", + { + "c": "#aaaaaa" + }, + "0,7" + ], + [ + { + "y": -0.10000000000000009, + "x": 18.1 + }, + "4,7" + ], + [ + { + "y": -0.95, + "x": 13, + "c": "#cccccc" + }, + "2,5" + ], + [ + { + "y": -0.9500000000000002, + "x": 1.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "3,0", + { + "x": 10 + }, + "3,5", + "2,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,6" + ], + [ + { + "y": -0.10000000000000009, + "x": 18.4 + }, + "6,7" + ], + [ + { + "y": -0.8999999999999999, + "x": 1.3, + "w": 1.75 + }, + "4,0", + { + "c": "#cccccc" + }, + "5,0", + { + "x": 9.350000000000001 + }, + "4,5", + { + "x": -1.7763568394002505e-15 + }, + "5,5", + { + "c": "#777777", + "w": 2.25 + }, + "4,6" + ], + [ + { + "x": 1.05, + "c": "#aaaaaa", + "w": 2.25 + }, + "6,0", + { + "c": "#cccccc" + }, + "7,0", + { + "x": 8.8 + }, + "7,4", + { + "x": -1.7763568394002505e-15 + }, + "6,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "7,5" + ], + [ + { + "y": -0.75, + "x": 17.5 + }, + "7,6" + ], + [ + { + "y": -0.25, + "x": 1.05, + "w": 1.5 + }, + "8,0" + ], + [ + { + "y": -0.75, + "x": 16.5 + }, + "8,6", + "9,6", + "8,7" + ], + [ + { + "r": 12, + "y": -6.25, + "x": 5.05, + "c": "#cccccc" + }, + "1,1", + "0,2", + "1,2", + "0,3" + ], + [ + { + "x": 4.6 + }, + "2,1", + "3,1", + "2,2", + "3,2" + ], + [ + { + "x": 4.85 + }, + "4,1", + "5,1", + "4,2", + "5,2" + ], + [ + { + "x": 5.3 + }, + "6,1", + "7,1", + "6,2", + "7,2" + ], + [ + { + "x": 6.6, + "c": "#777777", + "w": 2 + }, + "8,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,2" + ], + [ + { + "y": -0.9500000000000002, + "x": 5.05, + "w": 1.5 + }, + "8,1" + ], + [ + { + "r": -12, + "y": -1.4499999999999997, + "x": 8.45, + "c": "#cccccc" + }, + "1,3", + "0,4", + "1,4", + "0,5" + ], + [ + { + "x": 8.05 + }, + "2,3", + "3,3", + "2,4", + "3,4" + ], + [ + { + "x": 8.2 + }, + "4,3", + "5,3", + "4,4", + "5,4" + ], + [ + { + "x": 8.75 + }, + "6,3", + "7,3", + "6,4" + ], + [ + { + "x": 7.75, + "c": "#777777", + "w": 2.75 + }, + "9,3" + ], + [ + { + "y": -0.9499999999999993, + "x": 10.55, + "c": "#aaaaaa", + "w": 1.5 + }, + "9,4" + ] + ] + + } + + + } +} diff --git a/keyboards/arisu/keymaps/default/keymap.c b/keyboards/arisu/keymaps/default/keymap.c new file mode 100644 index 000000000000..adce3d188926 --- /dev/null +++ b/keyboards/arisu/keymaps/default/keymap.c @@ -0,0 +1,198 @@ +#include "arisu.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + KEYMAP( + KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, + KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, + KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, + KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, + KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, + KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, + KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + KC_SPC, KC_SPC, KC_LALT, KC_DOWN), + + KEYMAP( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + +}; + diff --git a/keyboards/arisu/keymaps/via/keymap.c b/keyboards/arisu/keymaps/via/keymap.c new file mode 100644 index 000000000000..57b1cd2f4ffd --- /dev/null +++ b/keyboards/arisu/keymaps/via/keymap.c @@ -0,0 +1,54 @@ +#include "arisu.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + KEYMAP( + KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, + KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, + KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, + KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, + KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, + KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, + KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + KC_SPC, KC_SPC, KC_LALT, KC_DOWN), + + KEYMAP( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + +}; + diff --git a/keyboards/arisu/keymaps/via/rules.mk b/keyboards/arisu/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/arisu/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/arisu/readme.md b/keyboards/arisu/readme.md new file mode 100644 index 000000000000..b2e21665560b --- /dev/null +++ b/keyboards/arisu/readme.md @@ -0,0 +1,21 @@ +# ARISU + +PCB designed using KiCad. The layout is inspired by Lyn's EM7 and TGR Alice with some modification of my own. + +Key differences: + + - I removed the extra [B] key on the right half and shifted the [NM,.?] row to the left by 0.25U. + - Shifted the 3 keys to the right and added arrow keys. + - Tweaked the bottom so that the 1.5U keys doesn't protrude out a little. + +Shifting the [NM,.?] row to the left by 0.25U required quite some work on the arrangement of keys for the right half. As a result, this does not give the same typing experience as Lyn's EM7 and TGR Alice. Lyn's EM7 and TGR Alice uses the home row as the center point to vertically align both halves while I used the number row instead. Due to the nature of staggered keyboards, aligning using the number row resulted in the home row not being aligned. + +Keyboard Maintainer: [Fate Nozomi](https://github.com/FateNozomi/arisu-pcb) +Hardware Supported: ARISU PCB +Hardware Availability: [Fate Nozomi](https://github.com/FateNozomi/arisu-pcb) + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb arisu -km default + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/arisu/rules.mk b/keyboards/arisu/rules.mk new file mode 100644 index 000000000000..1f8e943be7fb --- /dev/null +++ b/keyboards/arisu/rules.mk @@ -0,0 +1,56 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= no \ No newline at end of file From 241ec0cb76f2459596ad8b34dca3042232d46640 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Wed, 1 Jul 2020 18:59:18 +0800 Subject: [PATCH 02/48] Update Change name to PH Arisu --- keyboards/arisu/arisu.c | 1 - keyboards/arisu/readme.md | 21 ------------------- keyboards/{arisu => ph_arisu}/config.h | 0 keyboards/{arisu => ph_arisu}/info.json | 2 +- .../keymaps/default/keymap.c | 2 +- .../{arisu => ph_arisu}/keymaps/via/keymap.c | 2 +- .../{arisu => ph_arisu}/keymaps/via/rules.mk | 0 keyboards/ph_arisu/ph_arisu.c | 1 + .../{arisu/arisu.h => ph_arisu/ph_arisu.h} | 4 ++-- keyboards/ph_arisu/readme.md | 14 +++++++++++++ keyboards/{arisu => ph_arisu}/rules.mk | 0 11 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 keyboards/arisu/arisu.c delete mode 100644 keyboards/arisu/readme.md rename keyboards/{arisu => ph_arisu}/config.h (100%) rename keyboards/{arisu => ph_arisu}/info.json (99%) rename keyboards/{arisu => ph_arisu}/keymaps/default/keymap.c (99%) rename keyboards/{arisu => ph_arisu}/keymaps/via/keymap.c (99%) rename keyboards/{arisu => ph_arisu}/keymaps/via/rules.mk (100%) create mode 100644 keyboards/ph_arisu/ph_arisu.c rename keyboards/{arisu/arisu.h => ph_arisu/ph_arisu.h} (96%) create mode 100644 keyboards/ph_arisu/readme.md rename keyboards/{arisu => ph_arisu}/rules.mk (100%) diff --git a/keyboards/arisu/arisu.c b/keyboards/arisu/arisu.c deleted file mode 100644 index f566924a65a3..000000000000 --- a/keyboards/arisu/arisu.c +++ /dev/null @@ -1 +0,0 @@ -#include "arisu.h" diff --git a/keyboards/arisu/readme.md b/keyboards/arisu/readme.md deleted file mode 100644 index b2e21665560b..000000000000 --- a/keyboards/arisu/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -# ARISU - -PCB designed using KiCad. The layout is inspired by Lyn's EM7 and TGR Alice with some modification of my own. - -Key differences: - - - I removed the extra [B] key on the right half and shifted the [NM,.?] row to the left by 0.25U. - - Shifted the 3 keys to the right and added arrow keys. - - Tweaked the bottom so that the 1.5U keys doesn't protrude out a little. - -Shifting the [NM,.?] row to the left by 0.25U required quite some work on the arrangement of keys for the right half. As a result, this does not give the same typing experience as Lyn's EM7 and TGR Alice. Lyn's EM7 and TGR Alice uses the home row as the center point to vertically align both halves while I used the number row instead. Due to the nature of staggered keyboards, aligning using the number row resulted in the home row not being aligned. - -Keyboard Maintainer: [Fate Nozomi](https://github.com/FateNozomi/arisu-pcb) -Hardware Supported: ARISU PCB -Hardware Availability: [Fate Nozomi](https://github.com/FateNozomi/arisu-pcb) - -Make example for this keyboard (after setting up your build environment): - - qmk compile -kb arisu -km default - -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/arisu/config.h b/keyboards/ph_arisu/config.h similarity index 100% rename from keyboards/arisu/config.h rename to keyboards/ph_arisu/config.h diff --git a/keyboards/arisu/info.json b/keyboards/ph_arisu/info.json similarity index 99% rename from keyboards/arisu/info.json rename to keyboards/ph_arisu/info.json index 58b53bc4c70c..d8bba9e33308 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/ph_arisu/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Arisu", + "keyboard_name": "PH Arisu", "url": "https://github.com/FateNozomi/arisu-pcb", "maintainer": "qmk", "width": 19.75, diff --git a/keyboards/arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c similarity index 99% rename from keyboards/arisu/keymaps/default/keymap.c rename to keyboards/ph_arisu/keymaps/default/keymap.c index adce3d188926..28cf924d711e 100644 --- a/keyboards/arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "arisu.h" +#include "ph_arisu.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c similarity index 99% rename from keyboards/arisu/keymaps/via/keymap.c rename to keyboards/ph_arisu/keymaps/via/keymap.c index 57b1cd2f4ffd..25e49cdc3130 100644 --- a/keyboards/arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -#include "arisu.h" +#include "ph_arisu.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/arisu/keymaps/via/rules.mk b/keyboards/ph_arisu/keymaps/via/rules.mk similarity index 100% rename from keyboards/arisu/keymaps/via/rules.mk rename to keyboards/ph_arisu/keymaps/via/rules.mk diff --git a/keyboards/ph_arisu/ph_arisu.c b/keyboards/ph_arisu/ph_arisu.c new file mode 100644 index 000000000000..e1cd5d3a0464 --- /dev/null +++ b/keyboards/ph_arisu/ph_arisu.c @@ -0,0 +1 @@ +#include "ph_arisu.h" diff --git a/keyboards/arisu/arisu.h b/keyboards/ph_arisu/ph_arisu.h similarity index 96% rename from keyboards/arisu/arisu.h rename to keyboards/ph_arisu/ph_arisu.h index 3aad3edb0830..bcee93286a93 100644 --- a/keyboards/arisu/arisu.h +++ b/keyboards/ph_arisu/ph_arisu.h @@ -1,5 +1,5 @@ -#ifndef ARISU_H -#define ARISU_H +#ifndef PH_ARISU_H +#define PH_ARISU_H #include "quantum.h" diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md new file mode 100644 index 000000000000..5839d34ea1dc --- /dev/null +++ b/keyboards/ph_arisu/readme.md @@ -0,0 +1,14 @@ +# PH ARISU + +PCB is base on https://github.com/FateNozomi/arisu-pcb +and used for a local groupbuy. + +Keyboard Maintainer: [Leivince John](https://github.com/devinceble) +Hardware Supported: PH ARISU PCB +Hardware Availability: Base on [ARISU](https://github.com/FateNozomi/arisu-pcb) + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb ph_arisu -km default + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/arisu/rules.mk b/keyboards/ph_arisu/rules.mk similarity index 100% rename from keyboards/arisu/rules.mk rename to keyboards/ph_arisu/rules.mk From 5e5377969e2a19bcbac0e4d73528e836d64f380a Mon Sep 17 00:00:00 2001 From: Leivince John Date: Wed, 1 Jul 2020 21:49:04 +0800 Subject: [PATCH 03/48] Update PH Arisu for PR --- keyboards/ph_arisu/readme.md | 2 +- keyboards/ph_arisu/rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 5839d34ea1dc..239116e7687f 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,7 +1,7 @@ # PH ARISU PCB is base on https://github.com/FateNozomi/arisu-pcb -and used for a local groupbuy. +and used for a local groupbuy in the Philippines. Keyboard Maintainer: [Leivince John](https://github.com/devinceble) Hardware Supported: PH ARISU PCB diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index 1f8e943be7fb..d4e21abb330d 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -53,4 +53,4 @@ SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no \ No newline at end of file +RGBLIGHT_ENABLE ?= no From 39284633f243a5f03beebc020f64eec780b7d1fb Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 2 Jul 2020 11:22:01 +0800 Subject: [PATCH 04/48] Update Bootloader --- keyboards/ph_arisu/rules.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index d4e21abb330d..6df14e3b10b6 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -1,6 +1,16 @@ # MCU name MCU = atmega32u4 +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + # Processor frequency. # This will define a symbol, F_CPU, in all source code files equal to the # processor frequency in Hz. You can then use this symbol in your source code to From 8afac708ad4b6fcd2092bdab28066b321ccc3119 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 2 Jul 2020 11:32:35 +0800 Subject: [PATCH 05/48] Using Pro Micro --- keyboards/ph_arisu/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index 6df14e3b10b6..5c7aef3507fe 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -9,7 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu +BOOTLOADER = caterina # Processor frequency. # This will define a symbol, F_CPU, in all source code files equal to the From fc9aa393b5669360ea9efd2c026527d38e1d5c86 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 4 Jul 2020 20:29:17 +0800 Subject: [PATCH 06/48] Update Manufacturer Name --- keyboards/ph_arisu/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index f9374a7734e7..bd03a95a46bd 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -7,7 +7,7 @@ #define VENDOR_ID 0x6172 #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 -#define MANUFACTURER qmkbuilder +#define MANUFACTURER PHARISU #define PRODUCT keyboard #define DESCRIPTION Keyboard From 5c1768f0accd108a7dc921be600c2f03cdf0fb8d Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 4 Jul 2020 20:59:24 +0800 Subject: [PATCH 07/48] Clean rules.mk --- keyboards/ph_arisu/rules.mk | 52 +++++-------------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index 5c7aef3507fe..03751873e79b 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -11,56 +11,16 @@ MCU = atmega32u4 # ATmega328P USBasp BOOTLOADER = caterina -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # comment out to disable the options. # BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +#CONSOLE_ENABLE ?= no # Console for debug(+400) +#COMMAND_ENABLE ?= no # Commands for debug and configuration +#SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no +#BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +#AUDIO_ENABLE ?= no +#RGBLIGHT_ENABLE ?= no From aa3ce708ea5e77d569dca05c29c6fa450ef062d0 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:13:16 +0800 Subject: [PATCH 08/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index bd03a95a46bd..51b6cc4b45ac 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include "config_common.h" From 3a8618b930d19cdadcc134feb8b5178c220eb794 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:13:28 +0800 Subject: [PATCH 09/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index 51b6cc4b45ac..77b6c0cb98d8 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -6,8 +6,8 @@ #define VENDOR_ID 0x6172 #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 -#define MANUFACTURER PHARISU -#define PRODUCT keyboard +#define MANUFACTURER PH +#define PRODUCT Arisu #define DESCRIPTION Keyboard /* key matrix size */ From 2b35aa172bc5ec9b6e7c6c37fd1b2ef5ee89a921 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:13:36 +0800 Subject: [PATCH 10/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index 77b6c0cb98d8..1fdbae11bf3d 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -29,7 +29,7 @@ #endif /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From 4a7e9812f320778f9b629c98855f1cb26502c138 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:13:49 +0800 Subject: [PATCH 11/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index 1fdbae11bf3d..edb33fa04f7c 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -37,11 +37,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - /* prevent stuck modifiers */ #define PREVENT_STUCK_MODIFIERS From 43d3194121fe89e0629e4e85b33a57f9369af033 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:14:09 +0800 Subject: [PATCH 12/48] Update keyboards/ph_arisu/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/ph_arisu/keymaps/default/keymap.c | 218 +++----------------- 1 file changed, 24 insertions(+), 194 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index 28cf924d711e..2795f63520ec 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -1,198 +1,28 @@ #include "ph_arisu.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - KEYMAP( - KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, - KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, - KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, - KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, - KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, - KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, - KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, - KC_SPC, KC_SPC, KC_LALT, KC_DOWN), - - KEYMAP( - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) - + LAYOUT( + KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, + KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, + KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, + KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, + KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, + KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, + KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + KC_SPC, KC_SPC, KC_LALT, KC_DOWN + ), + LAYOUT( + RESET, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ) }; - From 7782fd742f83e30417933176e72346389e0e795e Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:14:26 +0800 Subject: [PATCH 13/48] Update keyboards/ph_arisu/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/ph_arisu/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index 2795f63520ec..144e40822175 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "ph_arisu.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( From a33285c521a6de789bdc153e52727b4b1455753e Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:14:34 +0800 Subject: [PATCH 14/48] Update keyboards/ph_arisu/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/ph_arisu/keymaps/via/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c index 25e49cdc3130..6056ed22a84d 100644 --- a/keyboards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -#include "ph_arisu.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -51,4 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; - From 79d35c5e0ef7d7990172660d349bc78da408bfda Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 14:14:47 +0800 Subject: [PATCH 15/48] Update keyboards/ph_arisu/rules.mk Co-authored-by: Ryan --- keyboards/ph_arisu/rules.mk | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index 03751873e79b..6868899191f2 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -12,15 +12,20 @@ MCU = atmega32u4 BOOTLOADER = caterina # Build Options -# comment out to disable the options. +# change yes to no to disable # -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -#CONSOLE_ENABLE ?= no # Console for debug(+400) -#COMMAND_ENABLE ?= no # Commands for debug and configuration -#SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -#BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -#AUDIO_ENABLE ?= no -#RGBLIGHT_ENABLE ?= no +BOOTMAGIC_ENABLE = yes # 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches From a38dea6148b5000ed2ffc9a34e14e87ffc69bebb Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 14:19:12 +0800 Subject: [PATCH 16/48] https://github.com/qmk/qmk_firmware/pull/9612#discussion_r451659279 Update info.json using converter --- keyboards/ph_arisu/info.json | 287 +---------------------------------- 1 file changed, 4 insertions(+), 283 deletions(-) diff --git a/keyboards/ph_arisu/info.json b/keyboards/ph_arisu/info.json index d8bba9e33308..01304f537ddd 100644 --- a/keyboards/ph_arisu/info.json +++ b/keyboards/ph_arisu/info.json @@ -2,290 +2,11 @@ "keyboard_name": "PH Arisu", "url": "https://github.com/FateNozomi/arisu-pcb", "maintainer": "qmk", - "width": 19.75, - "height": 5.25, + "width": 19.5, + "height": 8.65, "layouts": { - "LAYOUT_default": { - "layout": - [ - [ - { - "y": 0.9, - "x": 17.8, - "c": "#777777" - }, - "2,7" - ], - [ - { - "y": -0.95, - "x": 3.7, - "c": "#cccccc" - }, - "0,1", - { - "x": 8.45 - }, - "1,5" - ], - [ - { - "y": -0.95, - "x": 1.7 - }, - "0,0", - "1,0", - { - "x": 10.45 - }, - "0,6", - { - "x": 1.7763568394002505e-15 - }, - "1,6", - { - "c": "#aaaaaa" - }, - "0,7" - ], - [ - { - "y": -0.10000000000000009, - "x": 18.1 - }, - "4,7" - ], - [ - { - "y": -0.95, - "x": 13, - "c": "#cccccc" - }, - "2,5" - ], - [ - { - "y": -0.9500000000000002, - "x": 1.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "3,0", - { - "x": 10 - }, - "3,5", - "2,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "3,6" - ], - [ - { - "y": -0.10000000000000009, - "x": 18.4 - }, - "6,7" - ], - [ - { - "y": -0.8999999999999999, - "x": 1.3, - "w": 1.75 - }, - "4,0", - { - "c": "#cccccc" - }, - "5,0", - { - "x": 9.350000000000001 - }, - "4,5", - { - "x": -1.7763568394002505e-15 - }, - "5,5", - { - "c": "#777777", - "w": 2.25 - }, - "4,6" - ], - [ - { - "x": 1.05, - "c": "#aaaaaa", - "w": 2.25 - }, - "6,0", - { - "c": "#cccccc" - }, - "7,0", - { - "x": 8.8 - }, - "7,4", - { - "x": -1.7763568394002505e-15 - }, - "6,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "7,5" - ], - [ - { - "y": -0.75, - "x": 17.5 - }, - "7,6" - ], - [ - { - "y": -0.25, - "x": 1.05, - "w": 1.5 - }, - "8,0" - ], - [ - { - "y": -0.75, - "x": 16.5 - }, - "8,6", - "9,6", - "8,7" - ], - [ - { - "r": 12, - "y": -6.25, - "x": 5.05, - "c": "#cccccc" - }, - "1,1", - "0,2", - "1,2", - "0,3" - ], - [ - { - "x": 4.6 - }, - "2,1", - "3,1", - "2,2", - "3,2" - ], - [ - { - "x": 4.85 - }, - "4,1", - "5,1", - "4,2", - "5,2" - ], - [ - { - "x": 5.3 - }, - "6,1", - "7,1", - "6,2", - "7,2" - ], - [ - { - "x": 6.6, - "c": "#777777", - "w": 2 - }, - "8,2", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "9,2" - ], - [ - { - "y": -0.9500000000000002, - "x": 5.05, - "w": 1.5 - }, - "8,1" - ], - [ - { - "r": -12, - "y": -1.4499999999999997, - "x": 8.45, - "c": "#cccccc" - }, - "1,3", - "0,4", - "1,4", - "0,5" - ], - [ - { - "x": 8.05 - }, - "2,3", - "3,3", - "2,4", - "3,4" - ], - [ - { - "x": 8.2 - }, - "4,3", - "5,3", - "4,4", - "5,4" - ], - [ - { - "x": 8.75 - }, - "6,3", - "7,3", - "6,4" - ], - [ - { - "x": 7.75, - "c": "#777777", - "w": 2.75 - }, - "9,3" - ], - [ - { - "y": -0.9499999999999993, - "x": 10.55, - "c": "#aaaaaa", - "w": 1.5 - }, - "9,4" - ] - ] - + "LAYOUT": { + "layout": [{"label":"2,7", "x":17.8, "y":0.9}, {"label":"0,1", "x":3.7, "y":0.9500000000000001}, {"label":"1,5", "x":13.15, "y":0.9500000000000001}, {"label":"0,0", "x":1.7, "y":1.0}, {"label":"1,0", "x":2.7, "y":1.0}, {"label":"0,6", "x":14.149999999999999, "y":1.0}, {"label":"1,6", "x":15.149999999999999, "y":1.0}, {"label":"0,7", "x":16.15, "y":1.0}, {"label":"4,7", "x":18.1, "y":1.9000000000000001}, {"label":"2,5", "x":13, "y":1.9500000000000002}, {"label":"2,0", "x":1.5, "y":2.0, "w":1.5}, {"label":"3,0", "x":3, "y":2.0}, {"label":"3,5", "x":14, "y":2.0}, {"label":"2,6", "x":15, "y":2.0}, {"label":"3,6", "x":16, "y":2.0, "w":1.5}, {"label":"6,7", "x":18.4, "y":2.9000000000000004}, {"label":"4,0", "x":1.3, "y":3.0, "w":1.75}, {"label":"5,0", "x":3.05, "y":3.0}, {"label":"4,5", "x":13.4, "y":3.0}, {"label":"5,5", "x":14.4, "y":3.0}, {"label":"4,6", "x":15.4, "y":3.0, "w":2.25}, {"label":"6,0", "x":1.05, "y":4.0, "w":2.25}, {"label":"7,0", "x":3.3, "y":4.0}, {"label":"7,4", "x":13.100000000000001, "y":4.0}, {"label":"6,5", "x":14.100000000000001, "y":4.0}, {"label":"7,5", "x":15.100000000000001, "y":4.0, "w":1.75}, {"label":"7,6", "x":17.5, "y":4.25}, {"label":"8,0", "x":1.05, "y":5.0, "w":1.5}, {"label":"8,6", "x":16.5, "y":5.25}, {"label":"9,6", "x":17.5, "y":5.25}, {"label":"8,7", "x":18.5, "y":5.25}, {"label":"1,1", "x":5.05, "y":1.66533453693e-16}, {"label":"0,2", "x":6.05, "y":1.66533453693e-16}, {"label":"1,2", "x":7.05, "y":1.66533453693e-16}, {"label":"0,3", "x":8.05, "y":1.66533453693e-16}, {"label":"2,1", "x":4.6, "y":1.0000000000000002}, {"label":"3,1", "x":5.6, "y":1.0000000000000002}, {"label":"2,2", "x":6.6, "y":1.0000000000000002}, {"label":"3,2", "x":7.6, "y":1.0000000000000002}, {"label":"4,1", "x":4.85, "y":2.0}, {"label":"5,1", "x":5.85, "y":2.0}, {"label":"4,2", "x":6.85, "y":2.0}, {"label":"5,2", "x":7.85, "y":2.0}, {"label":"6,1", "x":5.3, "y":3.0}, {"label":"7,1", "x":6.3, "y":3.0}, {"label":"6,2", "x":7.3, "y":3.0}, {"label":"7,2", "x":8.3, "y":3.0}, {"label":"8,2", "x":6.6, "y":4.0, "w":2}, {"label":"9,2", "x":8.6, "y":4.0, "w":1.25}, {"label":"8,1", "x":5.05, "y":4.05, "w":1.5}, {"label":"1,3", "x":8.45, "y":3.6}, {"label":"0,4", "x":9.45, "y":3.6}, {"label":"1,4", "x":10.45, "y":3.6}, {"label":"0,5", "x":11.45, "y":3.6}, {"label":"2,3", "x":8.05, "y":4.6000000000000005}, {"label":"3,3", "x":9.05, "y":4.6000000000000005}, {"label":"2,4", "x":10.05, "y":4.6000000000000005}, {"label":"3,4", "x":11.05, "y":4.6000000000000005}, {"label":"4,3", "x":8.2, "y":5.6000000000000005}, {"label":"5,3", "x":9.2, "y":5.6000000000000005}, {"label":"4,4", "x":10.2, "y":5.6000000000000005}, {"label":"5,4", "x":11.2, "y":5.6000000000000005}, {"label":"6,3", "x":8.75, "y":6.6000000000000005}, {"label":"7,3", "x":9.75, "y":6.6000000000000005}, {"label":"6,4", "x":10.75, "y":6.6000000000000005}, {"label":"9,3", "x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"9,4", "x":10.55, "y":7.65, "w":1.5}] } - - } } From dac17c8ecb563c20c365aaf08a21b614f7fb9c56 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 14:26:12 +0800 Subject: [PATCH 17/48] Fixed Clean endif --- keyboards/ph_arisu/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index edb33fa04f7c..26dfb0ccb639 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -49,4 +49,3 @@ #define RGBLIGHT_VAL_STEP 8 #endif -#endif From e35644a950b935dc3e820643fa01a870c3d99da3 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 14:29:09 +0800 Subject: [PATCH 18/48] LAYOUT not defined Error on Compile fix --- keyboards/ph_arisu/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index 144e40822175..3ce49e5739e6 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( + KEYMAP( KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, KC_SPC, KC_SPC, KC_LALT, KC_DOWN ), - LAYOUT( + KEYMAP( RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 13a58f056257d8a7574f6ba0b1631bda1ad6d179 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 14:37:20 +0800 Subject: [PATCH 19/48] Fix implicit declaration of function 'LAYOUT' --- keyboards/ph_arisu/keymaps/default/keymap.c | 4 ++-- keyboards/ph_arisu/ph_arisu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index 3ce49e5739e6..7b3c39390bc7 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP( + [0] = LAYOUT( KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, KC_SPC, KC_SPC, KC_LALT, KC_DOWN ), - KEYMAP( + [1] = LAYOUT( RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ph_arisu/ph_arisu.h b/keyboards/ph_arisu/ph_arisu.h index bcee93286a93..c20b29d623a1 100644 --- a/keyboards/ph_arisu/ph_arisu.h +++ b/keyboards/ph_arisu/ph_arisu.h @@ -3,7 +3,7 @@ #include "quantum.h" -#define KEYMAP( \ +#define LAYOUT( \ K000, K001, K002, K003, K004, K005, K006, K007, \ K010, K011, K012, K013, K014, K015, K016, \ K020, K021, K022, K023, K024, K025, K026, K027, \ From 6f6770673a1acfa5d66b7ad75c769f01b2360483 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 14:40:27 +0800 Subject: [PATCH 20/48] Update VIA keymap change KEYMAP to new LAYOUT method --- keyboards/ph_arisu/keymaps/via/keymap.c | 92 +++++++++++++------------ 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c index 6056ed22a84d..53d9bae24f44 100644 --- a/keyboards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -2,52 +2,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP( - KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, - KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, - KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, - KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, - KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, - KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, - KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, - KC_SPC, KC_SPC, KC_LALT, KC_DOWN), + [0] = LAYOUT( + KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, + KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, + KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, + KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, + KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, + KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, + KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + KC_SPC, KC_SPC, KC_LALT, KC_DOWN + ), - KEYMAP( - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [1] = LAYOUT( + RESET, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + [3] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ) }; From 8d70d6eb65c69974aa30e4ee5836d6cb74a1c726 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:42:46 +0800 Subject: [PATCH 21/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index 26dfb0ccb639..ac6733a872fe 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -22,12 +22,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* number of backlight levels */ - -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 0 -#endif - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 @@ -48,4 +42,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #endif - From e4edf8a1c69d65bfdf1c32efc472c7266fa8d11b Mon Sep 17 00:00:00 2001 From: Leivince John Date: Thu, 9 Jul 2020 18:44:25 +0800 Subject: [PATCH 22/48] Update Remove RGB_DI_PIN --- keyboards/ph_arisu/config.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index ac6733a872fe..8a8542730e76 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -34,11 +34,3 @@ /* prevent stuck modifiers */ #define PREVENT_STUCK_MODIFIERS - -#ifdef RGB_DI_PIN -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif From 9fe13dbc0cdccbe4f850704878b1e886489e76ba Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:44:27 +0800 Subject: [PATCH 23/48] Update keyboards/ph_arisu/config.h Co-authored-by: Ryan --- keyboards/ph_arisu/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index ac6733a872fe..78e85fea536a 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -31,10 +31,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - #ifdef RGB_DI_PIN #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 0 From 220416b450b8745c668097f0119c2faaf2f58f69 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:48:07 +0800 Subject: [PATCH 24/48] Update keyboards/ph_arisu/readme.md Co-authored-by: Ryan --- keyboards/ph_arisu/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 239116e7687f..14f31838d165 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -3,12 +3,12 @@ PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. -Keyboard Maintainer: [Leivince John](https://github.com/devinceble) -Hardware Supported: PH ARISU PCB -Hardware Availability: Base on [ARISU](https://github.com/FateNozomi/arisu-pcb) +* Keyboard Maintainer: [Leivince John](https://github.com/devinceble) +* Hardware Supported: PH ARISU PCB +* Hardware Availability: Base on [ARISU](https://github.com/FateNozomi/arisu-pcb) Make example for this keyboard (after setting up your build environment): - qmk compile -kb ph_arisu -km default + make ph_arisu:default See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. From 5feab7820fdc97c5109d8087a155ac06e85e7c2a Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:48:23 +0800 Subject: [PATCH 25/48] Update keyboards/ph_arisu/readme.md Co-authored-by: Ryan --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 14f31838d165..8713b6f525e7 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -11,4 +11,4 @@ Make example for this keyboard (after setting up your build environment): make ph_arisu:default -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. +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 ddc1913311fa557254648da9c4226f88f17f9fc1 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:48:40 +0800 Subject: [PATCH 26/48] Update keyboards/ph_arisu/ph_arisu.h Co-authored-by: Ryan --- keyboards/ph_arisu/ph_arisu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/ph_arisu/ph_arisu.h b/keyboards/ph_arisu/ph_arisu.h index c20b29d623a1..cd4fe23f8b7a 100644 --- a/keyboards/ph_arisu/ph_arisu.h +++ b/keyboards/ph_arisu/ph_arisu.h @@ -1,5 +1,4 @@ -#ifndef PH_ARISU_H -#define PH_ARISU_H +#pragma once #include "quantum.h" From 90707c7c904abe7b817988b0a8b9a37fbd077937 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:49:16 +0800 Subject: [PATCH 27/48] Update keyboards/ph_arisu/ph_arisu.h Co-authored-by: Ryan --- keyboards/ph_arisu/ph_arisu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/ph_arisu/ph_arisu.h b/keyboards/ph_arisu/ph_arisu.h index cd4fe23f8b7a..ca61392cca34 100644 --- a/keyboards/ph_arisu/ph_arisu.h +++ b/keyboards/ph_arisu/ph_arisu.h @@ -25,5 +25,3 @@ { K080, K081, K082, KC_NO, KC_NO, KC_NO, K086, K087 }, \ { KC_NO, KC_NO, K092, K093, K094, KC_NO, K096, KC_NO } \ } - -#endif From 1fb58d16006712f58514fef201c6a709f6fe034d Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Thu, 9 Jul 2020 18:50:03 +0800 Subject: [PATCH 28/48] Update keyboards/ph_arisu/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/ph_arisu/keymaps/via/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c index 53d9bae24f44..ed880f2e3e22 100644 --- a/keyboards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -1,7 +1,6 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, From 70ee58c6733fd5ac238798af88f957927957ac86 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Fri, 10 Jul 2020 09:31:57 +0800 Subject: [PATCH 29/48] Update keyboards/ph_arisu/readme.md Co-authored-by: Erovia --- keyboards/ph_arisu/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 8713b6f525e7..b736b08ee6ce 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,5 +1,7 @@ # PH ARISU +![PH_ARISU]() + PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 58d0c7c9b54602ae38a87f5d4f44992d9ec8a8e7 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Fri, 10 Jul 2020 09:32:13 +0800 Subject: [PATCH 30/48] Update keyboards/ph_arisu/config.h Co-authored-by: Joel Challis --- keyboards/ph_arisu/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index 8a8542730e76..f896a7bfcd8c 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -30,7 +30,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - From 12df44367e16874058c7119fd95a80b388e47929 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Fri, 10 Jul 2020 09:33:45 +0800 Subject: [PATCH 31/48] Add MO(1) on Keymaps --- keyboards/ph_arisu/keymaps/default/keymap.c | 4 ++-- keyboards/ph_arisu/keymaps/via/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index 7b3c39390bc7..e61009b21b1c 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -6,11 +6,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_LCTL, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + MO(1), KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, KC_SPC, KC_SPC, KC_LALT, KC_DOWN ), [1] = LAYOUT( diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c index ed880f2e3e22..6865ffa2ced3 100644 --- a/keyboards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -6,11 +6,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, + KC_LCTL, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - KC_LCTL, KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, + MO(1), KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, KC_SPC, KC_SPC, KC_LALT, KC_DOWN ), From 34a8366fb228030b679fbeb73cff37706133af27 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Fri, 10 Jul 2020 10:06:49 +0800 Subject: [PATCH 32/48] Update info.json for QMK configurator support --- keyboards/ph_arisu/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ph_arisu/info.json b/keyboards/ph_arisu/info.json index 01304f537ddd..62ea91fa6ba0 100644 --- a/keyboards/ph_arisu/info.json +++ b/keyboards/ph_arisu/info.json @@ -2,11 +2,11 @@ "keyboard_name": "PH Arisu", "url": "https://github.com/FateNozomi/arisu-pcb", "maintainer": "qmk", - "width": 19.5, - "height": 8.65, + "width": 17.8, + "height": 5.25, "layouts": { "LAYOUT": { - "layout": [{"label":"2,7", "x":17.8, "y":0.9}, {"label":"0,1", "x":3.7, "y":0.9500000000000001}, {"label":"1,5", "x":13.15, "y":0.9500000000000001}, {"label":"0,0", "x":1.7, "y":1.0}, {"label":"1,0", "x":2.7, "y":1.0}, {"label":"0,6", "x":14.149999999999999, "y":1.0}, {"label":"1,6", "x":15.149999999999999, "y":1.0}, {"label":"0,7", "x":16.15, "y":1.0}, {"label":"4,7", "x":18.1, "y":1.9000000000000001}, {"label":"2,5", "x":13, "y":1.9500000000000002}, {"label":"2,0", "x":1.5, "y":2.0, "w":1.5}, {"label":"3,0", "x":3, "y":2.0}, {"label":"3,5", "x":14, "y":2.0}, {"label":"2,6", "x":15, "y":2.0}, {"label":"3,6", "x":16, "y":2.0, "w":1.5}, {"label":"6,7", "x":18.4, "y":2.9000000000000004}, {"label":"4,0", "x":1.3, "y":3.0, "w":1.75}, {"label":"5,0", "x":3.05, "y":3.0}, {"label":"4,5", "x":13.4, "y":3.0}, {"label":"5,5", "x":14.4, "y":3.0}, {"label":"4,6", "x":15.4, "y":3.0, "w":2.25}, {"label":"6,0", "x":1.05, "y":4.0, "w":2.25}, {"label":"7,0", "x":3.3, "y":4.0}, {"label":"7,4", "x":13.100000000000001, "y":4.0}, {"label":"6,5", "x":14.100000000000001, "y":4.0}, {"label":"7,5", "x":15.100000000000001, "y":4.0, "w":1.75}, {"label":"7,6", "x":17.5, "y":4.25}, {"label":"8,0", "x":1.05, "y":5.0, "w":1.5}, {"label":"8,6", "x":16.5, "y":5.25}, {"label":"9,6", "x":17.5, "y":5.25}, {"label":"8,7", "x":18.5, "y":5.25}, {"label":"1,1", "x":5.05, "y":1.66533453693e-16}, {"label":"0,2", "x":6.05, "y":1.66533453693e-16}, {"label":"1,2", "x":7.05, "y":1.66533453693e-16}, {"label":"0,3", "x":8.05, "y":1.66533453693e-16}, {"label":"2,1", "x":4.6, "y":1.0000000000000002}, {"label":"3,1", "x":5.6, "y":1.0000000000000002}, {"label":"2,2", "x":6.6, "y":1.0000000000000002}, {"label":"3,2", "x":7.6, "y":1.0000000000000002}, {"label":"4,1", "x":4.85, "y":2.0}, {"label":"5,1", "x":5.85, "y":2.0}, {"label":"4,2", "x":6.85, "y":2.0}, {"label":"5,2", "x":7.85, "y":2.0}, {"label":"6,1", "x":5.3, "y":3.0}, {"label":"7,1", "x":6.3, "y":3.0}, {"label":"6,2", "x":7.3, "y":3.0}, {"label":"7,2", "x":8.3, "y":3.0}, {"label":"8,2", "x":6.6, "y":4.0, "w":2}, {"label":"9,2", "x":8.6, "y":4.0, "w":1.25}, {"label":"8,1", "x":5.05, "y":4.05, "w":1.5}, {"label":"1,3", "x":8.45, "y":3.6}, {"label":"0,4", "x":9.45, "y":3.6}, {"label":"1,4", "x":10.45, "y":3.6}, {"label":"0,5", "x":11.45, "y":3.6}, {"label":"2,3", "x":8.05, "y":4.6000000000000005}, {"label":"3,3", "x":9.05, "y":4.6000000000000005}, {"label":"2,4", "x":10.05, "y":4.6000000000000005}, {"label":"3,4", "x":11.05, "y":4.6000000000000005}, {"label":"4,3", "x":8.2, "y":5.6000000000000005}, {"label":"5,3", "x":9.2, "y":5.6000000000000005}, {"label":"4,4", "x":10.2, "y":5.6000000000000005}, {"label":"5,4", "x":11.2, "y":5.6000000000000005}, {"label":"6,3", "x":8.75, "y":6.6000000000000005}, {"label":"7,3", "x":9.75, "y":6.6000000000000005}, {"label":"6,4", "x":10.75, "y":6.6000000000000005}, {"label":"9,3", "x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"9,4", "x":10.55, "y":7.65, "w":1.5}] + "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}] } } } From 820e73af0bc988b8bbb01cae31848990ed7dd832 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 11 Jul 2020 11:09:03 +0800 Subject: [PATCH 33/48] Add PH Arisu Image --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index b736b08ee6ce..957daead399c 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU]() +![PH_ARISU](https://www.dropbox.com/s/warl3bnuo49gxl1/PHArisu.jpg?raw=1) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From ca5ac796b7697bdb0d127aff21c6932ef0a6b0fc Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 11 Jul 2020 11:13:33 +0800 Subject: [PATCH 34/48] Use Smaller Size Image for Keyboard --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 957daead399c..b90edba43bf7 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU](https://www.dropbox.com/s/warl3bnuo49gxl1/PHArisu.jpg?raw=1) +![PH_ARISU](https://www.dropbox.com/s/w3k0d0z00t360mn/PHArisuSmall.jpg?raw=1) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 43812d6d0bb9b93703f3a657a327dbf221778338 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 11 Jul 2020 13:38:33 +0800 Subject: [PATCH 35/48] Change Image Host to Imgur --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index b90edba43bf7..88e0dd095832 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU](https://www.dropbox.com/s/w3k0d0z00t360mn/PHArisuSmall.jpg?raw=1) +![PH_ARISU](https://imgur.com/qr2Tn2X) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 5fdb19f5878112f93b04d16e20edeadcbea504ef Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 11 Jul 2020 13:42:09 +0800 Subject: [PATCH 36/48] Fix Imgur url --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index 88e0dd095832..b202e8390a51 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU](https://imgur.com/qr2Tn2X) +![PH_ARISU](https://imgur.com/qr2Tn2X.jpg) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 8fe19d436b9a8efa0d7fa99f050da28a85e82d2a Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sat, 11 Jul 2020 13:42:38 +0800 Subject: [PATCH 37/48] Fix Imgur url --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index b202e8390a51..c0f54add360f 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU](https://imgur.com/qr2Tn2X.jpg) +![PH_ARISU](https://i.imgur.com/qr2Tn2X.jpg) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 0fd1b815e9a1c3a75ef100c2ba16bc222187433d Mon Sep 17 00:00:00 2001 From: Leivince John Date: Sun, 12 Jul 2020 18:46:42 +0800 Subject: [PATCH 38/48] Update Change Keyboard Maintainer --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index c0f54add360f..af192c37dfa1 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -5,7 +5,7 @@ PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. -* Keyboard Maintainer: [Leivince John](https://github.com/devinceble) +* Keyboard Maintainer: [Neil Brian Ramirez](https://github.com/NightlyBoards) * Hardware Supported: PH ARISU PCB * Hardware Availability: Base on [ARISU](https://github.com/FateNozomi/arisu-pcb) From bb47f65e8b563d189bfd864137468ccba7a0fa1e Mon Sep 17 00:00:00 2001 From: Leivince John Date: Mon, 13 Jul 2020 18:09:05 +0800 Subject: [PATCH 39/48] Update Change Hardware Support to Pro Micro ATmega32U4 --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index af192c37dfa1..b943c1f0e1b5 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -6,7 +6,7 @@ PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. * Keyboard Maintainer: [Neil Brian Ramirez](https://github.com/NightlyBoards) -* Hardware Supported: PH ARISU PCB +* Hardware Supported: Pro Micro ATmega32U4 * Hardware Availability: Base on [ARISU](https://github.com/FateNozomi/arisu-pcb) Make example for this keyboard (after setting up your build environment): From 0672bfa2cf8b96565442d5ffcb2af01020f78951 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:28:45 +0800 Subject: [PATCH 40/48] Update keyboards/ph_arisu/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ph_arisu/config.h b/keyboards/ph_arisu/config.h index f896a7bfcd8c..57df486e7222 100644 --- a/keyboards/ph_arisu/config.h +++ b/keyboards/ph_arisu/config.h @@ -8,7 +8,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER PH #define PRODUCT Arisu -#define DESCRIPTION Keyboard /* key matrix size */ #define MATRIX_ROWS 10 From b323a07cf261db70cdab5de9cbf2db3c99aa1c06 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:29:01 +0800 Subject: [PATCH 41/48] Update keyboards/ph_arisu/ph_arisu.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/ph_arisu.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/keyboards/ph_arisu/ph_arisu.h b/keyboards/ph_arisu/ph_arisu.h index ca61392cca34..85e5a9381065 100644 --- a/keyboards/ph_arisu/ph_arisu.h +++ b/keyboards/ph_arisu/ph_arisu.h @@ -3,16 +3,11 @@ #include "quantum.h" #define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, \ - K010, K011, K012, K013, K014, K015, K016, \ - K020, K021, K022, K023, K024, K025, K026, K027, \ - K030, K031, K032, K033, K034, K035, K036, \ - K040, K041, K042, K043, K044, K045, K046, K047, \ - K050, K051, K052, K053, K054, K055, \ - K060, K061, K062, K063, K064, K065, K067, \ - K070, K071, K072, K073, K074, K075, K076, \ - K080, K081, K082, K086, K087, \ - K092, K093, K094, K096 \ + K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K027, \ + K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K047, \ + K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K067, \ + K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, \ + K080, K081, K082, K092, K093, K094, K086, K096, K087 \ ) { \ { K000, K001, K002, K003, K004, K005, K006, K007 }, \ { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \ From 77a5aba0de6998b54c40b1af2640dd9ebe5ba55f Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:29:17 +0800 Subject: [PATCH 42/48] Update keyboards/ph_arisu/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/keymaps/default/keymap.c | 30 +++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/ph_arisu/keymaps/default/keymap.c index e61009b21b1c..7fc5fd8e70e0 100644 --- a/keyboards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/ph_arisu/keymaps/default/keymap.c @@ -2,27 +2,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, - KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, - KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, - KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_LCTL, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, - KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, - KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, - KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - MO(1), KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, - KC_SPC, KC_SPC, KC_LALT, KC_DOWN + 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_BSLS, KC_GRV, 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, KC_BSPC, KC_PGUP, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + MO(1), KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - RESET, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______ + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 180ab563228d1865ba6f3334270e913deb6c39b5 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:29:27 +0800 Subject: [PATCH 43/48] Update keyboards/ph_arisu/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/keymaps/via/keymap.c | 60 +++++++++---------------- 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/ph_arisu/keymaps/via/keymap.c index 6865ffa2ced3..c70603ef40dc 100644 --- a/keyboards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/ph_arisu/keymaps/via/keymap.c @@ -2,55 +2,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, KC_EQL, KC_GRV, - KC_1, KC_3, KC_5, KC_7, KC_9, KC_MINS, KC_BSLS, - KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, KC_RBRC, KC_DEL, - KC_Q, KC_E, KC_T, KC_U, KC_O, KC_LBRC, KC_BSPC, - KC_LCTL, KC_S, KC_F, KC_H, KC_K, KC_SCLN, KC_ENT, KC_PGUP, - KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, - KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, KC_PGDN, - KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, KC_UP, - MO(1), KC_LALT, KC_SPC, KC_LEFT, KC_RGHT, - KC_SPC, KC_SPC, KC_LALT, KC_DOWN + 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_BSLS, KC_GRV, 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, KC_BSPC, KC_PGUP, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + MO(1), KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - RESET, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______ + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 7918f78f76c20479ca2c7564b705cf1aba513a57 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:30:03 +0800 Subject: [PATCH 44/48] Update keyboards/ph_arisu/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ph_arisu/readme.md b/keyboards/ph_arisu/readme.md index b943c1f0e1b5..77186ca76692 100644 --- a/keyboards/ph_arisu/readme.md +++ b/keyboards/ph_arisu/readme.md @@ -1,6 +1,6 @@ # PH ARISU -![PH_ARISU](https://i.imgur.com/qr2Tn2X.jpg) +![PH_ARISU](https://i.imgur.com/qr2Tn2Xl.jpg) PCB is base on https://github.com/FateNozomi/arisu-pcb and used for a local groupbuy in the Philippines. From 10e6b6eaf93dc330c07f77cb086f28ab53556c8e Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Wed, 22 Jul 2020 11:31:53 +0800 Subject: [PATCH 45/48] Update keyboards/ph_arisu/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ph_arisu/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/ph_arisu/rules.mk index 6868899191f2..1c1ebc6204e1 100644 --- a/keyboards/ph_arisu/rules.mk +++ b/keyboards/ph_arisu/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = caterina # Build Options From 48b16aa7cf7b682266305a7e3864bf527c01ab4a Mon Sep 17 00:00:00 2001 From: Leivince John Date: Fri, 24 Jul 2020 20:51:28 +0800 Subject: [PATCH 46/48] Update Move ph_arisu to nightly_boards directory --- keyboards/{ => nightly_boards}/ph_arisu/config.h | 0 keyboards/{ => nightly_boards}/ph_arisu/info.json | 0 keyboards/{ => nightly_boards}/ph_arisu/keymaps/default/keymap.c | 0 keyboards/{ => nightly_boards}/ph_arisu/keymaps/via/keymap.c | 0 keyboards/{ => nightly_boards}/ph_arisu/keymaps/via/rules.mk | 0 keyboards/{ => nightly_boards}/ph_arisu/ph_arisu.c | 0 keyboards/{ => nightly_boards}/ph_arisu/ph_arisu.h | 0 keyboards/{ => nightly_boards}/ph_arisu/readme.md | 0 keyboards/{ => nightly_boards}/ph_arisu/rules.mk | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => nightly_boards}/ph_arisu/config.h (100%) rename keyboards/{ => nightly_boards}/ph_arisu/info.json (100%) rename keyboards/{ => nightly_boards}/ph_arisu/keymaps/default/keymap.c (100%) rename keyboards/{ => nightly_boards}/ph_arisu/keymaps/via/keymap.c (100%) rename keyboards/{ => nightly_boards}/ph_arisu/keymaps/via/rules.mk (100%) rename keyboards/{ => nightly_boards}/ph_arisu/ph_arisu.c (100%) rename keyboards/{ => nightly_boards}/ph_arisu/ph_arisu.h (100%) rename keyboards/{ => nightly_boards}/ph_arisu/readme.md (100%) rename keyboards/{ => nightly_boards}/ph_arisu/rules.mk (100%) diff --git a/keyboards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h similarity index 100% rename from keyboards/ph_arisu/config.h rename to keyboards/nightly_boards/ph_arisu/config.h diff --git a/keyboards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json similarity index 100% rename from keyboards/ph_arisu/info.json rename to keyboards/nightly_boards/ph_arisu/info.json diff --git a/keyboards/ph_arisu/keymaps/default/keymap.c b/keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c similarity index 100% rename from keyboards/ph_arisu/keymaps/default/keymap.c rename to keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c diff --git a/keyboards/ph_arisu/keymaps/via/keymap.c b/keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c similarity index 100% rename from keyboards/ph_arisu/keymaps/via/keymap.c rename to keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c diff --git a/keyboards/ph_arisu/keymaps/via/rules.mk b/keyboards/nightly_boards/ph_arisu/keymaps/via/rules.mk similarity index 100% rename from keyboards/ph_arisu/keymaps/via/rules.mk rename to keyboards/nightly_boards/ph_arisu/keymaps/via/rules.mk diff --git a/keyboards/ph_arisu/ph_arisu.c b/keyboards/nightly_boards/ph_arisu/ph_arisu.c similarity index 100% rename from keyboards/ph_arisu/ph_arisu.c rename to keyboards/nightly_boards/ph_arisu/ph_arisu.c diff --git a/keyboards/ph_arisu/ph_arisu.h b/keyboards/nightly_boards/ph_arisu/ph_arisu.h similarity index 100% rename from keyboards/ph_arisu/ph_arisu.h rename to keyboards/nightly_boards/ph_arisu/ph_arisu.h diff --git a/keyboards/ph_arisu/readme.md b/keyboards/nightly_boards/ph_arisu/readme.md similarity index 100% rename from keyboards/ph_arisu/readme.md rename to keyboards/nightly_boards/ph_arisu/readme.md diff --git a/keyboards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk similarity index 100% rename from keyboards/ph_arisu/rules.mk rename to keyboards/nightly_boards/ph_arisu/rules.mk From 12adebb44f7f78d091b68c5ac27e0ec0684c6802 Mon Sep 17 00:00:00 2001 From: Leivince John Date: Fri, 24 Jul 2020 20:54:18 +0800 Subject: [PATCH 47/48] Update Readme make command --- keyboards/nightly_boards/ph_arisu/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/nightly_boards/ph_arisu/readme.md b/keyboards/nightly_boards/ph_arisu/readme.md index 77186ca76692..360ccae579b5 100644 --- a/keyboards/nightly_boards/ph_arisu/readme.md +++ b/keyboards/nightly_boards/ph_arisu/readme.md @@ -11,6 +11,6 @@ and used for a local groupbuy in the Philippines. Make example for this keyboard (after setting up your build environment): - make ph_arisu:default + make nightly_boards/ph_arisu:default 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 a5ac827344309bb649c8a0b67e36d3923822be66 Mon Sep 17 00:00:00 2001 From: Leivince John Marte Date: Mon, 27 Jul 2020 14:31:21 +0800 Subject: [PATCH 48/48] Update keyboards/nightly_boards/ph_arisu/rules.mk Co-authored-by: Ryan --- keyboards/nightly_boards/ph_arisu/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/nightly_boards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk index 1c1ebc6204e1..e70a8a7d6044 100644 --- a/keyboards/nightly_boards/ph_arisu/rules.mk +++ b/keyboards/nightly_boards/ph_arisu/rules.mk @@ -18,7 +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 -MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches