diff options
Diffstat (limited to 'keyboards/eyeohdesigns')
| -rw-r--r-- | keyboards/eyeohdesigns/babyv/babyv.c | 17 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/babyv/config.h | 8 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/babyv/info.json | 8 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/sprh/config.h | 24 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/sprh/info.json | 5 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/sprh/sprh.c | 14 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/sprh/sprh.h | 10 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/theboulevard/config.h | 7 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/theboulevard/info.json | 8 | ||||
| -rw-r--r-- | keyboards/eyeohdesigns/theboulevard/theboulevard.c | 14 |
10 files changed, 26 insertions, 89 deletions
diff --git a/keyboards/eyeohdesigns/babyv/babyv.c b/keyboards/eyeohdesigns/babyv/babyv.c deleted file mode 100644 index 5a01ea2c91..0000000000 --- a/keyboards/eyeohdesigns/babyv/babyv.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Eye Oh! Designs - * - * 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 "babyv.h" diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h index 6da702919e..9df626ae72 100644 --- a/keyboards/eyeohdesigns/babyv/config.h +++ b/keyboards/eyeohdesigns/babyv/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B5, D2, D5, D3 } -#define MATRIX_COL_PINS { D0, D1, B4, D7, D6, D4, B0, B1, B2, F0, F1, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B7 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index 2a55943c78..b530951376 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -8,9 +8,17 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "B4", "D7", "D6", "D4", "B0", "B1", "B2", "F0", "F1", "F4"], + "rows": ["B5", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/eyeohdesigns/sprh/config.h b/keyboards/eyeohdesigns/sprh/config.h deleted file mode 100644 index 31b6d017ce..0000000000 --- a/keyboards/eyeohdesigns/sprh/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Eye Oh Designs - -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 - -#define MATRIX_ROW_PINS { B3, B7, D2, D5, D3 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, C6, B6, B5, B4, D7, D6, F7, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json index bcef81b310..9d4c9cab64 100644 --- a/keyboards/eyeohdesigns/sprh/info.json +++ b/keyboards/eyeohdesigns/sprh/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "F7", "D4"], + "rows": ["B3", "B7", "D2", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1", "resolution": 2} diff --git a/keyboards/eyeohdesigns/sprh/sprh.c b/keyboards/eyeohdesigns/sprh/sprh.c index 903e0c68e2..f73b463d79 100644 --- a/keyboards/eyeohdesigns/sprh/sprh.c +++ b/keyboards/eyeohdesigns/sprh/sprh.c @@ -14,17 +14,3 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "sprh.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif
\ No newline at end of file diff --git a/keyboards/eyeohdesigns/sprh/sprh.h b/keyboards/eyeohdesigns/sprh/sprh.h index 5a367131c5..0b895529d2 100644 --- a/keyboards/eyeohdesigns/sprh/sprh.h +++ b/keyboards/eyeohdesigns/sprh/sprh.h @@ -103,11 +103,11 @@ k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\ ) \ { \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d},\ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d},\ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d},\ - {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\ - {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d},\ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d},\ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d},\ + {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\ + {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\ } #define LAYOUT_bd5( \ k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\ diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h index 081ab50216..6b392b99e1 100644 --- a/keyboards/eyeohdesigns/theboulevard/config.h +++ b/keyboards/eyeohdesigns/theboulevard/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { F7, B1, E6, F0, F1 } -#define MATRIX_COL_PINS { B0, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F6 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json index 0a12742903..f1a09875c5 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/info.json @@ -8,11 +8,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["F7", "B1", "E6", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4", "resolution": 2} ] }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.c b/keyboards/eyeohdesigns/theboulevard/theboulevard.c index a2b40cd9e9..5671425698 100644 --- a/keyboards/eyeohdesigns/theboulevard/theboulevard.c +++ b/keyboards/eyeohdesigns/theboulevard/theboulevard.c @@ -15,17 +15,3 @@ */ #include "theboulevard.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif
\ No newline at end of file |