Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory #14194

Merged
merged 29 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c2ca9fb
Move Paladin64 and GSKT00 under KapCave. Add support for PaladinPad
Sep 8, 2021
2e457cc
Update keyboards/kapcave/arya/rules.mk
nachie Sep 20, 2021
b665ea8
Update keyboards/kapcave/arya/rules.mk
nachie Sep 20, 2021
f364c4c
Update keyboards/kapcave/paladinpad/rules.mk
nachie Sep 20, 2021
4fdb9af
Update keyboards/kapcave/paladinpad/rev2/config.h
nachie Sep 20, 2021
5f10458
Update keyboards/kapcave/paladinpad/rev1/config.h
nachie Sep 20, 2021
36c70e9
Update keyboards/kapcave/gskt00/keymaps/default-poly/config.h
nachie Sep 20, 2021
2330420
Update keyboards/kapcave/paladinpad/rules.mk
nachie Sep 24, 2021
4c85cf1
Update keyboards/kapcave/paladinpad/info.json
nachie Sep 24, 2021
76aade0
Update keyboards/kapcave/paladin64/rules.mk
nachie Sep 24, 2021
3c8f7c6
Update keyboards/kapcave/arya/rules.mk
nachie Sep 24, 2021
8591442
Update keyboards/kapcave/arya/readme.md
nachie Sep 24, 2021
b94d648
Update keyboards/kapcave/arya/keymaps/via/keymap.c
nachie Sep 24, 2021
56612b2
Update keyboards/kapcave/arya/info.json
nachie Sep 24, 2021
a7158e1
Update keyboards/kapcave/arya/keymaps/default/keymap.c
nachie Sep 24, 2021
019821d
Update keyboards/kapcave/paladin64/info.json
nachie Sep 24, 2021
3acc33c
Update keyboards/kapcave/gskt00/readme.md
nachie Sep 24, 2021
d07344e
Update keyboards/kapcave/paladin64/readme.md
nachie Sep 24, 2021
91d301e
Update keyboards/kapcave/paladinpad/readme.md
nachie Sep 24, 2021
2d47eef
Update keyboards/kapcave/paladinpad/paladinpad.h
nachie Sep 25, 2021
0ab1029
Update keyboards/kapcave/arya/keymaps/via/keymap.c
nachie Sep 28, 2021
7f995b7
Update keyboards/kapcave/paladinpad/keymaps/default/keymap.c
nachie Sep 28, 2021
916a0bc
Update keyboards/kapcave/paladinpad/paladinpad.h
nachie Sep 28, 2021
efd78d9
Update keyboards/kapcave/paladinpad/keymaps/via/keymap.c
nachie Sep 28, 2021
feb2d85
Update keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
nachie Sep 28, 2021
251c23c
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
nachie Sep 28, 2021
7d0657d
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
nachie Sep 28, 2021
8774a44
Update keyboards/kapcave/paladinpad/info.json
nachie Sep 28, 2021
c6d45c2
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
nachie Sep 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions keyboards/gskt00/config.h

This file was deleted.

2 changes: 0 additions & 2 deletions keyboards/gskt00/gskt00.c

This file was deleted.

17 changes: 0 additions & 17 deletions keyboards/gskt00/readme.md

This file was deleted.

27 changes: 27 additions & 0 deletions keyboards/kapcave/arya/arya.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "arya.h"

bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
return true;
}
43 changes: 43 additions & 0 deletions keyboards/kapcave/arya/arya.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once

#include "quantum.h"

#define LAYOUT_alice_split_bs( \
K81, K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
K80, K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
K82, K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
K30, K40, K50, K60, K00, K10, K20 \
) \
{ \
{ K00 , K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \
{ K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \
{ K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
{ K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \
{ K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \
{ K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
{ K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \
{ KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \
{ K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
}




#define LAYOUT_all LAYOUT_alice_split_bs
25 changes: 25 additions & 0 deletions keyboards/kapcave/arya/chconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define CH_CFG_ST_RESOLUTION 16

#define CH_CFG_INTERVALS_SIZE 16

#include_next <chconf.h>

68 changes: 68 additions & 0 deletions keyboards/kapcave/arya/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID 0x4B43
#define PRODUCT_ID 0x4152
#define DEVICE_VER 0x0001
#define MANUFACTURER KapCave
#define PRODUCT Arya

/* key matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 8

#define MATRIX_COL_PINS { B0, B5, B4, B2, C13, F1, F0, A14}
#define MATRIX_ROW_PINS { B8, A13, B1, A15, B9, B10, B11, A0, A8 }
#define DIODE_DIRECTION COL2ROW


/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define ENCODERS_PAD_A { B12, B14, C15 }
#define ENCODERS_PAD_B { B13, B15, C14 }

#define ENCODER_RESOLUTION 2
#define TAP_CODE_DELAY 25

#define DYNAMIC_KEYMAP_LAYER_COUNT 3

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
23 changes: 23 additions & 0 deletions keyboards/kapcave/arya/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define HAL_USE_PWM TRUE

#include_next <halconf.h>

77 changes: 77 additions & 0 deletions keyboards/kapcave/arya/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"keyboard_name": "Arya",
"url": "https://kapcave.com/products/arya",
"maintainer": "nachie",
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":2.75, "y":5.9},
{"label":"\u00ac", "x":4, "y":6.0},
{"label":"!", "x":5, "y":6.0},
{"label":"\"", "x":6, "y":6.0},
{"label":"_", "x":15.25, "y":6.0},
{"label":"+", "x":16.25, "y":6.0},
{"label":"", "x":17.25, "y":6.0},
{"label":"", "x":18.25, "y":6.0},
{"label":"Pg Up", "x":2.5, "y":6.9},
{"label":"Tab", "x":3.75, "y":7.0, "w":1.5},
{"label":"Q", "x":5.25, "y":7.0},
{"label":"P", "x":15, "y":7.0},
{"label":"{", "x":16, "y":7.0},
{"label":"}", "x":17, "y":7.0},
{"label":"|", "x":18, "y":7.0, "w":1.5},
{"label":"Pg Dn", "x":2.25, "y":7.9},
{"label":"Caps Lock", "x":3.5, "y":8.0, "w":1.75},
{"label":"A", "x":5.25, "y":8.0},
{"label":":", "x":15.5, "y":8.0},
{"label":"\"", "x":16.5, "y":8.0},
{"label":"Enter", "x":17.5, "y":8.0, "w":2.25},
{"label":"Shift", "x":3.25, "y":9.0, "w":2.25},
{"label":"Z", "x":5.5, "y":9.0},
{"label":">", "x":15.25, "y":9.0},
{"label":"?", "x":16.25, "y":9.0},
{"label":"Shift", "x":17.25, "y":9.0, "w":1.75},
{"label":"Fn", "x":19, "y":9.0},
{"label":"Ctrl", "x":3.25, "y":10.0, "w":1.5},
{"label":"Ctrl", "x":18.25, "y":10.0, "w":1.5},
{"label":"\u00a3", "x":8.25, "y":4.5},
{"label":"$", "x":9.25, "y":4.5},
{"label":"%", "x":10.25, "y":4.5},
{"label":"^", "x":11.25, "y":4.5},
{"label":"W", "x":7.75, "y":5.5},
{"label":"E", "x":8.75, "y":5.5},
{"label":"R", "x":9.75, "y":5.5},
{"label":"T", "x":10.75, "y":5.5},
{"label":"S", "x":8, "y":6.5},
{"label":"D", "x":9, "y":6.5},
{"label":"F", "x":10, "y":6.5},
{"label":"G", "x":11, "y":6.5},
{"label":"X", "x":8.5, "y":7.5},
{"label":"C", "x":9.5, "y":7.5},
{"label":"V", "x":10.5, "y":7.5},
{"label":"B", "x":11.5, "y":7.5},
{"label":"Alt", "x":8.25, "y":8.5, "w":1.5},
{"label":"", "x":9.75, "y":8.5, "w":2},
{"label":"Fn", "x":11.75, "y":8.5, "w":1.25},
{"label":"&", "x":9.5, "y":9.0},
{"label":"*", "x":10.5, "y":9.0},
{"label":"(", "x":11.5, "y":9.0},
{"label":")", "x":12.5, "y":9.0},
{"label":"Y", "x":9, "y":10.0},
{"label":"U", "x":10, "y":10.0},
{"label":"I", "x":11, "y":10.0},
{"label":"O", "x":12, "y":10.0},
{"label":"H", "x":9.25, "y":11.0},
{"label":"J", "x":10.25, "y":11.0},
{"label":"K", "x":11.25, "y":11.0},
{"label":"L", "x":12.25, "y":11.0},
{"label":"Fn", "x":8.75, "y":12.0},
{"label":"N", "x":9.75, "y":12.0},
{"label":"M", "x":10.75, "y":12.0},
{"label":"<", "x":11.75, "y":12.0},
{"label":"Shift", "x":8.75, "y":13.0, "w":2.75},
{"label":"Alt", "x":11.5, "y":13.0, "w":1.5}
]
}
}
}
34 changes: 34 additions & 0 deletions keyboards/kapcave/arya/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
Copyright 2021 KapCave

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT_alice_split_bs(
KC_ESC, KC_GESC, 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_GRV, KC_BSLS,
KC_PGUP, 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_PGDN, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL
),
LAYOUT_alice_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),
};
1 change: 1 addition & 0 deletions keyboards/kapcave/arya/keymaps/default/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The default layout for the KapCave Arya
Loading