diff options
Diffstat (limited to 'keyboards/bemeier')
-rwxr-xr-x | keyboards/bemeier/bmek/bmek.h | 8 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/config.h | 2 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev1/config.h | 24 | ||||
-rw-r--r-- | keyboards/bemeier/bmek/rev1/info.json | 8 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev1/rev1.c | 16 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev1/rev1.h | 18 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev2/config.h | 24 | ||||
-rw-r--r-- | keyboards/bemeier/bmek/rev2/info.json | 8 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev2/rev2.c | 16 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev2/rev2.h | 18 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev3/config.h | 24 | ||||
-rw-r--r-- | keyboards/bemeier/bmek/rev3/info.json | 8 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev3/rev3.c | 16 | ||||
-rwxr-xr-x | keyboards/bemeier/bmek/rev3/rev3.h | 24 |
14 files changed, 24 insertions, 190 deletions
diff --git a/keyboards/bemeier/bmek/bmek.h b/keyboards/bemeier/bmek/bmek.h index 4249d02566..26c95737e6 100755 --- a/keyboards/bemeier/bmek/bmek.h +++ b/keyboards/bemeier/bmek/bmek.h @@ -17,14 +17,6 @@ #include "quantum.h" -#if defined(KEYBOARD_bemeier_bmek_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_bemeier_bmek_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_bemeier_bmek_rev3) -# include "rev3.h" -#endif - #define XXX KC_NO // makes the switch matrix easier to read // This layout is supported by all revisions diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h index 564d5f24a2..861203cf2f 100755 --- a/keyboards/bemeier/bmek/config.h +++ b/keyboards/bemeier/bmek/config.h @@ -19,8 +19,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 5 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_MODE_STATIC_GRADIENT diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h deleted file mode 100755 index bfd93fb77d..0000000000 --- a/keyboards/bemeier/bmek/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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 \ - { D4, D7, B6, B4, B7 } -#define MATRIX_COL_PINS \ - { F1, B0, B1, B2, B3, D0, D1, D2, C6, C7, F7, F6, F5, F4, B5 } -#define RGB_DI_PIN E6 - diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json index dab37baf04..c50cae166e 100644 --- a/keyboards/bemeier/bmek/rev1/info.json +++ b/keyboards/bemeier/bmek/rev1/info.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"], + "rows": ["D4", "D7", "B6", "B4", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev1/rev1.c b/keyboards/bemeier/bmek/rev1/rev1.c deleted file mode 100755 index 24f0dcdb94..0000000000 --- a/keyboards/bemeier/bmek/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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/bemeier/bmek/rev1/rev1.h b/keyboards/bemeier/bmek/rev1/rev1.h deleted file mode 100755 index 1c46169bdc..0000000000 --- a/keyboards/bemeier/bmek/rev1/rev1.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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" diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h deleted file mode 100755 index d2ef3e23c2..0000000000 --- a/keyboards/bemeier/bmek/rev2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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 \ - { F4, F5, D7, B5, B4 } -#define MATRIX_COL_PINS \ - { F6, B0, B1, F7, C7, C6, B6, F1, B2, B3, D6, D3, D2, D1, D0 } - -#define RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json index 65be217368..1ac54f5c79 100644 --- a/keyboards/bemeier/bmek/rev2/info.json +++ b/keyboards/bemeier/bmek/rev2/info.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"], + "rows": ["F4", "F5", "D7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev2/rev2.c b/keyboards/bemeier/bmek/rev2/rev2.c deleted file mode 100755 index 97ee43e318..0000000000 --- a/keyboards/bemeier/bmek/rev2/rev2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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/bemeier/bmek/rev2/rev2.h b/keyboards/bemeier/bmek/rev2/rev2.h deleted file mode 100755 index 1c46169bdc..0000000000 --- a/keyboards/bemeier/bmek/rev2/rev2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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" diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h deleted file mode 100755 index a8a1575b78..0000000000 --- a/keyboards/bemeier/bmek/rev3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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 \ - { F1, B4, B5, D6, D7 } -#define MATRIX_COL_PINS \ - { B6, C6, C7, F7, F6, F5, F4, F0, B7, D0, D1, D2, D3, D5, D4 } - -#define RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json index 14c0e6d7cb..c951ca8e43 100644 --- a/keyboards/bemeier/bmek/rev3/info.json +++ b/keyboards/bemeier/bmek/rev3/info.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.3" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"], + "rows": ["F1", "B4", "B5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bemeier/bmek/rev3/rev3.c b/keyboards/bemeier/bmek/rev3/rev3.c deleted file mode 100755 index 6193ab51b4..0000000000 --- a/keyboards/bemeier/bmek/rev3/rev3.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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 "rev3.h" diff --git a/keyboards/bemeier/bmek/rev3/rev3.h b/keyboards/bemeier/bmek/rev3/rev3.h deleted file mode 100755 index f769927193..0000000000 --- a/keyboards/bemeier/bmek/rev3/rev3.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 bemeier - * - * 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" - -/* -PCB rev3 has a number of layout options that rev2 and rev1 don't have, -however, to me just using "ALL_67" for all for all keymaps seems easier to -maintain than adding all possible permutations of layout options here. -*/ |