diff options
Diffstat (limited to 'keyboards/rate')
20 files changed, 407 insertions, 597 deletions
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json index 109e2fa50c..0eaea7885d 100644 --- a/keyboards/rate/pistachio/info.json +++ b/keyboards/rate/pistachio/info.json @@ -1,109 +1,14 @@ { - "keyboard_name": "pistachio", + "keyboard_name": "pistachio", "manufacturer": "rate", - "url": "", - "maintainer": "rate", + "url": "", + "maintainer": "rate", "usb": { "vid": "0x5255", "pid": "0xD0C2", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [{"label":"ESC", "x":1.25, "y":0.25}, - {"label":"F1", "x":2.75, "y":0.25}, - {"label":"F2", "x":3.75, "y":0.25}, - {"label":"F3", "x":4.75, "y":0.25}, - {"label":"F4", "x":5.75, "y":0.25}, - {"label":"DEL", "x":7.25, "y":0.25}, - {"label":"F5", "x":9.5, "y":0.25}, - {"label":"F6", "x":10.5, "y":0.25}, - {"label":"F7", "x":11.5, "y":0.25}, - {"label":"F8", "x":12.5, "y":0.25}, - {"label":"F9", "x":14, "y":0.25}, - {"label":"F10", "x":15, "y":0.25}, - {"label":"F11", "x":16, "y":0.25}, - {"label":"F12", "x":17, "y":0.25}, - {"label":"\u25b6\u25b6|", "x":0, "y":1.75}, - {"label":"E/J", "x":1.25, "y":1.75}, - {"label":"!", "x":2.25, "y":1.75}, - {"label":"\"", "x":3.25, "y":1.75}, - {"label":"#", "x":4.25, "y":1.75}, - {"label":"$", "x":5.25, "y":1.75}, - {"label":"%", "x":6.25, "y":1.75}, - {"label":"&", "x":7.25, "y":1.75}, - {"label":"'", "x":10, "y":1.75}, - {"label":"(", "x":11, "y":1.75}, - {"label":")", "x":12, "y":1.75}, - {"label":"", "x":13, "y":1.75}, - {"label":"=", "x":14, "y":1.75}, - {"label":"~", "x":15, "y":1.75}, - {"label":"\\", "x":16, "y":1.75}, - {"label":"\u2190", "x":17, "y":1.75}, - {"label":"Delete", "x":18.25, "y":1.75}, - {"label":"\u25b6||", "x":0, "y":2.75}, - {"label":"Tab", "x":1.25, "y":2.75, "w":1.5}, - {"label":"Q", "x":2.75, "y":2.75}, - {"label":"W", "x":3.75, "y":2.75}, - {"label":"E", "x":4.75, "y":2.75}, - {"label":"R", "x":5.75, "y":2.75}, - {"label":"T", "x":6.75, "y":2.75}, - {"label":"Y", "x":9.5, "y":2.75}, - {"label":"U", "x":10.5, "y":2.75}, - {"label":"I", "x":11.5, "y":2.75}, - {"label":"O", "x":12.5, "y":2.75}, - {"label":"P", "x":13.5, "y":2.75}, - {"label":"`", "x":14.5, "y":2.75}, - {"label":"{", "x":15.5, "y":2.75}, - {"label":"Home", "x":18.25, "y":2.75}, - {"label":"\ud83d\udd07", "x":0, "y":3.75}, - {"label":"CapsLock", "x":1.25, "y":3.75, "w":1.75}, - {"label":"A", "x":3, "y":3.75}, - {"label":"S", "x":4, "y":3.75}, - {"label":"D", "x":5, "y":3.75}, - {"label":"F", "x":6, "y":3.75}, - {"label":"G", "x":7, "y":3.75}, - {"label":"H", "x":9.75, "y":3.75}, - {"label":"J", "x":10.75, "y":3.75}, - {"label":"K", "x":11.75, "y":3.75}, - {"label":"L", "x":12.75, "y":3.75}, - {"label":"+", "x":13.75, "y":3.75}, - {"label":"*", "x":14.75, "y":3.75}, - {"label":"}", "x":15.75, "y":3.75}, - {"label":"Enter", "x":16.75, "y":2.75, "w":1.25, "h":2}, - {"label":"End", "x":18.25, "y":3.75}, - {"label":"VolUP", "x":0, "y":4.75}, - {"label":"Shift", "x":1.25, "y":4.75, "w":2.25}, - {"label":"Z", "x":3.5, "y":4.75}, - {"label":"X", "x":4.5, "y":4.75}, - {"label":"C", "x":5.5, "y":4.75}, - {"label":"V", "x":6.5, "y":4.75}, - {"label":"B", "x":7.5, "y":4.75}, - {"label":"N", "x":10.25, "y":4.75}, - {"label":"M", "x":11.25, "y":4.75}, - {"label":"<", "x":12.25, "y":4.75}, - {"label":">", "x":13.25, "y":4.75}, - {"label":"?", "x":14.25, "y":4.75}, - {"label":"_", "x":15.25, "y":4.75}, - {"label":"Shift", "x":16.25, "y":4.75, "w":1.75}, - {"label":"Page", "x":18.25, "y":4.75}, - {"label":"VolDW", "x":0, "y":5.75}, - {"label":"Ctrl", "x":1.25, "y":5.75, "w":1.25}, - {"label":"Win", "x":2.5, "y":5.75}, - {"label":"Alt", "x":3.5, "y":5.75, "w":1.25}, - {"label":"Enter", "x":4.75, "y":5.75}, - {"label":"\u7121\u5909\u63db", "x":5.75, "y":5.75}, - {"x":6.75, "y":5.75, "w":1.25}, - {"x":10.5, "y":5.75, "w":1.25}, - {"label":"\u5909\u63db", "x":11.75, "y":5.75}, - {"label":"\u5de6\u30af\u30ea\u30c3\u30af", "x":12.75, "y":5.75}, - {"label":"Insert", "x":13.75, "y":5.75}, - {"label":"Alt", "x":14.75, "y":5.75}, - {"label":"Menu", "x":15.75, "y":5.75}, - {"label":"Ctrl", "x":16.75, "y":5.75, "w":1.25}, - {"label":"Page", "x":18.25, "y":5.75}] - } - } + "bootloader": "caterina" } diff --git a/keyboards/rate/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c deleted file mode 100644 index 2a850f64a4..0000000000 --- a/keyboards/rate/pistachio/pistachio.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 rate - * - * 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 "pistachio.h" - diff --git a/keyboards/rate/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h deleted file mode 100644 index 7bf2c59ad6..0000000000 --- a/keyboards/rate/pistachio/pistachio.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 rate - * - * 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" - -#if defined(KEYBOARD_rate_pistachio_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_rate_pistachio_rev2) -# include "rev2.h" -#endif diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h index cd6121de45..cf7e2cdfb0 100644 --- a/keyboards/rate/pistachio/rev1/config.h +++ b/keyboards/rate/pistachio/rev1/config.h @@ -17,26 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3} - #define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ -#define RGB_DI_PIN D2 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 1, 1 } #define RGBLED_NUM 2 @@ -54,6 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json new file mode 100644 index 0000000000..a50ae8b991 --- /dev/null +++ b/keyboards/rate/pistachio/rev1/info.json @@ -0,0 +1,132 @@ +{ + "ws2812": { + "pin": "D2" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1.5}, + {"matrix": [1, 4], "x": 4.25, "y": 1.5}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 7.25, "y": 1.5}, + + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5}, + {"matrix": [7, 4], "x": 14, "y": 1.5}, + {"matrix": [7, 5], "x": 15, "y": 1.5}, + {"matrix": [7, 6], "x": 16, "y": 1.5}, + {"matrix": [7, 7], "x": 17, "y": 1.5}, + + {"matrix": [7, 8], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + + {"matrix": [8, 0], "x": 9.5, "y": 2.5}, + {"matrix": [8, 1], "x": 10.5, "y": 2.5}, + {"matrix": [8, 2], "x": 11.5, "y": 2.5}, + {"matrix": [8, 3], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5}, + {"matrix": [8, 5], "x": 14.5, "y": 2.5}, + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + + {"matrix": [8, 8], "x": 18.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 3, "y": 3.5}, + {"matrix": [3, 3], "x": 4, "y": 3.5}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.5}, + {"matrix": [9, 1], "x": 10.75, "y": 3.5}, + {"matrix": [9, 2], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5}, + {"matrix": [9, 4], "x": 13.75, "y": 3.5}, + {"matrix": [9, 5], "x": 14.75, "y": 3.5}, + {"matrix": [9, 6], "x": 15.75, "y": 3.5}, + {"matrix": [8, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 18.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 2], "x": 12.25, "y": 4.5}, + {"matrix": [10, 3], "x": 13.25, "y": 4.5}, + {"matrix": [10, 4], "x": 14.25, "y": 4.5}, + {"matrix": [10, 5], "x": 15.25, "y": 4.5}, + {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75}, + + {"matrix": [10, 7], "x": 18.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5.5}, + {"matrix": [5, 5], "x": 5.75, "y": 5.5}, + {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.75, "y": 5.5}, + {"matrix": [11, 2], "x": 12.75, "y": 5.5}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5}, + {"matrix": [11, 4], "x": 14.75, "y": 5.5}, + {"matrix": [11, 5], "x": 15.75, "y": 5.5}, + {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rate/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c deleted file mode 100644 index 5824157f53..0000000000 --- a/keyboards/rate/pistachio/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 rate - -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 "rev1.h" diff --git a/keyboards/rate/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h deleted file mode 100644 index e42de2d2b0..0000000000 --- a/keyboards/rate/pistachio/rev1/rev1.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2020 rate - -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" - -/* - * ,------------------------------------------------- ---------------------------------------------------------. - * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | - * |-------------------------------------- ---------- ---------------------------------------------------------+ - * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | - * |------------------------------------------------- ---------------------------------------------------------+ - * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 | - * |--------------------------------------------- ------------------------------------------- ------+ - * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 | - * |---------------------------------------------- -------------------------------------------------------+ - * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 | - * |----------------------------------------------- -----------------------------------------------------+ - * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 | - * |----------------------------------------------- ---------------------------------------------------- - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \ - L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \ - } diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h index 5a7c35a936..5cf0dc14e1 100644 --- a/keyboards/rate/pistachio/rev2/config.h +++ b/keyboards/rate/pistachio/rev2/config.h @@ -17,29 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3} - #define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Split hand configration */ #define SPLIT_HAND_MATRIX_GRID D4,D3 /* ws2812 RGB LED */ -#define RGB_DI_PIN D2 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 38, 46 } #define RGBLED_NUM 84 @@ -58,6 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json new file mode 100644 index 0000000000..690c179151 --- /dev/null +++ b/keyboards/rate/pistachio/rev2/info.json @@ -0,0 +1,132 @@ +{ + "ws2812": { + "pin": "D2" + }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1.5}, + {"matrix": [1, 4], "x": 4.25, "y": 1.5}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 7.25, "y": 1.5}, + + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5}, + {"matrix": [7, 4], "x": 14, "y": 1.5}, + {"matrix": [7, 5], "x": 15, "y": 1.5}, + {"matrix": [7, 6], "x": 16, "y": 1.5}, + {"matrix": [7, 7], "x": 17, "y": 1.5}, + + {"matrix": [7, 8], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + + {"matrix": [8, 0], "x": 9.5, "y": 2.5}, + {"matrix": [8, 1], "x": 10.5, "y": 2.5}, + {"matrix": [8, 2], "x": 11.5, "y": 2.5}, + {"matrix": [8, 3], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5}, + {"matrix": [8, 5], "x": 14.5, "y": 2.5}, + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + + {"matrix": [8, 7], "x": 18.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 3, "y": 3.5}, + {"matrix": [3, 3], "x": 4, "y": 3.5}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.5}, + {"matrix": [9, 1], "x": 10.75, "y": 3.5}, + {"matrix": [9, 2], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5}, + {"matrix": [9, 4], "x": 13.75, "y": 3.5}, + {"matrix": [9, 5], "x": 14.75, "y": 3.5}, + {"matrix": [9, 6], "x": 15.75, "y": 3.5}, + {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [9, 8], "x": 18.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 2], "x": 12.25, "y": 4.5}, + {"matrix": [10, 3], "x": 13.25, "y": 4.5}, + {"matrix": [10, 4], "x": 14.25, "y": 4.5}, + {"matrix": [10, 5], "x": 15.25, "y": 4.5}, + {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75}, + + {"matrix": [10, 7], "x": 18.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5.5}, + {"matrix": [5, 5], "x": 5.75, "y": 5.5}, + {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.75, "y": 5.5}, + {"matrix": [11, 2], "x": 12.75, "y": 5.5}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5}, + {"matrix": [11, 4], "x": 14.75, "y": 5.5}, + {"matrix": [11, 5], "x": 15.75, "y": 5.5}, + {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rate/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c deleted file mode 100644 index c6e64a526d..0000000000 --- a/keyboards/rate/pistachio/rev2/rev2.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 rate - -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 "rev2.h" diff --git a/keyboards/rate/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h deleted file mode 100644 index 750778a30e..0000000000 --- a/keyboards/rate/pistachio/rev2/rev2.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2020 rate - -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" - -/* - * ,------------------------------------------------- ---------------------------------------------------------. - * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | - * |-------------------------------------- ---------- ---------------------------------------------------------+ - * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | - * |------------------------------------------------- ---------------------------------------------------------+ - * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 | - * |--------------------------------------------- ------------------------------------------- ------+ - * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 | - * |---------------------------------------------- -------------------------------------------------------+ - * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 | - * |----------------------------------------------- -----------------------------------------------------+ - * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 | - * |----------------------------------------------- ---------------------------------------------------- - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \ - L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R28, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36, R27, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \ - } diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index 948c87264a..25aac817da 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN D2 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 @@ -47,6 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* nKey Rollover */ -#define FORCE_NKRO diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index cab8ef68b4..07943e5ca3 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -1,13 +1,22 @@ { - "keyboard_name": "pistachio_mp", + "keyboard_name": "pistachio_mp", "manufacturer": "rate", - "url": "", - "maintainer": "rate", + "url": "", + "maintainer": "rate", "usb": { "vid": "0x5255", "pid": "0xE212", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "ws2812": { + "pin": "D2" + }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6"], + "rows": ["B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} @@ -18,29 +27,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Encoder", "x":3, "y":0}, + {"matrix": [1, 3], "x": 3, "y": 0}, - {"label":"Num Lock", "x":0, "y":1.5}, - {"label":"/", "x":1, "y":1.5}, - {"label":"*", "x":2, "y":1.5}, - {"label":"-", "x":3, "y":1.5}, + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.5}, + {"matrix": [0, 2], "x": 2, "y": 1.5}, + {"matrix": [0, 3], "x": 3, "y": 1.5}, - {"label":"7", "x":0, "y":2.5}, - {"label":"8", "x":1, "y":2.5}, - {"label":"9", "x":2, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.5}, + {"matrix": [1, 2], "x": 2, "y": 2.5}, - {"label":"4", "x":0, "y":3.5}, - {"label":"5", "x":1, "y":3.5}, - {"label":"6", "x":2, "y":3.5}, - {"label":"+", "x":3, "y":2.5, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.5}, + {"matrix": [2, 2], "x": 2, "y": 3.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2}, - {"label":"1", "x":0, "y":4.5}, - {"label":"2", "x":1, "y":4.5}, - {"label":"3", "x":2, "y":4.5}, + {"matrix": [3, 0], "x": 0, "y": 4.5}, + {"matrix": [3, 1], "x": 1, "y": 4.5}, + {"matrix": [3, 2], "x": 2, "y": 4.5}, - {"label":"0", "x":0, "y":5.5, "w":2}, - {"label":".", "x":2, "y":5.5}, - {"label":"Enter", "x":3, "y":4.5, "h":2} + {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 5.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2} ] } } diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c index 293da4f569..f459a76970 100644 --- a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c +++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c @@ -87,7 +87,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state >> 1 ? ENC_CW : ENC_CCW, .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state = 0; action_exec(encoder_event); @@ -99,7 +100,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? ENC_CW : ENC_CCW, .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c deleted file mode 100644 index 40e75fe1b0..0000000000 --- a/keyboards/rate/pistachio_mp/pistachio_mp.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 rate - * - * 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 "pistachio_mp.h" diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h deleted file mode 100644 index d7c5c9bad9..0000000000 --- a/keyboards/rate/pistachio_mp/pistachio_mp.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 rate - * - * 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" - -/* - * ,------------------------ - * | K07 | - * |------------------------ - * | K00 | K01 | K02 | K03 | - * |------------------------ - * | K04 | K05 | K06 | | - * |------------------ K11 - - * | K08 | K09 | K10 | | - * |------------------------ - * | K12 | K13 | K14 | | - * |------------------ K17 - - * | K15 | K16 | | - * |------------------------ - */ -#define LAYOUT( \ - K07, \ - K00, K01, K02, K03, \ - K04, K05, K06, \ - K08, K09, K10, K11, \ - K12, K13, K14, \ - K15, K16, K17 ) { \ - { K00, K01, K02, K03 }, \ - { K04, K05, K06, K07 }, \ - { K08, K09, K10, K11 }, \ - { K12, K13, K14, KC_NO }, \ - { K15, KC_NO, K16, K17 }, \ -} diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json index 743ff18155..cf0218b050 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/info.json @@ -18,101 +18,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"E/J", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"\"", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"&", "x":6, "y":1.5}, - {"label":"'", "x":7, "y":1.5}, - {"label":"(", "x":8, "y":1.5}, - {"label":")", "x":9, "y":1.5}, - {"label":"", "x":10, "y":1.5}, - {"label":"=", "x":11, "y":1.5}, - {"label":"~", "x":12, "y":1.5}, - {"label":"|", "x":13, "y":1.5}, - {"label":"BS", "x":14, "y":1.5}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"`", "x":11.5, "y":2.5}, - {"label":"{", "x":12.5, "y":2.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":"+", "x":10.75, "y":3.5}, - {"label":"*", "x":11.75, "y":3.5}, - {"label":"}", "x":12.75, "y":3.5}, - {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "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":"_", "x":12.25, "y":4.5}, - {"label":"Shift", "x":13.25, "y":4.5, "w":1.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5}, - {"label":"Alt", "x":2.25, "y":5.5, "w":1.25}, - {"x":3.5, "y":5.5}, - {"x":4.5, "y":5.5, "w":2.25}, - {"x":6.75, "y":5.5, "w":2.25}, - {"label":"kana", "x":9, "y":5.5, "w":1.25}, - {"x":10.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":11.5, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.75, "y":5.5}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [1, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.5}, + {"matrix": [1, 16], "x": 16.25, "y": 1.5}, + {"matrix": [1, 17], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [2, 13], "x": 15.25, "y": 2.5}, + {"matrix": [2, 14], "x": 16.25, "y": 2.5}, + {"matrix": [2, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.5, "w": 1.75}, + + {"matrix": [4, 13], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5}, + {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5}, + {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 2.25}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5, "w": 2.25}, + {"matrix": [5, 6], "x": 9, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.75, "y": 5.5}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 13], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c index 3e390d442f..b5b8e3c440 100644 --- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c +++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c @@ -135,7 +135,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state >> 1 ? ENC_CW : ENC_CCW, .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state = 0; action_exec(encoder_event); @@ -146,7 +147,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? ENC_CW : ENC_CCW, .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c deleted file mode 100644 index fda14471b7..0000000000 --- a/keyboards/rate/pistachio_pro/pistachio_pro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 rate - * - * 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 "pistachio_pro.h" diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h deleted file mode 100644 index 42de95ea87..0000000000 --- a/keyboards/rate/pistachio_pro/pistachio_pro.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 rate - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513 ) { \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, KC_NO, KC_NO }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO } \ -} |