Skip to content

Commit

Permalink
Add sriwedari70 and move kamigakushi to new folder (qmk#20334)
Browse files Browse the repository at this point in the history 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zacksupreme <zacksupreme@gmail.com>
  • Loading branch information
@rezaadio @fauxpark
@rizalfr @coquizen
3 people authored and coquizen committed Jun 22, 2023
1 parent 894723a commit c78fffb
Show file tree
Hide file tree
Showing 18 changed files with 277 additions and 5 deletions.
6 changes: 6 additions & 0 deletions data/mappings/keyboard_aliases.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@
"jones": {
"target": "jones/v03_1"
},
"kamigakushi": {
"target": "jaykeeb/kamigakushi",
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
}
},
"katana60": {
"target": "rominronin/katana60/rev1"
},
Expand Down
0 keyboards/kamigakushi/config.h → keyboards/jaykeeb/kamigakushi/config.h
View file
File renamed without changes.
0 keyboards/kamigakushi/halconf.h → keyboards/jaykeeb/kamigakushi/halconf.h
View file
File renamed without changes.
0 keyboards/kamigakushi/info.json → keyboards/jaykeeb/kamigakushi/info.json
View file
File renamed without changes.
0 ...ards/kamigakushi/keymaps/default/keymap.c → ...keeb/kamigakushi/keymaps/default/keymap.c
View file
File renamed without changes.
0 keyboards/kamigakushi/keymaps/via/keymap.c → .../jaykeeb/kamigakushi/keymaps/via/keymap.c
View file
File renamed without changes.
0 keyboards/kamigakushi/keymaps/via/rules.mk → .../jaykeeb/kamigakushi/keymaps/via/rules.mk
View file
File renamed without changes.
0 keyboards/kamigakushi/mcuconf.h → keyboards/jaykeeb/kamigakushi/mcuconf.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions keyboards/kamigakushi/readme.md → keyboards/jaykeeb/kamigakushi/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ PCB Mechanical keyboard replace for kamigakushi

Make example for this keyboard (after setting up your build environment):

make kamigakushi:default
make jaykeeb/kamigakushi:default

Flashing example for this keyboard:

make kamigakushi:default:flash
make jaykeeb/kamigakushi:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

Expand Down
0 keyboards/kamigakushi/rules.mk → keyboards/jaykeeb/kamigakushi/rules.mk
View file
File renamed without changes.
148 changes: 148 additions & 0 deletions keyboards/jaykeeb/sriwedari70/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"manufacturer": "Jaykeeb Studio",
"keyboard_name": "sriwedari70",
"maintainer": "Alabahuy",
"bootloader": "rp2040",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"encoder": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["GP24", "GP17", "GP16", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"],
"rows": ["GP23", "GP29", "GP15", "GP21", "GP22"]
},
"indicators": {
"caps_lock": "GP0",
"on_state": 0
},
"encoder": {
"rotary": [
{"pin_a": "GP25", "pin_b": "GP26", "resolution": 2},
{"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}
]
},
"rgblight": {
"led_count": 8,
"hue_steps": 8,
"saturation_steps": 8,
"brightness_steps": 8,
"max_brightness": 255,
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
},
"ws2812": {
"pin": "GP18",
"driver": "vendor"
},
"processor": "RP2040",
"url": "https://www.tokopedia.com/jaykeeb",
"usb": {
"device_version": "1.0.0",
"pid": "0x0770",
"vid": "0x414C"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.5, "y": 0},
{"matrix": [0, 4], "x": 4.5, "y": 0},
{"matrix": [0, 5], "x": 5.5, "y": 0},
{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8.5, "y": 0},
{"matrix": [0, 9], "x": 9.5, "y": 0},
{"matrix": [0, 10], "x": 10.5, "y": 0},
{"matrix": [0, 11], "x": 11.5, "y": 0},
{"matrix": [0, 12], "x": 12.5, "y": 0},
{"matrix": [0, 13], "x": 13.5, "y": 0},
{"matrix": [0, 14], "x": 14.5, "y": 0},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [1, 16], "x": 17.5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1, "w": 1.5},
{"matrix": [1, 4], "x": 5, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1},
{"matrix": [1, 10], "x": 11, "y": 1},
{"matrix": [1, 11], "x": 12, "y": 1},
{"matrix": [1, 12], "x": 13, "y": 1},
{"matrix": [1, 13], "x": 14, "y": 1},
{"matrix": [1, 14], "x": 15, "y": 1},
{"matrix": [1, 15], "x": 16, "y": 1},
{"matrix": [2, 16], "x": 17, "y": 1, "w": 1.5},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 3], "x": 3.5, "y": 2, "w": 1.75},
{"matrix": [2, 4], "x": 5.25, "y": 2},
{"matrix": [2, 5], "x": 6.25, "y": 2},
{"matrix": [2, 6], "x": 7.25, "y": 2},
{"matrix": [2, 7], "x": 8.25, "y": 2},
{"matrix": [2, 8], "x": 9.25, "y": 2},
{"matrix": [2, 9], "x": 10.25, "y": 2},
{"matrix": [2, 10], "x": 11.25, "y": 2},
{"matrix": [2, 11], "x": 12.25, "y": 2},
{"matrix": [2, 12], "x": 13.25, "y": 2},
{"matrix": [2, 13], "x": 14.25, "y": 2},
{"matrix": [2, 14], "x": 15.25, "y": 2},
{"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2.25, "y": 3.25},
{"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
{"matrix": [3, 4], "x": 4.75, "y": 3},
{"matrix": [3, 5], "x": 5.75, "y": 3},
{"matrix": [3, 6], "x": 6.75, "y": 3},
{"matrix": [3, 7], "x": 7.75, "y": 3},
{"matrix": [3, 8], "x": 8.75, "y": 3},
{"matrix": [3, 9], "x": 9.75, "y": 3},
{"matrix": [3, 10], "x": 10.75, "y": 3},
{"matrix": [3, 11], "x": 11.75, "y": 3},
{"matrix": [3, 12], "x": 12.75, "y": 3},
{"matrix": [3, 13], "x": 13.75, "y": 3},
{"matrix": [3, 14], "x": 14.75, "y": 3},
{"matrix": [3, 15], "x": 15.75, "y": 3, "w": 1.75},
{"matrix": [3, 16], "x": 17.5, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4.25},
{"matrix": [4, 2], "x": 2.25, "y": 4.25},
{"matrix": [4, 3], "x": 3.25, "y": 4.25},
{"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.5},
{"matrix": [4, 5], "x": 6, "y": 4, "w": 1.5},
{"matrix": [4, 10], "x": 7.5, "y": 4, "w": 7},
{"matrix": [4, 14], "x": 14.5, "y": 4, "w": 1.5},
{"matrix": [4, 15], "x": 16, "y": 4},
{"matrix": [4, 16], "x": 17, "y": 4, "w": 1.5}
]
}
}
}
41 changes: 41 additions & 0 deletions keyboards/jaykeeb/sriwedari70/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2023 Alabahuy (@Alabahuy)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT(
KC_HOME, KC_PSCR, KC_SCRL, 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_BSPC, KC_GRV,
KC_PGUP, KC_PAUS, KC_INS, 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_BSLS,
KC_PGDN, KC_DEL, KC_CAPS, 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_END, KC_APP, KC_UP, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_MENU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),

[1] = LAYOUT(
_______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)

};

bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code_delay(KC_VOLU, 10);
} else {
tap_code_delay(KC_VOLD, 10);
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
tap_code_delay(KC_BRIU, 10);
} else {
tap_code_delay(KC_BRID, 10);
}
}
return false;
}
49 changes: 49 additions & 0 deletions keyboards/jaykeeb/sriwedari70/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2023 Alabahuy (@Alabahuy)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT(
KC_HOME, KC_PSCR, KC_SCRL, 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_BSPC, KC_GRV,
KC_PGUP, KC_PAUS, KC_INS, 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_BSLS,
KC_PGDN, KC_DEL, KC_CAPS, 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_END, KC_APP, KC_UP, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_MENU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),

[1] = LAYOUT(
_______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)

};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
[2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
[3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif
2 changes: 2 additions & 0 deletions keyboards/jaykeeb/sriwedari70/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/jaykeeb/sriwedari70/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# sriwedari70

![sriwedari70](https://i.imgur.com/6iPYoEqh.png)

60% layout with 2 extra macro and arrow cluster in the left keyboard and support double encoder

* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy)
* Hardware Supported: Sriwedari70, RP2040, Encoder
* Hardware Availability: Private GB

Make example for this keyboard (after setting up your build environment):

make jaykeeb/sriwedari70:default

Flashing example for this keyboard:

make jaykeeb/sriwedari70:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
1 change: 1 addition & 0 deletions keyboards/jaykeeb/sriwedari70/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank
2 changes: 0 additions & 2 deletions keyboards/rart/rart80/keymaps/via/rules.mk
View file

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/rart/rart80/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
AUDIO_ENABLE = no # Audio output

0 comments on commit c78fffb

Please sign in to comment.