[Keyboard] moved E80-1800 to data driven configuration (#19199)

Co-authored-by: Drashna Jaelre <drashna@live.com>

keyboards/ebastler/e80_1800/config.h

@@ -1,5 +1,4 @@
-/* Copyright 2022 Moritz Plattner
- *
+/*
  * 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
@@ -16,37 +15,14 @@
 #pragma once
 
 #include "config_common.h"
-
-/* Limit layer count to fit in storage with VIA enabled */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 19
-
-#define MATRIX_ROW_PINS { B7, B3, D2, C12, C11, C10, A15 }
-#define MATRIX_COL_PINS { A1, A0, C3, C2, F1, F0, C15, C14, C13, C4, C5, B0, B1, B2, B9, A13, A8, C9, C8 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
-
-#define LED_NUM_LOCK_PIN B6
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 0
-
-/* Backlight */
-#define BACKLIGHT_PIN A9
-#define BACKLIGHT_BREATHING // don't disable even if you don't want breathing - it will not compile without
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 2
 #define BACKLIGHT_PAL_MODE 2
-#define BACKLIGHT_LEVELS 5
-#define BACKLIGHT_ON_STATE 1
-#define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000
 
-/* I2C for OLED */
+
+#ifdef OLED_ENABLE
+
+/* I2C for OLED - only enable defines if driver is enabled */
 #define I2C_DRIVER I2CD2
 #define I2C1_SCL_PIN        B10
 #define I2C1_SDA_PIN        B11
@@ -57,3 +33,5 @@
 #define I2C1_TIMINGR_SDADEL 1U
 #define I2C1_TIMINGR_SCLH   3U
 #define I2C1_TIMINGR_SCLL   9U
+
+#endif

keyboards/ebastler/e80_1800/e80_1800.c

@@ -1,17 +0,0 @@
-/* Copyright 2022 Moritz Plattner
- *
- * 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 "e80_1800.h"

keyboards/ebastler/e80_1800/e80_1800.h

@@ -1,109 +0,0 @@
-/* Copyright 2022 Moritz Plattner
- *
- * 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"
-
-#define LAYOUT_1800_all( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, K018, \
-	                                                                                          K115, K116, K117, K118, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, \
-	K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513, K514, K515, K516, K517, K518, \
-    K600, K601, K602,                   K606,             K609, K610, K611, K612, K613, K614, K615, K616, K617        \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015,  K016,  K017,  K018  }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  K218  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418  }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518  }, \
-    { K600,  K601,  K602,  KC_NO, KC_NO, KC_NO, K606,  KC_NO, KC_NO, K609,  K610,  K611,  K612,  K613,  K614,  K615,  K616,  K617,  KC_NO }  \
-}
-
-#define LAYOUT_1800_iso_6u( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, K018, \
-	                                                                                          K115, K116, K117, K118, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, \
-	K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513, K514, K515, K516, K517, K518, \
-    K600, K601, K602,                   K606,             K609, K610, K611, K612, K613, K614, K615, K616, K617        \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015,  K016,  K017,  K018  }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  K218  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317,  K318  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418  }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518  }, \
-    { K600,  K601,  K602,  KC_NO, KC_NO, KC_NO, K606,  KC_NO, KC_NO, K609,  K610,  K611,  K612,  K613,  K614,  K615,  K616,  K617,  KC_NO }  \
-}
-
-#define LAYOUT_1800_iso_7u( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, K018, \
-	                                                                                          K115, K116, K117, K118, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, \
-	K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513, K514, K515, K516, K517, K518, \
-    K600,       K602,                   K606,             K609,             K612, K613, K614, K615, K616, K617        \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015,  K016,  K017,  K018  }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  K218  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317,  K318  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418  }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518  }, \
-    { K600,  KC_NO, K602,  KC_NO, KC_NO, KC_NO, K606,  KC_NO, KC_NO, K609,  KC_NO, KC_NO, K612,  K613,  K614,  K615,  K616,  K617,  KC_NO }  \
-}
-
-#define LAYOUT_1800_ansi_6u( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, K018, \
-	                                                                                          K115, K116, K117, K118, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417, K418, \
-	K500,       K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513, K514, K515, K516, K517, K518, \
-    K600, K601, K602,                   K606,             K609, K610, K611, K612, K613, K614, K615, K616, K617        \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015,  K016,  K017,  K018  }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K314,  K115,  K116,  K117,  K118  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  K218  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317,  K318  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  K418  }, \
-	{ K500,  KC_NO, K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518  }, \
-    { K600,  K601,  K602,  KC_NO, KC_NO, KC_NO, K606,  KC_NO, KC_NO, K609,  K610,  K611,  K612,  K613,  K614,  K615,  K616,  K617,  KC_NO }  \
-}
-
-#define LAYOUT_1800_ansi_7u( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, K018, \
-	                                                                                    K314, K115, K116, K117, K118, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417, K418, \
-	K500,       K502, K503, K504, K505, K506, K507, K508, K509, K510, K511,       K513, K514, K515, K516, K517, K518, \
-    K600,       K602,                   K606,             K609,             K612, K613, K614, K615, K616, K617        \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015,  K016,  K017,  K018  }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K314,  K115,  K116,  K117,  K118  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216,  K217,  K218  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317,  K318  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  K418  }, \
-	{ K500,  KC_NO, K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518  }, \
-    { K600,  KC_NO, K602,  KC_NO, KC_NO, KC_NO, K606,  KC_NO, KC_NO, K609,  KC_NO, KC_NO, K612,  K613,  K614,  K615,  K616,  K617,  KC_NO }  \
-}

keyboards/ebastler/e80_1800/keymaps/via/keymap.c

@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_TRNS, BL_TOGG, BL_DOWN, BL_BRTG,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS,
+        CL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS),
 
     [2] = LAYOUT_1800_all(    /* keymap for layer 2 */

keyboards/ebastler/e80_1800/rules.mk

@@ -1,22 +1 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
+# This file intentionally left blank