From fdb81678f8edfe198548062417d25125dae1e7f9 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Sun, 22 Sep 2024 18:20:51 +0200 Subject: [PATCH] use qmk userspac as described here: https://docs.qmk.fm/newbs_external_userspace --- .gitignore | 1 + README.md | 8 +++++--- .../crkbd/keymaps/christoph-cullmann}/config.h | 2 +- .../crkbd/keymaps/christoph-cullmann}/keymap.c | 2 +- .../crkbd/keymaps/christoph-cullmann}/rules.mk | 3 ++- .../planck/keymaps/christoph-cullmann}/config.h | 2 +- .../planck/keymaps/christoph-cullmann}/keymap.c | 2 +- .../planck/keymaps/christoph-cullmann}/rules.mk | 3 ++- qmk.json | 4 ++++ common/rules.mk => rules.mk | 2 +- 10 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .gitignore rename {crkbd => keyboards/crkbd/keymaps/christoph-cullmann}/config.h (76%) rename {crkbd => keyboards/crkbd/keymaps/christoph-cullmann}/keymap.c (97%) rename {crkbd => keyboards/crkbd/keymaps/christoph-cullmann}/rules.mk (55%) rename {planck => keyboards/planck/keymaps/christoph-cullmann}/config.h (81%) rename {planck => keyboards/planck/keymaps/christoph-cullmann}/keymap.c (97%) rename {planck => keyboards/planck/keymaps/christoph-cullmann}/rules.mk (59%) create mode 100644 qmk.json rename common/rules.mk => rules.mk (81%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a8a0dce --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.bin diff --git a/README.md b/README.md index 27d019f..34a6c16 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,13 @@ Layout with 42 keys based on Miryoku, using Dhorf as base layer: LH/RH: 48.52% | 51.48% -ATM this needs to be cloned to +# How to use -/home/cullmann/data/qmk/christoph-cullmann +You need to have a locally setup QMK and use this repo as overlay: -to work properly. + qmk config user.overlay_dir="/home/cullmann/data/qmk/christoph-cullmann" + +# Foundation Based on ideas and code from: diff --git a/crkbd/config.h b/keyboards/crkbd/keymaps/christoph-cullmann/config.h similarity index 76% rename from crkbd/config.h rename to keyboards/crkbd/keymaps/christoph-cullmann/config.h index 100d602..d4d52a1 100644 --- a/crkbd/config.h +++ b/keyboards/crkbd/keymaps/christoph-cullmann/config.h @@ -6,7 +6,7 @@ #pragma once // our shared config parts -#include "/home/cullmann/data/qmk/christoph-cullmann/common/config.h" +#include "common/config.h" // select hand configuration #define SPLIT_USB_DETECT diff --git a/crkbd/keymap.c b/keyboards/crkbd/keymaps/christoph-cullmann/keymap.c similarity index 97% rename from crkbd/keymap.c rename to keyboards/crkbd/keymaps/christoph-cullmann/keymap.c index 74ef914..5eb2dd0 100644 --- a/crkbd/keymap.c +++ b/keyboards/crkbd/keymaps/christoph-cullmann/keymap.c @@ -27,4 +27,4 @@ K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35 ) // our shared 42 keys keymap -#include "../common/keymap.h" +#include "common/keymap.h" diff --git a/crkbd/rules.mk b/keyboards/crkbd/keymaps/christoph-cullmann/rules.mk similarity index 55% rename from crkbd/rules.mk rename to keyboards/crkbd/keymaps/christoph-cullmann/rules.mk index afa0b4c..3dc89b5 100644 --- a/crkbd/rules.mk +++ b/keyboards/crkbd/keymaps/christoph-cullmann/rules.mk @@ -1,5 +1,6 @@ # include common settings -include /home/cullmann/data/qmk/christoph-cullmann/common/rules.mk +ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) +include ${ROOT_DIR}../../../../rules.mk # build # qmk compile -kb crkbd -km christoph-cullmann diff --git a/planck/config.h b/keyboards/planck/keymaps/christoph-cullmann/config.h similarity index 81% rename from planck/config.h rename to keyboards/planck/keymaps/christoph-cullmann/config.h index e1a1763..e108bc0 100644 --- a/planck/config.h +++ b/keyboards/planck/keymaps/christoph-cullmann/config.h @@ -6,7 +6,7 @@ #pragma once // our shared config parts -#include "/home/cullmann/data/qmk/christoph-cullmann/common/config.h" +#include "common/config.h" // // audio configuration diff --git a/planck/keymap.c b/keyboards/planck/keymaps/christoph-cullmann/keymap.c similarity index 97% rename from planck/keymap.c rename to keyboards/planck/keymaps/christoph-cullmann/keymap.c index 854537b..2a6327d 100644 --- a/planck/keymap.c +++ b/keyboards/planck/keymaps/christoph-cullmann/keymap.c @@ -27,4 +27,4 @@ KC_NO, KC_NO, KC_NO, K36, K37, K38, K39, K40, K41, KC_NO, KC_NO, KC_ ) // our shared 42 keys keymap -#include "../common/keymap.h" +#include "common/keymap.h" diff --git a/planck/rules.mk b/keyboards/planck/keymaps/christoph-cullmann/rules.mk similarity index 59% rename from planck/rules.mk rename to keyboards/planck/keymaps/christoph-cullmann/rules.mk index 10b2e8d..518fb3a 100644 --- a/planck/rules.mk +++ b/keyboards/planck/keymaps/christoph-cullmann/rules.mk @@ -1,5 +1,6 @@ # include common settings -include /home/cullmann/data/qmk/christoph-cullmann/common/rules.mk +ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) +include ${ROOT_DIR}../../../../rules.mk # build # qmk compile -kb planck/rev6_drop -km christoph-cullmann diff --git a/qmk.json b/qmk.json new file mode 100644 index 0000000..3afc389 --- /dev/null +++ b/qmk.json @@ -0,0 +1,4 @@ +{ + "userspace_version": "1.0", + "build_targets": [] +} \ No newline at end of file diff --git a/common/rules.mk b/rules.mk similarity index 81% rename from common/rules.mk rename to rules.mk index 6854485..5567d2f 100644 --- a/common/rules.mk +++ b/rules.mk @@ -11,7 +11,7 @@ MUSIC_ENABLE = no SPACE_CADET_ENABLE = no # add achordion to improve home row modifiers -SRC += /home/cullmann/data/qmk/christoph-cullmann/common/achordion.c +SRC += common/achordion.c # good optimizations LTO_ENABLE = yes