diff options
Diffstat (limited to 'keyboards/rate/pistachio_mp')
| -rw-r--r-- | keyboards/rate/pistachio_mp/config.h | 17 | ||||
| -rw-r--r-- | keyboards/rate/pistachio_mp/info.json | 8 | ||||
| -rw-r--r-- | keyboards/rate/pistachio_mp/keymaps/via/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/rate/pistachio_mp/pistachio_mp.c | 17 |
4 files changed, 12 insertions, 36 deletions
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index 948c87264a..b788bd2bc1 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 diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index cab8ef68b4..0aca3a3f8e 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -8,6 +8,14 @@ "pid": "0xE212", "device_version": "0.0.1" }, + "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"} diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c index 293da4f569..bee139ac93 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" |