aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-03 07:59:58 +0000
committerQMK Bot <hello@qmk.fm>2021-07-03 07:59:58 +0000
commit4ba56d7219e271cdeb6f50d19adb32d4c0e6426f (patch)
tree4e00e37bcd71a446034c74fc03df41787c4e260a
parent15bcae710e95acbf39eea04870db461452abc828 (diff)
parent03394678146b97700320c2ebe274f6cd7af11278 (diff)
downloadqmk_firmware-4ba56d7219e271cdeb6f50d19adb32d4c0e6426f.tar.gz
qmk_firmware-4ba56d7219e271cdeb6f50d19adb32d4c0e6426f.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/boardwalk/keymaps/niclake/keymap.c15
-rw-r--r--keyboards/dz60/keymaps/niclake/config.h18
-rw-r--r--keyboards/dz60/keymaps/niclake/keymap.c82
-rw-r--r--keyboards/dz60/keymaps/niclake/readme.md12
-rw-r--r--keyboards/dz60/keymaps/niclake/rules.mk3
-rw-r--r--keyboards/pistachio/config.h49
-rw-r--r--keyboards/pistachio/pistachio.h42
-rw-r--r--keyboards/pistachio/readme.md13
-rw-r--r--keyboards/pistachio/rev1/config.h67
-rw-r--r--keyboards/pistachio/rev1/readme.md17
-rw-r--r--keyboards/pistachio/rev1/rev1.c18
-rw-r--r--keyboards/pistachio/rev1/rev1.h58
-rw-r--r--keyboards/pistachio/rev1/rules.mk23
-rw-r--r--keyboards/pistachio/rev2/config.h71
-rw-r--r--keyboards/pistachio/rev2/readme.md17
-rw-r--r--keyboards/pistachio/rev2/rev2.c19
-rw-r--r--keyboards/pistachio/rev2/rev2.h58
-rw-r--r--keyboards/pistachio/rev2/rules.mk23
-rw-r--r--keyboards/pistachio/rules.mk24
19 files changed, 504 insertions, 125 deletions
diff --git a/keyboards/boardwalk/keymaps/niclake/keymap.c b/keyboards/boardwalk/keymaps/niclake/keymap.c
index 2188660d0..b6a986c0d 100644
--- a/keyboards/boardwalk/keymaps/niclake/keymap.c
+++ b/keyboards/boardwalk/keymaps/niclake/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
37#define FN MO(_FN) 37#define FN MO(_FN)
38#define NUM TT(_NUM) 38#define NUM TT(_NUM)
39#define ADJ MO(_ADJ) 39#define ADJ MO(_ADJ)
40#define MACWIN AG_TOGG 40#define MACWIN MAGIC_TOGGLE_ALT_GUI
41#define RGB_ON RGB_MODE_PLAIN 41#define RGB_ON RGB_MODE_PLAIN
42 42
43const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 43const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
128 128
129 /* ADJUST + RGB Control 129 /* ADJUST + RGB Control
130 * .-----------------------------------------------------------------------------------------------------------------------------. 130 * .-----------------------------------------------------------------------------------------------------------------------------.
131 * | | Static | Breath | Rainbw | Swirl | Gradnt | Test | | | | | | | | 131 * | | Static | Breath | Rainbw | Swirl | Gradnt | Twnkle | Test | | | | | | |
132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
133 * | | On/Off | ModeUp | Hue Up | Sat Up | Val Up | | | | | | | RESET | | 133 * | | On/Off | ModeUp | Hue Up | Sat Up | Val Up | | | | | | | RESET | |
134 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------| 134 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
@@ -140,11 +140,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
140 * '-----------------------------------------------------------------------------------------------------------' 140 * '-----------------------------------------------------------------------------------------------------------'
141 */ 141 */
142 [_ADJ] = LAYOUT_ortho_hhkb( 142 [_ADJ] = LAYOUT_ortho_hhkb(
143 _______, RGB_ON, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_T, _______, _______, _______, _______, _______, _______, _______, 143 XXXXXXX, RGB_ON, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
144 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, RESET, _______, 144 XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX,
145 _______, MACWIN, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, 145 XXXXXXX, MACWIN, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
146 _______, COLEMAK, QWERTY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 146 XXXXXXX, COLEMAK, QWERTY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
147 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 147 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
148 ) 148 )
149
150}; 149};
diff --git a/keyboards/dz60/keymaps/niclake/config.h b/keyboards/dz60/keymaps/niclake/config.h
new file mode 100644
index 000000000..9028fcf9f
--- /dev/null
+++ b/keyboards/dz60/keymaps/niclake/config.h
@@ -0,0 +1,18 @@
1/*
2 * This program is free software: you can redistribute it and/or modify
3 * it under the terms of the GNU General Public License as published by
4 * the Free Software Foundation, either version 2 of the License, or
5 * (at your option) any later version.
6 *
7 * This program is distributed in the hope that it will be useful,
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10 * GNU General Public License for more details.
11 *
12 * You should have received a copy of the GNU General Public License
13 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 */
15
16#pragma once
17
18#define TAPPING_TOGGLE 2
diff --git a/keyboards/dz60/keymaps/niclake/keymap.c b/keyboards/dz60/keymaps/niclake/keymap.c
new file mode 100644
index 000000000..6191e18c0
--- /dev/null
+++ b/keyboards/dz60/keymaps/niclake/keymap.c
@@ -0,0 +1,82 @@
1/*
2 * This program is free software: you can redistribute it and/or modify
3 * it under the terms of the GNU General Public License as published by
4 * the Free Software Foundation, either version 2 of the License, or
5 * (at your option) any later version.
6 *
7 * This program is distributed in the hope that it will be useful,
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10 * GNU General Public License for more details.
11 *
12 * You should have received a copy of the GNU General Public License
13 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 */
15
16#include QMK_KEYBOARD_H
17
18enum layer_names {
19 _BASE,
20 _QWERTY,
21 _FN,
22 _ADJ
23};
24
25enum custom_keycodes {
26 COLEMAK = SAFE_RANGE,
27 QWERTY,
28 FN,
29 ADJ,
30 MACWIN
31};
32
33#define COLEMAK DF(_BASE)
34#define QWERTY DF(_QWERTY)
35#define RAISE MO(_RAISE)
36#define LOWER MO(_LOWER)
37#define ADJUST TT(_ADJUST)
38#define MACWIN MAGIC_TOGGLE_ALT_GUI
39#define RGB_ON RGB_MODE_PLAIN
40#define RGB_TW RGB_MODE_TWINKLE
41
42const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 [_BASE] = LAYOUT(
44 KC_GRV, 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,
45 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
46 FN, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT,
47 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
48 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
49 ),
50
51 [_QWERTY] = LAYOUT(
52 KC_GRV, 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,
53 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,
54 FN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
55 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
56 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LOWER, KC_RCTL
57 ),
58
59 [_RAISE] = LAYOUT(
60 KC_GRV, 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,
61 _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______, _______, _______,
62 _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,
63 _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END, _______, KC_CAPS,
64 _______, _______, _______, _______, _______, _______, ADJUST, _______
65 ),
66
67 [_LOWER] = LAYOUT(
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
70 ADJUST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
71 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
72 _______, _______, _______, _______, _______, _______, _______, _______
73 ),
74
75 [_ADJUST] = LAYOUT(
76 XXXXXXX, RGB_ON, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
77 XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
78 ADJUST, MACWIN, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
79 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
80 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
81 )
82};
diff --git a/keyboards/dz60/keymaps/niclake/readme.md b/keyboards/dz60/keymaps/niclake/readme.md
new file mode 100644
index 000000000..a36c32d24
--- /dev/null
+++ b/keyboards/dz60/keymaps/niclake/readme.md
@@ -0,0 +1,12 @@
1# Nic Lake's DZ60 Layout
2
3This is Nic's DZ60 layout.
4
5- Colemak base layer w/ QWERTY support
6- Caps -> FN
7- Bottom row set up for Mac usage (use `MACWIN`/`AG_TOGG` to toggle)
8- Latching Numpad layer for data entry
9- Uses [Space Cadet shift keys](https://docs.qmk.fm/#/feature_space_cadet?id=usage)
10- Experimenting with [Home Row Mods](https://precondition.github.io/home-row-mods)
11
12![Nic's DZ60 Layout](https://i.imgur.com/Lmw08LT.jpg) \ No newline at end of file
diff --git a/keyboards/dz60/keymaps/niclake/rules.mk b/keyboards/dz60/keymaps/niclake/rules.mk
new file mode 100644
index 000000000..000a2e121
--- /dev/null
+++ b/keyboards/dz60/keymaps/niclake/rules.mk
@@ -0,0 +1,3 @@
1COMMAND_ENABLE = no
2RGBLIGHT_ENABLE = yes
3BOOTMAGIC_ENABLE = full
diff --git a/keyboards/pistachio/config.h b/keyboards/pistachio/config.h
index 461a364ec..5ff7b3d79 100644
--- a/keyboards/pistachio/config.h
+++ b/keyboards/pistachio/config.h
@@ -29,52 +29,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
29/* key matrix size */ 29/* key matrix size */
30#define MATRIX_ROWS 12 30#define MATRIX_ROWS 12
31#define MATRIX_COLS 9 31#define MATRIX_COLS 9
32
33/*
34 * Keyboard Matrix Assignments
35 *
36 * Change this to how you wired your keyboard
37 * COLS: AVR pins used for columns, left to right
38 * ROWS: AVR pins used for rows, top to bottom
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 *
42 */
43#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
44#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3}
45#define UNUSED_PINS
46
47#define USE_I2C
48
49/* COL2ROW, ROW2COL */
50#define DIODE_DIRECTION COL2ROW
51
52/* ws2812 RGB LED */
53#define RGB_DI_PIN D2
54#define RGBLIGHT_SPLIT
55#define RGBLED_SPLIT { 1, 1 }
56#define RGBLED_NUM 2
57#define RGBLIGHT_LAYERS
58#define RGBLIGHT_HUE_STEP 10
59#define RGBLIGHT_SAT_STEP 17
60
61#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
62 #define USB_MAX_POWER_CONSUMPTION 400
63#else
64 #define USB_MAX_POWER_CONSUMPTION 100
65#endif
66
67/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
68#define DEBOUNCE 5
69
70/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
71#define LOCKING_SUPPORT_ENABLE
72/* Locking resynchronize hack */
73#define LOCKING_RESYNC_ENABLE
74
75/* nKey Rollover */
76#define FORCE_NKRO
77
78/* disable these deprecated features by default */
79#define NO_ACTION_MACRO
80#define NO_ACTION_FUNCTION
diff --git a/keyboards/pistachio/pistachio.h b/keyboards/pistachio/pistachio.h
index 83196bfa7..8cbb967f4 100644
--- a/keyboards/pistachio/pistachio.h
+++ b/keyboards/pistachio/pistachio.h
@@ -18,40 +18,8 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21/* 21#if defined(KEYBOARD_pistachio_rev1)
22 * ,------------------------------------------------- ---------------------------------------------------------. 22# include "rev1.h"
23 * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | 23#elif defined(KEYBOARD_pistachio_rev2)
24 * |-------------------------------------- ---------- ---------------------------------------------------------+ 24# include "rev2.h"
25 * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | 25#endif
26 * |------------------------------------------------- ---------------------------------------------------------+
27 * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 |
28 * |--------------------------------------------- ------------------------------------------- ------+
29 * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 |
30 * |---------------------------------------------- -------------------------------------------------------+
31 * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 |
32 * |----------------------------------------------- -----------------------------------------------------+
33 * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 |
34 * |----------------------------------------------- ----------------------------------------------------
35 */
36#define LAYOUT( \
37 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
38 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
39 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \
40 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \
41 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \
42 L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \
43 ) \
44 { \
45 { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
46 { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \
47 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
48 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
49 { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
50 { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \
51 { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \
52 { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
53 { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
54 { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
55 { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \
56 { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \
57 }
diff --git a/keyboards/pistachio/readme.md b/keyboards/pistachio/readme.md
index fa073127f..8ff5933f4 100644
--- a/keyboards/pistachio/readme.md
+++ b/keyboards/pistachio/readme.md
@@ -1,20 +1,17 @@
1# pistachio 1# pistachio
2 2
3![pistachio](https://ratelog.net/wp-content/uploads/2020/08/Pistachio4-scaled.jpg) 3![pistachio](https://ratelog.net/wp-content/uploads/2021/05/s-IMG_1835.jpg)
4 4
5This is a 92-key split keyboard with JIS layout and spare keys. 5This is a 92-key split keyboard with JIS layout and spare keys.
6 6
7* Keyboard Maintainer: [rate](https://github.com/7-rate) 7* Keyboard Maintainer: [rate](https://github.com/7-rate) [@7_rate](https://twitter.com/7_rate)
8* Hardware Supported: pistachio PCB, Pro Micro 8* Hardware Supported: pistachio PCB Rev1 Rev2, Pro Micro
9* Hardware Availability: [PCB & Case Data](https://github.com/7-rate/Pistachio), [Booth Shop](https://rates.booth.pm/items/2237334) 9* Hardware Availability: [PCB & Case Data](https://github.com/7-rate/Pistachio), [Booth Shop](https://rates.booth.pm/items/2237334)
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
13 make pistachio:default 13 make pistachio/rev1:default
14 14 make pistachio/rev2:default
15Flashing example for this keyboard:
16
17 make pistachio:default:flash
18 15
19See 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). 16See 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).
20 17
diff --git a/keyboards/pistachio/rev1/config.h b/keyboards/pistachio/rev1/config.h
new file mode 100644
index 000000000..24f121ef1
--- /dev/null
+++ b/keyboards/pistachio/rev1/config.h
@@ -0,0 +1,67 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20/*
21 * Keyboard Matrix Assignments
22 *
23 * Change this to how you wired your keyboard
24 * COLS: AVR pins used for columns, left to right
25 * ROWS: AVR pins used for rows, top to bottom
26 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
27 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
28 *
29 */
30#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
31#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3}
32#define UNUSED_PINS
33
34#define USE_I2C
35
36/* COL2ROW, ROW2COL */
37#define DIODE_DIRECTION COL2ROW
38
39/* ws2812 RGB LED */
40#define RGB_DI_PIN D2
41#define RGBLIGHT_SPLIT
42#define RGBLED_SPLIT { 1, 1 }
43#define RGBLED_NUM 2
44#define RGBLIGHT_LAYERS
45#define RGBLIGHT_HUE_STEP 10
46#define RGBLIGHT_SAT_STEP 17
47
48#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
49 #define USB_MAX_POWER_CONSUMPTION 400
50#else
51 #define USB_MAX_POWER_CONSUMPTION 100
52#endif
53
54/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
55#define DEBOUNCE 5
56
57/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
58#define LOCKING_SUPPORT_ENABLE
59/* Locking resynchronize hack */
60#define LOCKING_RESYNC_ENABLE
61
62/* nKey Rollover */
63#define FORCE_NKRO
64
65/* disable these deprecated features by default */
66#define NO_ACTION_MACRO
67#define NO_ACTION_FUNCTION
diff --git a/keyboards/pistachio/rev1/readme.md b/keyboards/pistachio/rev1/readme.md
new file mode 100644
index 000000000..eae377693
--- /dev/null
+++ b/keyboards/pistachio/rev1/readme.md
@@ -0,0 +1,17 @@
1# pistachio Rev1
2
3![pistachio](https://ratelog.net/wp-content/uploads/2020/08/Pistachio4-scaled.jpg)
4
5This is a 92-key split keyboard with JIS layout and spare keys.
6
7* Keyboard Maintainer: [rate](https://github.com/7-rate) [@7_rate](https://twitter.com/7_rate)
8* Hardware Supported: pistachio PCB Rev1, Pro Micro
9* Hardware Availability: [PCB & Case Data](https://github.com/7-rate/Pistachio), [Booth Shop](https://rates.booth.pm/items/2237334)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make pistachio/rev1:default
14
15See 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).
16
17[Build guide](https://ratelog.net/pistachio-build-guide/) \ No newline at end of file
diff --git a/keyboards/pistachio/rev1/rev1.c b/keyboards/pistachio/rev1/rev1.c
new file mode 100644
index 000000000..5824157f5
--- /dev/null
+++ b/keyboards/pistachio/rev1/rev1.c
@@ -0,0 +1,18 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "rev1.h"
diff --git a/keyboards/pistachio/rev1/rev1.h b/keyboards/pistachio/rev1/rev1.h
new file mode 100644
index 000000000..e42de2d2b
--- /dev/null
+++ b/keyboards/pistachio/rev1/rev1.h
@@ -0,0 +1,58 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22/*
23 * ,------------------------------------------------- ---------------------------------------------------------.
24 * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | |
25 * |-------------------------------------- ---------- ---------------------------------------------------------+
26 * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 |
27 * |------------------------------------------------- ---------------------------------------------------------+
28 * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 |
29 * |--------------------------------------------- ------------------------------------------- ------+
30 * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 |
31 * |---------------------------------------------- -------------------------------------------------------+
32 * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 |
33 * |----------------------------------------------- -----------------------------------------------------+
34 * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 |
35 * |----------------------------------------------- ----------------------------------------------------
36 */
37#define LAYOUT( \
38 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
39 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
40 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \
41 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \
42 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \
43 L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \
44 ) \
45 { \
46 { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
47 { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \
48 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
49 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
50 { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
51 { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \
52 { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \
53 { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
54 { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
55 { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
56 { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \
57 { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \
58 }
diff --git a/keyboards/pistachio/rev1/rules.mk b/keyboards/pistachio/rev1/rules.mk
new file mode 100644
index 000000000..178866419
--- /dev/null
+++ b/keyboards/pistachio/rev1/rules.mk
@@ -0,0 +1,23 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = caterina
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = yes # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23SPLIT_KEYBOARD = yes # Enable split keyboard
diff --git a/keyboards/pistachio/rev2/config.h b/keyboards/pistachio/rev2/config.h
new file mode 100644
index 000000000..d0de29854
--- /dev/null
+++ b/keyboards/pistachio/rev2/config.h
@@ -0,0 +1,71 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20/*
21 * Keyboard Matrix Assignments
22 *
23 * Change this to how you wired your keyboard
24 * COLS: AVR pins used for columns, left to right
25 * ROWS: AVR pins used for rows, top to bottom
26 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
27 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
28 *
29 */
30#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 }
31#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3}
32#define UNUSED_PINS
33
34#define USE_I2C
35
36/* COL2ROW, ROW2COL */
37#define DIODE_DIRECTION COL2ROW
38
39/* Split hand configration */
40#define SPLIT_HAND_MATRIX_GRID D4,D3
41
42/* ws2812 RGB LED */
43#define RGB_DI_PIN D2
44#define RGBLIGHT_SPLIT
45#define RGBLED_SPLIT { 38, 46 }
46#define RGBLED_NUM 84
47#define RGBLIGHT_LIMIT_VAL 195
48#define RGBLIGHT_LAYERS
49#define RGBLIGHT_HUE_STEP 10
50#define RGBLIGHT_SAT_STEP 17
51
52#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
53 #define USB_MAX_POWER_CONSUMPTION 400
54#else
55 #define USB_MAX_POWER_CONSUMPTION 100
56#endif
57
58/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
59#define DEBOUNCE 5
60
61/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
62#define LOCKING_SUPPORT_ENABLE
63/* Locking resynchronize hack */
64#define LOCKING_RESYNC_ENABLE
65
66/* nKey Rollover */
67#define FORCE_NKRO
68
69/* disable these deprecated features by default */
70#define NO_ACTION_MACRO
71#define NO_ACTION_FUNCTION
diff --git a/keyboards/pistachio/rev2/readme.md b/keyboards/pistachio/rev2/readme.md
new file mode 100644
index 000000000..12d9f6598
--- /dev/null
+++ b/keyboards/pistachio/rev2/readme.md
@@ -0,0 +1,17 @@
1# pistachio Rev2
2
3![pistachio](https://ratelog.net/wp-content/uploads/2021/05/s-IMG_1835.jpg)
4
5This is a 92-key split keyboard with JIS layout and spare keys.
6
7* Keyboard Maintainer: [rate](https://github.com/7-rate) [@7_rate](https://twitter.com/7_rate)
8* Hardware Supported: pistachio PCB Rev2, Pro Micro, Backlight
9* Hardware Availability: [PCB & Case Data](https://github.com/7-rate/Pistachio), [Booth Shop](https://rates.booth.pm/items/2237334)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make pistachio/rev2:default
14
15See 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).
16
17[Build guide](https://ratelog.net/pistachio-build-guide/) \ No newline at end of file
diff --git a/keyboards/pistachio/rev2/rev2.c b/keyboards/pistachio/rev2/rev2.c
new file mode 100644
index 000000000..c6e64a526
--- /dev/null
+++ b/keyboards/pistachio/rev2/rev2.c
@@ -0,0 +1,19 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18
19#include "rev2.h"
diff --git a/keyboards/pistachio/rev2/rev2.h b/keyboards/pistachio/rev2/rev2.h
new file mode 100644
index 000000000..750778a30
--- /dev/null
+++ b/keyboards/pistachio/rev2/rev2.h
@@ -0,0 +1,58 @@
1/*
2Copyright 2020 rate
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22/*
23 * ,------------------------------------------------- ---------------------------------------------------------.
24 * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | |
25 * |-------------------------------------- ---------- ---------------------------------------------------------+
26 * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 |
27 * |------------------------------------------------- ---------------------------------------------------------+
28 * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 |
29 * |--------------------------------------------- ------------------------------------------- ------+
30 * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 |
31 * |---------------------------------------------- -------------------------------------------------------+
32 * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 |
33 * |----------------------------------------------- -----------------------------------------------------+
34 * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 |
35 * |----------------------------------------------- ----------------------------------------------------
36 */
37#define LAYOUT( \
38 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
39 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
40 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \
41 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \
42 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \
43 L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \
44 ) \
45 { \
46 { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
47 { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \
48 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
49 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
50 { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
51 { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \
52 { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \
53 { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
54 { R20, R21, R22, R23, R24, R25, R26, R28, KC_NO }, \
55 { R30, R31, R32, R33, R34, R35, R36, R27, R37 }, \
56 { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \
57 { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \
58 }
diff --git a/keyboards/pistachio/rev2/rules.mk b/keyboards/pistachio/rev2/rules.mk
new file mode 100644
index 000000000..178866419
--- /dev/null
+++ b/keyboards/pistachio/rev2/rules.mk
@@ -0,0 +1,23 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = caterina
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = yes # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23SPLIT_KEYBOARD = yes # Enable split keyboard
diff --git a/keyboards/pistachio/rules.mk b/keyboards/pistachio/rules.mk
index 178866419..93ae534be 100644
--- a/keyboards/pistachio/rules.mk
+++ b/keyboards/pistachio/rules.mk
@@ -1,23 +1 @@
1# MCU name DEFAULT_FOLDER = pistachio/rev2 \ No newline at end of file
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = caterina
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = yes # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23SPLIT_KEYBOARD = yes # Enable split keyboard
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 13:01:50 +0000