summaryrefslogtreecommitdiff
path: root/keyboards/ffkeebs
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ffkeebs')
-rw-r--r--keyboards/ffkeebs/puca/config.h9
-rw-r--r--keyboards/ffkeebs/puca/info.json8
-rw-r--r--keyboards/ffkeebs/puca/puca.c11
-rw-r--r--keyboards/ffkeebs/siris/config.h27
-rw-r--r--keyboards/ffkeebs/siris/info.json124
-rw-r--r--keyboards/ffkeebs/siris/siris.c17
-rw-r--r--keyboards/ffkeebs/siris/siris.h37
7 files changed, 76 insertions, 157 deletions
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 6f88b36fe7..23a2f15d99 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
- // 0 , 1 , 2 , 3 , 4 , 5
-#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6}
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6}
-
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
- #define RGB_DI_PIN D4
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json
index 1cf9fd94eb..cc98fed5ef 100644
--- a/keyboards/ffkeebs/puca/info.json
+++ b/keyboards/ffkeebs/puca/info.json
@@ -8,11 +8,19 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["B4", "E6", "D7", "B5", "C6", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5"}
]
},
+ "ws2812": {
+ "pin": "D4"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
diff --git a/keyboards/ffkeebs/puca/puca.c b/keyboards/ffkeebs/puca/puca.c
index 21944a9e5d..9d9f739a6f 100644
--- a/keyboards/ffkeebs/puca/puca.c
+++ b/keyboards/ffkeebs/puca/puca.c
@@ -29,17 +29,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
return true;
}
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10); // Right
- } else {
- tap_code_delay(KC_VOLD, 10); // Left
- }
- return false;
-}
-
-
// OLED
#ifdef OLED_ENABLE
__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
diff --git a/keyboards/ffkeebs/siris/config.h b/keyboards/ffkeebs/siris/config.h
deleted file mode 100644
index 3e03a4020e..0000000000
--- a/keyboards/ffkeebs/siris/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D2, D1, D0, B7, B3, B2, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json
index 5da5369b7c..6a1347cdf6 100644
--- a/keyboards/ffkeebs/siris/info.json
+++ b/keyboards/ffkeebs/siris/info.json
@@ -8,6 +8,11 @@
"pid": "0xE96C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"],
+ "rows": ["B5", "B4", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D5"},
@@ -19,66 +24,73 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0, "y":0.375},
- {"label":"0,1", "x":1, "y":0.375},
- {"label":"0,2", "x":2, "y":0.125},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0.125},
- {"label":"0,5", "x":5, "y":0.25},
- {"label":"0,6", "x":10, "y":0.25},
- {"label":"0,7", "x":11, "y":0.125},
- {"label":"0,8", "x":12, "y":0},
- {"label":"0,9", "x":13, "y":0.125},
- {"label":"0,10", "x":14, "y":0.375},
- {"label":"0,11", "x":15, "y":0.375},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [0, 6], "x": 10, "y": 0.25},
+ {"matrix": [0, 7], "x": 11, "y": 0.125},
+ {"matrix": [0, 8], "x": 12, "y": 0},
+ {"matrix": [0, 9], "x": 13, "y": 0.125},
+ {"matrix": [0, 10], "x": 14, "y": 0.375},
+ {"matrix": [0, 11], "x": 15, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 10, "y": 1.25},
+ {"matrix": [1, 7], "x": 11, "y": 1.125},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1.125},
+ {"matrix": [1, 10], "x": 14, "y": 1.375},
+ {"matrix": [1, 11], "x": 15, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 2.625},
+
+ {"matrix": [4, 6], "x": 8.75, "y": 2.625},
+ {"matrix": [2, 6], "x": 10, "y": 2.25},
+ {"matrix": [2, 7], "x": 11, "y": 2.125},
+ {"matrix": [2, 8], "x": 12, "y": 2},
+ {"matrix": [2, 9], "x": 13, "y": 2.125},
+ {"matrix": [2, 10], "x": 14, "y": 2.375},
+ {"matrix": [2, 11], "x": 15, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [3, 6], "x": 10, "y": 3.25},
+ {"matrix": [3, 7], "x": 11, "y": 3.125},
+ {"matrix": [3, 8], "x": 12, "y": 3},
+ {"matrix": [3, 9], "x": 13, "y": 3.125},
+ {"matrix": [3, 10], "x": 14, "y": 3.375},
+ {"matrix": [3, 11], "x": 15, "y": 3.375},
- {"label":"1,0", "x":0, "y":1.375},
- {"label":"1,1", "x":1, "y":1.375},
- {"label":"1,2", "x":2, "y":1.125},
- {"label":"1,3", "x":3, "y":1},
- {"label":"1,4", "x":4, "y":1.125},
- {"label":"1,5", "x":5, "y":1.25},
- {"label":"1,6", "x":10, "y":1.25},
- {"label":"1,7", "x":11, "y":1.125},
- {"label":"1,8", "x":12, "y":1},
- {"label":"1,9", "x":13, "y":1.125},
- {"label":"1,10", "x":14, "y":1.375},
- {"label":"1,11", "x":15, "y":1.375},
+ {"matrix": [4, 2], "x": 3.75, "y": 4.15},
+ {"matrix": [4, 3], "x": 4.75, "y": 4.25},
- {"label":"2,0", "x":0, "y":2.375},
- {"label":"2,1", "x":1, "y":2.375},
- {"label":"2,2", "x":2, "y":2.125},
- {"label":"2,3", "x":3, "y":2},
- {"label":"2,4", "x":4, "y":2.125},
- {"label":"2,5", "x":5, "y":2.25},
- {"label":"4,5", "x":6.25, "y":2.625},
- {"label":"4,6", "x":8.75, "y":2.625},
- {"label":"2,6", "x":10, "y":2.25},
- {"label":"2,7", "x":11, "y":2.125},
- {"label":"2,8", "x":12, "y":2},
- {"label":"2,9", "x":13, "y":2.125},
- {"label":"2,10", "x":14, "y":2.375},
- {"label":"2,11", "x":15, "y":2.375},
+ {"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.5},
- {"label":"3,0", "x":0, "y":3.375},
- {"label":"3,1", "x":1, "y":3.375},
- {"label":"3,2", "x":2, "y":3.125},
- {"label":"3,3", "x":3, "y":3},
- {"label":"3,4", "x":4, "y":3.125},
- {"label":"3,5", "x":5, "y":3.25},
- {"label":"3,6", "x":10, "y":3.25},
- {"label":"3,7", "x":11, "y":3.125},
- {"label":"3,8", "x":12, "y":3},
- {"label":"3,9", "x":13, "y":3.125},
- {"label":"3,10", "x":14, "y":3.375},
- {"label":"3,11", "x":15, "y":3.375},
+ {"matrix": [4, 7], "x": 8.5, "y": 4.5, "w": 1.5},
- {"label":"4,2", "x":3.75, "y":4.15},
- {"label":"4,3", "x":4.75, "y":4.25},
- {"x":6, "y":4.5, "w":1.5},
- {"x":8.5, "y":4.5, "w":1.5},
- {"label":"4,8", "x":10.25, "y":4.25},
- {"label":"4,0", "x":11.25, "y":4.15}
+ {"matrix": [4, 8], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4.15}
]
}
}
diff --git a/keyboards/ffkeebs/siris/siris.c b/keyboards/ffkeebs/siris/siris.c
deleted file mode 100644
index cfd505773a..0000000000
--- a/keyboards/ffkeebs/siris/siris.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-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 "siris.h"
diff --git a/keyboards/ffkeebs/siris/siris.h b/keyboards/ffkeebs/siris/siris.h
deleted file mode 100644
index 13956bcceb..0000000000
--- a/keyboards/ffkeebs/siris/siris.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K45, K46, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K42, K43, K44, K47, K48, K49 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
- { XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 01:26:25 +0000