From 504f362d9667644d21358dfdbcc27dbec66552f1 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Tue, 3 Oct 2023 15:30:08 +0200 Subject: [PATCH] share more code --- README.md | 7 +++++++ common/config.h | 2 +- common/rules.mk | 14 ++++++++++++++ ferris/config.h | 2 +- ferris/rules.mk | 24 ++---------------------- planck/config.h | 2 +- planck/rules.mk | 24 ++---------------------- totem/keymaps/default/config.h | 2 +- totem/keymaps/default/rules.mk | 21 ++------------------- 9 files changed, 31 insertions(+), 67 deletions(-) create mode 100644 common/rules.mk diff --git a/README.md b/README.md index f718882..c396847 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,10 @@ Layout with 34 keys, using Canary with thumb e hack: LH/RH: 42.13% | 57.87% The ; in the layout is used to switch to some magic layer. + +ATM this needs to be cloned to + +/home/cullmann/install/qmk/christoph-cullmann + +to work properly. + diff --git a/common/config.h b/common/config.h index aa3d506..13f1234 100644 --- a/common/config.h +++ b/common/config.h @@ -30,7 +30,7 @@ // details see https://precondition.github.io/home-row-mods // the default is 200 -#define TAPPING_TERM 180 +#define TAPPING_TERM 175 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/common/rules.mk b/common/rules.mk new file mode 100644 index 0000000..904762d --- /dev/null +++ b/common/rules.mk @@ -0,0 +1,14 @@ +# allow to use 'qmk console' +CONSOLE_ENABLE = yes + +# Enable N-Key Rollover +NKRO_ENABLE = yes + +# less features we don't use +MOUSEKEY_ENABLE = no +SPACE_CADET_ENABLE = no +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no + +# add achordion to improve home row modifiers +SRC += /home/cullmann/install/qmk/christoph-cullmann/common/achordion.c diff --git a/ferris/config.h b/ferris/config.h index 43102bc..a5fb86f 100644 --- a/ferris/config.h +++ b/ferris/config.h @@ -17,4 +17,4 @@ #pragma once // our shared config parts -#include "../common/config.h" +#include "/home/cullmann/install/qmk/christoph-cullmann/common/config.h" diff --git a/ferris/rules.mk b/ferris/rules.mk index ec9f4d7..c3dd5b4 100644 --- a/ferris/rules.mk +++ b/ferris/rules.mk @@ -1,25 +1,5 @@ -# properly optimize -LTO_ENABLE = yes - -# less debugging features -COMMAND_ENABLE = no -CONSOLE_ENABLE = no - -# Enable N-Key Rollover -NKRO_ENABLE = yes - -# less features we don't use -MOUSEKEY_ENABLE = no -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no - -# more responsive debouncing: https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ -# sym_eager_pk does do some key chatter -DEBOUNCE_TYPE = asym_eager_defer_pk - -# add achordion to improve home row modifiers -SRC += ../common/achordion.c +# include common settings +include /home/cullmann/install/qmk/christoph-cullmann/common/rules.mk # build # qmk compile -kb ferris/sweep -km christoph-cullmann diff --git a/planck/config.h b/planck/config.h index 7251c32..f4f79ac 100644 --- a/planck/config.h +++ b/planck/config.h @@ -17,7 +17,7 @@ #pragma once // our shared config parts -#include "../common/config.h" +#include "/home/cullmann/install/qmk/christoph-cullmann/common/config.h" // // audio configuration diff --git a/planck/rules.mk b/planck/rules.mk index a4b924b..353d0ba 100644 --- a/planck/rules.mk +++ b/planck/rules.mk @@ -1,25 +1,5 @@ -# properly optimize -LTO_ENABLE = yes - -# less debugging features -COMMAND_ENABLE = no -CONSOLE_ENABLE = no - -# Enable N-Key Rollover -NKRO_ENABLE = yes - -# less features we don't use -MOUSEKEY_ENABLE = no -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no - -# more responsive debouncing: https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ -# sym_eager_pk does do some key chatter -DEBOUNCE_TYPE = asym_eager_defer_pk - -# add achordion to improve home row modifiers -SRC += ../common/achordion.c +# include common settings +include /home/cullmann/install/qmk/christoph-cullmann/common/rules.mk # build # qmk compile -kb planck/rev6_drop -km christoph-cullmann diff --git a/totem/keymaps/default/config.h b/totem/keymaps/default/config.h index 4a32f09..c901afc 100644 --- a/totem/keymaps/default/config.h +++ b/totem/keymaps/default/config.h @@ -1,7 +1,7 @@ #pragma once // our shared config parts -#include "../../../common/config.h" +#include "/home/cullmann/install/qmk/christoph-cullmann/common/config.h" // The way how "handedness" is decided (which half is which), see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness for more options. #define MASTER_LEFT diff --git a/totem/keymaps/default/rules.mk b/totem/keymaps/default/rules.mk index b0f1efe..33da88e 100644 --- a/totem/keymaps/default/rules.mk +++ b/totem/keymaps/default/rules.mk @@ -1,22 +1,5 @@ -# less debugging features -COMMAND_ENABLE = no -CONSOLE_ENABLE = no - -# Enable N-Key Rollover -NKRO_ENABLE = yes - -# less features we don't use -MOUSEKEY_ENABLE = no -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no - -# more responsive debouncing: https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ -# sym_eager_pk does do some key chatter -DEBOUNCE_TYPE = asym_eager_defer_pk - -# add achordion to improve home row modifiers -SRC += ../../../common/achordion.c +# include common settings +include /home/cullmann/install/qmk/christoph-cullmann/common/rules.mk # build # qmk compile -kb totem -km default