diff options
author | rainkeebs <44819800+rainkeebs@users.noreply.github.com> | 2021-04-22 07:58:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-22 10:58:09 -0400 |
commit | 4f2afaa6fbb184e7f22bec1a1df0aad55922d85e (patch) | |
tree | 12845f9daa813cdd01186db1b47fd9b5deb7dbfb | |
parent | 0b6d8150e4a30deb01d3eef4eca72a4eea365355 (diff) | |
download | qmk_firmware-4f2afaa6fbb184e7f22bec1a1df0aad55922d85e.tar.gz qmk_firmware-4f2afaa6fbb184e7f22bec1a1df0aad55922d85e.zip |
Delilah keyboard added (#12638)
* Delilah keyboard added
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
* removed unnecessary lines as per review
* removed unnecessary lines as per review
Co-authored-by: Drashna Jaelre <drashna@live.com>
-rw-r--r-- | keyboards/delilah/config.h | 56 | ||||
-rw-r--r-- | keyboards/delilah/delilah.c | 16 | ||||
-rw-r--r-- | keyboards/delilah/delilah.h | 28 | ||||
-rw-r--r-- | keyboards/delilah/info.json | 12 | ||||
-rw-r--r-- | keyboards/delilah/keymaps/default/keymap.c | 43 | ||||
-rw-r--r-- | keyboards/delilah/keymaps/via/keymap.c | 43 | ||||
-rw-r--r-- | keyboards/delilah/keymaps/via/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/delilah/readme.md | 22 | ||||
-rw-r--r-- | keyboards/delilah/rules.mk | 19 |
9 files changed, 240 insertions, 0 deletions
diff --git a/keyboards/delilah/config.h b/keyboards/delilah/config.h new file mode 100644 index 000000000..d07366a51 --- /dev/null +++ b/keyboards/delilah/config.h | |||
@@ -0,0 +1,56 @@ | |||
1 | /* Copyright 2021 Regan Palmer | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | #include "config_common.h" | ||
19 | |||
20 | /* USB Device descriptor parameter */ | ||
21 | #define VENDOR_ID 0x726B | ||
22 | #define PRODUCT_ID 0x645C | ||
23 | #define DEVICE_VER 0x0001 | ||
24 | #define MANUFACTURER rainkeebs | ||
25 | #define PRODUCT Delilah | ||
26 | |||
27 | /* key matrix size */ | ||
28 | #define MATRIX_ROWS 4 | ||
29 | #define MATRIX_COLS 12 | ||
30 | |||
31 | /* key matrix pins */ | ||
32 | #define MATRIX_ROW_PINS { B5, B6, C6, C7 } | ||
33 | #define MATRIX_COL_PINS { F7, F6, F5, F4, F0, E6, D5, D3, D4, D6, D7, B4 } | ||
34 | #define UNUSED_PINS | ||
35 | |||
36 | /* COL2ROW or ROW2COL */ | ||
37 | #define DIODE_DIRECTION COL2ROW | ||
38 | |||
39 | /* Set 0 if debouncing isn't needed */ | ||
40 | #define DEBOUNCE 5 | ||
41 | |||
42 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||
43 | #define LOCKING_SUPPORT_ENABLE | ||
44 | |||
45 | /* Locking resynchronize hack */ | ||
46 | #define LOCKING_RESYNC_ENABLE | ||
47 | |||
48 | |||
49 | #define RGB_DI_PIN B3 | ||
50 | #ifdef RGB_DI_PIN | ||
51 | #define RGBLIGHT_ANIMATIONS | ||
52 | #define RGBLED_NUM 8 | ||
53 | #define RGBLIGHT_HUE_STEP 8 | ||
54 | #define RGBLIGHT_SAT_STEP 8 | ||
55 | #define RGBLIGHT_VAL_STEP 8 | ||
56 | #endif | ||
diff --git a/keyboards/delilah/delilah.c b/keyboards/delilah/delilah.c new file mode 100644 index 000000000..b2e98b60f --- /dev/null +++ b/keyboards/delilah/delilah.c | |||
@@ -0,0 +1,16 @@ | |||
1 | /* Copyright 2021 Regan Palmer | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include "delilah.h" | ||
diff --git a/keyboards/delilah/delilah.h b/keyboards/delilah/delilah.h new file mode 100644 index 000000000..64b25351b --- /dev/null +++ b/keyboards/delilah/delilah.h | |||
@@ -0,0 +1,28 @@ | |||
1 | /* Copyright 2021 Regan Palmer | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include "quantum.h" | ||
17 | |||
18 | #define LAYOUT( \ | ||
19 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ | ||
20 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ | ||
21 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K211, \ | ||
22 | K300, K301, K302, K303, K306, K308, K309, K311 \ | ||
23 | ) { \ | ||
24 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ | ||
25 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ | ||
26 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, K211 }, \ | ||
27 | { K300, K301, K302, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO, K311 } \ | ||
28 | } | ||
diff --git a/keyboards/delilah/info.json b/keyboards/delilah/info.json new file mode 100644 index 000000000..343a100a2 --- /dev/null +++ b/keyboards/delilah/info.json | |||
@@ -0,0 +1,12 @@ | |||
1 | { | ||
2 | "keyboard_name": "Delilah", | ||
3 | "url": "https://www.rainkeebs.mx/product/delilah-keyboard-group-buy", | ||
4 | "maintainer": "rainkeebs", | ||
5 | "width": 12.25, | ||
6 | "height": 4, | ||
7 | "layouts": { | ||
8 | "LAYOUT": { | ||
9 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back<br>Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.5}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3}, {"label":"Alt", "x":2.25, "y":3}, {"label":"225", "x":3.25, "y":3, "w":2.25}, {"label":"275", "x":5.5, "y":3, "w":2.75}, {"label":"Alt", "x":9.0, "y":3}, {"label":"Win", "x":10.0, "y":3}, {"label":"Ctrl", "x":11.0, "y":3, "w":1.25}] | ||
10 | } | ||
11 | } | ||
12 | } | ||
diff --git a/keyboards/delilah/keymaps/default/keymap.c b/keyboards/delilah/keymaps/default/keymap.c new file mode 100644 index 000000000..ae00beadf --- /dev/null +++ b/keyboards/delilah/keymaps/default/keymap.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* Copyright 2021 Regan Palmer | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include QMK_KEYBOARD_H | ||
17 | |||
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
19 | |||
20 | LAYOUT( | ||
21 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | ||
22 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | ||
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(2), | ||
24 | KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), | ||
25 | |||
26 | LAYOUT( | ||
27 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
31 | |||
32 | LAYOUT( | ||
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
37 | |||
38 | LAYOUT( | ||
39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
43 | }; | ||
diff --git a/keyboards/delilah/keymaps/via/keymap.c b/keyboards/delilah/keymaps/via/keymap.c new file mode 100644 index 000000000..3a29b0c03 --- /dev/null +++ b/keyboards/delilah/keymaps/via/keymap.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* Copyright 2021 Regan Palmer | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include QMK_KEYBOARD_H | ||
17 | |||
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
19 | |||
20 | LAYOUT( | ||
21 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | ||
22 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, | ||
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_FN13, | ||
24 | KC_LCTL, KC_LGUI, KC_LALT, KC_FN23, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), | ||
25 | |||
26 | LAYOUT( | ||
27 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
31 | |||
32 | LAYOUT( | ||
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
37 | |||
38 | LAYOUT( | ||
39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
43 | }; | ||
diff --git a/keyboards/delilah/keymaps/via/rules.mk b/keyboards/delilah/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/delilah/keymaps/via/rules.mk | |||
@@ -0,0 +1 @@ | |||
VIA_ENABLE = yes | |||
diff --git a/keyboards/delilah/readme.md b/keyboards/delilah/readme.md new file mode 100644 index 000000000..8ba9d8318 --- /dev/null +++ b/keyboards/delilah/readme.md | |||
@@ -0,0 +1,22 @@ | |||
1 | # Delilah | ||
2 | |||
3 |  | ||
4 | |||
5 | A 12.25u, traditional stagger, 40% keyboard. Designed to keep another punctuation key on base layer while still being compact. | ||
6 | |||
7 | * Keyboard Maintainer: Rain | ||
8 | * Hardware Supported: Delilah PCB v1.0, v1.1 | ||
9 | * Hardware Availability: [rainkeebs](https://www.rainkeebs.mx/) | ||
10 | |||
11 | |||
12 | Make example for this keyboard (after setting up your build environment): | ||
13 | |||
14 | qmk compile -kb delilah -kb default | ||
15 | |||
16 | To reset the keyboard, hold the top left key while plugging in, or hit the reset button near the USB port | ||
17 | |||
18 | Install example for this keyboard: | ||
19 | |||
20 | qmk flash -kb delilah -km default | ||
21 | |||
22 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | ||
diff --git a/keyboards/delilah/rules.mk b/keyboards/delilah/rules.mk new file mode 100644 index 000000000..41a0abee9 --- /dev/null +++ b/keyboards/delilah/rules.mk | |||
@@ -0,0 +1,19 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | BOOTLOADER = atmel-dfu | ||
6 | |||
7 | # Build Options | ||
8 | # comment out to disable the options. | ||
9 | # | ||
10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | ||
11 | MOUSEKEY_ENABLE = yes # Mouse keys | ||
12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
13 | CONSOLE_ENABLE = no # Console for debug | ||
14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
15 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
16 | NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
17 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
18 | AUDIO_ENABLE = no | ||
19 | RGBLIGHT_ENABLE = yes | ||