summaryrefslogtreecommitdiff
path: root/keyboards/rate/pistachio_mp
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rate/pistachio_mp')
-rw-r--r--keyboards/rate/pistachio_mp/config.h17
-rw-r--r--keyboards/rate/pistachio_mp/info.json44
-rw-r--r--keyboards/rate/pistachio_mp/keymaps/via/keymap.c6
-rw-r--r--keyboards/rate/pistachio_mp/pistachio_mp.c17
-rw-r--r--keyboards/rate/pistachio_mp/pistachio_mp.h48
5 files changed, 30 insertions, 102 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..648be80cd5 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"}
@@ -18,29 +26,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 }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:13:19 +0000