From 9e242621611ac97a9fe8f12133812019af41e072 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 9 Sep 2022 21:21:48 +0100 Subject: [PATCH] Fix DD use within boardsource/microdox (#18319) --- keyboards/boardsource/microdox/config.h | 77 --------------------- keyboards/boardsource/microdox/v1/config.h | 16 +---- keyboards/boardsource/microdox/v1/info.json | 4 +- keyboards/boardsource/microdox/v2/config.h | 1 - 4 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 keyboards/boardsource/microdox/config.h diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h deleted file mode 100644 index 517e0e7376c..00000000000 --- a/keyboards/boardsource/microdox/config.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2020 Cole Smith - -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 . -*/ - -#pragma once - -#include "config_common.h" - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 -#define MATRIX_ROW_PINS \ - { B2, B6, B4, B5 } - -// wiring of each half -#define MATRIX_COL_PINS \ - { F4, F5, F6, F7, B1 } -#define USE_SERIAL -#define SOFT_SERIAL_PIN D2 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -//#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -//#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 -#ifdef RGBLIGHT_ENABLE -# define RGBLED_NUM 12 // Number of LEDs -# define RGBLED_SPLIT \ - { 6, 6 } -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_STATIC_GRADIENT - -#endif - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/boardsource/microdox/v1/config.h b/keyboards/boardsource/microdox/v1/config.h index 111033dd67d..01b894afd69 100644 --- a/keyboards/boardsource/microdox/v1/config.h +++ b/keyboards/boardsource/microdox/v1/config.h @@ -3,18 +3,4 @@ #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT +// Just here to please quantum/split_common/split_util.c diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json index a79153a73cc..85f2e614570 100644 --- a/keyboards/boardsource/microdox/v1/info.json +++ b/keyboards/boardsource/microdox/v1/info.json @@ -2,7 +2,7 @@ "features": { "rgblight": true }, - "matrix_pins": { + "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["B2", "B6", "B4", "B5"] }, @@ -12,7 +12,7 @@ "split": { "soft_serial_pin": "D2" }, - "rgblight": { + "rgblight": { "pin": "D3", "sleep": true, "led_count": 12, diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h index b2e6ba93350..e6a7ddc16b6 100644 --- a/keyboards/boardsource/microdox/v2/config.h +++ b/keyboards/boardsource/microdox/v2/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#undef RGB_DI_PIN #define RGB_DI_PIN B5 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define DRIVER_LED_TOTAL 44