Remove QMK_KEYBOARD_CONFIG_H (#11576)
This commit is contained in:
parent
397e8e461f
commit
a07c2a1377
27 changed files with 22 additions and 125 deletions
|
@ -379,7 +379,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
|
||||||
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
|
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
|
||||||
$(KEYMAP_OUTPUT)_SRC := $(SRC)
|
$(KEYMAP_OUTPUT)_SRC := $(SRC)
|
||||||
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
|
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
|
||||||
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH_1)/config.h\" \
|
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
|
||||||
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
|
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
|
||||||
-DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
|
-DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
|
||||||
$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
|
$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
|
||||||
|
|
|
@ -16,12 +16,8 @@ You should have received a copy of the GNU General Public License
|
||||||
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
#define USE_MIT_LAYOUT
|
#define USE_MIT_LAYOUT
|
||||||
|
|
||||||
#define TAPPING_TERM 250
|
#define TAPPING_TERM 250
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define USE_SERIAL
|
#define USE_SERIAL
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define SOLENOID_ENABLE
|
#define SOLENOID_ENABLE
|
||||||
#define SOLENOID_PIN F6
|
#define SOLENOID_PIN F6
|
||||||
#define SOLENOID_ACTIVE true
|
#define SOLENOID_ACTIVE true
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License
|
||||||
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -38,5 +35,3 @@ long with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License
|
||||||
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
long with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -31,5 +28,3 @@ long with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
/* #define _MASTER_RIGHT */
|
/* #define _MASTER_RIGHT */
|
||||||
/* #define EE_HANDS */
|
/* #define EE_HANDS */
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -39,5 +36,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -15,13 +15,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef BACKLIGHT_LEVELS
|
#undef BACKLIGHT_LEVELS
|
||||||
#define BACKLIGHT_LEVELS 3
|
#define BACKLIGHT_LEVELS 3
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define ENABLE_GAME_LAYER
|
#define ENABLE_GAME_LAYER
|
||||||
|
|
||||||
#define TEMPLATE( \
|
#define TEMPLATE( \
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define ENABLE_GAME_LAYER
|
#define ENABLE_GAME_LAYER
|
||||||
|
|
||||||
#define TEMPLATE( \
|
#define TEMPLATE( \
|
||||||
|
|
|
@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef KEYMAP_CONFIG_H
|
#pragma once
|
||||||
#define KEYMAP_CONFIG_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#ifndef RGB_DI_PIN
|
#ifndef RGB_DI_PIN
|
||||||
#define RGB_DI_PIN F4
|
#define RGB_DI_PIN F4
|
||||||
|
@ -28,5 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -22,7 +22,5 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef TAPPING_TERM
|
#undef TAPPING_TERM
|
||||||
#define TAPPING_TERM 200
|
#define TAPPING_TERM 200
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
#pragma once
|
||||||
|
|
||||||
#undef TAPPING_TERM
|
#undef TAPPING_TERM
|
||||||
#define TAPPING_TERM 300 //At 500 some bad logic takes hold
|
#define TAPPING_TERM 300 //At 500 some bad logic takes hold
|
||||||
|
|
|
@ -1,12 +1,7 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* using UK layout for space-cadet-shift */
|
/* using UK layout for space-cadet-shift */
|
||||||
#define LSPO_KEY KC_9
|
#define LSPO_KEY KC_9
|
||||||
#define RSPC_KEY KC_0
|
#define RSPC_KEY KC_0
|
||||||
|
|
||||||
#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
|
#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#ifndef CONFIG_ALGERNON_H
|
#pragma once
|
||||||
#define CONFIG_ALGERNON_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef MOUSEKEY_TIME_TO_MAX
|
#undef MOUSEKEY_TIME_TO_MAX
|
||||||
#undef MOUSEKEY_MAX_SPEED
|
#undef MOUSEKEY_MAX_SPEED
|
||||||
|
@ -23,5 +20,3 @@
|
||||||
|
|
||||||
#undef LEADER_TIMEOUT
|
#undef LEADER_TIMEOUT
|
||||||
#define LEADER_TIMEOUT 1000
|
#define LEADER_TIMEOUT 1000
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#ifndef CONFIG_BERFARAH_H
|
#pragma once
|
||||||
#define CONFIG_BERFARAH_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef TAPPING_TERM
|
#undef TAPPING_TERM
|
||||||
#define TAPPING_TERM 150
|
#define TAPPING_TERM 150
|
||||||
|
@ -10,4 +7,3 @@
|
||||||
#define RGBLIGHT_EFFECT_BREATHE_MAX 150
|
#define RGBLIGHT_EFFECT_BREATHE_MAX 150
|
||||||
|
|
||||||
#undef IGNORE_MOD_TAP_INTERRUPT
|
#undef IGNORE_MOD_TAP_INTERRUPT
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// Reference: https://beta.docs.qmk.fm/reference/config-options
|
// Reference: https://beta.docs.qmk.fm/reference/config-options
|
||||||
// and https://github.com/qmk/qmk_firmware/blob/master/docs/config_options.md
|
// and https://github.com/qmk/qmk_firmware/blob/master/docs/config_options.md
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
#pragma once
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* ws2812 RGB LED */
|
/* ws2812 RGB LED */
|
||||||
#define RGB_DI_PIN D7
|
#define RGB_DI_PIN D7
|
||||||
|
@ -13,5 +10,3 @@
|
||||||
|
|
||||||
#define RGB_MIDI
|
#define RGB_MIDI
|
||||||
#define RGBW_BB_TWI
|
#define RGBW_BB_TWI
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,11 +1,6 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define FORCE_NKRO
|
#define FORCE_NKRO
|
||||||
|
|
||||||
#undef TAPPING_TERM
|
#undef TAPPING_TERM
|
||||||
#undef IGNORE_MOD_TAP_INTERRUPT
|
#undef IGNORE_MOD_TAP_INTERRUPT
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H 1
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef LOCKING_SUPPORT_ENABLE
|
#undef LOCKING_SUPPORT_ENABLE
|
||||||
#undef LOCKING_RESYNC_ENABLE
|
#undef LOCKING_RESYNC_ENABLE
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -16,10 +16,8 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_H
|
#pragma once
|
||||||
#define CONFIG_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
/*
|
/*
|
||||||
* Feature disable options
|
* Feature disable options
|
||||||
* These options are also useful to firmware size reduction.
|
* These options are also useful to firmware size reduction.
|
||||||
|
@ -40,5 +38,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
//#define DEBUG_MATRIX_SCAN_RATE
|
//#define DEBUG_MATRIX_SCAN_RATE
|
||||||
#define ONESHOT_TAP_TOGGLE 2
|
#define ONESHOT_TAP_TOGGLE 2
|
||||||
#define ONESHOT_TIMEOUT 3000
|
#define ONESHOT_TIMEOUT 3000
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#ifndef NO_DEBUG
|
#ifndef NO_DEBUG
|
||||||
#define NO_DEBUG
|
#define NO_DEBUG
|
||||||
|
@ -9,5 +6,3 @@
|
||||||
#ifndef NO_PRINT
|
#ifndef NO_PRINT
|
||||||
#define NO_PRINT
|
#define NO_PRINT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
|
#pragma once
|
||||||
#define KEYBOARDS_ERGODOX_CONFIG_H_
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#undef MOUSEKEY_DELAY
|
#undef MOUSEKEY_DELAY
|
||||||
#undef MOUSEKEY_INTERVAL
|
#undef MOUSEKEY_INTERVAL
|
||||||
|
@ -31,5 +28,3 @@
|
||||||
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
|
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
|
||||||
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
|
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
|
||||||
)
|
)
|
||||||
|
|
||||||
#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
|
|
||||||
|
|
|
@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
// #define _MASTER_RIGHT
|
// #define _MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
#endif
|
|
|
@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
// #define _MASTER_RIGHT
|
// #define _MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
#endif
|
|
|
@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_USER_H
|
#pragma once
|
||||||
#define CONFIG_USER_H
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
/* Use I2C or Serial, not both */
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MASTER_LEFT
|
#define MASTER_LEFT
|
||||||
// #define _MASTER_RIGHT
|
// #define _MASTER_RIGHT
|
||||||
// #define EE_HANDS
|
// #define EE_HANDS
|
||||||
|
|
||||||
#endif
|
|
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include QMK_KEYBOARD_CONFIG_H
|
|
||||||
|
|
||||||
#define ENABLE_GAME_LAYER
|
#define ENABLE_GAME_LAYER
|
||||||
|
|
||||||
#define TEMPLATE_TKL(\
|
#define TEMPLATE_TKL(\
|
||||||
|
|
Loading…
Reference in a new issue