diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-05-09 21:37:04 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-05-10 00:37:04 -0400 |
| commit | c5264d6d89899f19bdeeaf9e2daeb90531617a48 (patch) | |
| tree | 8f3862554b76a24766df6addfc1009a719d722a8 | |
| parent | 5346cb2d20100f2bbf35e8c8107ae272404f2198 (diff) | |
| download | qmk_firmware-c5264d6d89899f19bdeeaf9e2daeb90531617a48.tar.gz qmk_firmware-c5264d6d89899f19bdeeaf9e2daeb90531617a48.zip | |
Move ckeys workshop to its own directory (#2928)
* move obelus and nakey to ckeys directory
* delete the originals
* short readme about ckeys
* edit readmes to reflect new changes
* add build guide info..and here's me trying to retrigger the build job
| -rw-r--r-- | keyboards/ckeys/nakey/config.h (renamed from keyboards/nakey/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/info.json (renamed from keyboards/nakey/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/keymaps/default/keymap.c (renamed from keyboards/nakey/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/keymaps/default/readme.md (renamed from keyboards/nakey/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/nakey.c (renamed from keyboards/nakey/nakey.c) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/nakey.h (renamed from keyboards/nakey/nakey.h) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/readme.md (renamed from keyboards/nakey/readme.md) | 8 | ||||
| -rw-r--r-- | keyboards/ckeys/nakey/rules.mk (renamed from keyboards/nakey/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/config.h (renamed from keyboards/obelus/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/keymaps/default/config.h (renamed from keyboards/obelus/keymaps/default/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/keymaps/default/keymap.c (renamed from keyboards/obelus/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/keymaps/default/readme.md (renamed from keyboards/obelus/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/obelus.c (renamed from keyboards/obelus/obelus.c) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/obelus.h (renamed from keyboards/obelus/obelus.h) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/readme.md (renamed from keyboards/obelus/readme.md) | 6 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/rules.mk (renamed from keyboards/obelus/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ckeys/readme.md | 9 |
17 files changed, 17 insertions, 6 deletions
diff --git a/keyboards/nakey/config.h b/keyboards/ckeys/nakey/config.h index 38fed297e..38fed297e 100644 --- a/keyboards/nakey/config.h +++ b/keyboards/ckeys/nakey/config.h | |||
diff --git a/keyboards/nakey/info.json b/keyboards/ckeys/nakey/info.json index b44d0daf7..b44d0daf7 100644 --- a/keyboards/nakey/info.json +++ b/keyboards/ckeys/nakey/info.json | |||
diff --git a/keyboards/nakey/keymaps/default/keymap.c b/keyboards/ckeys/nakey/keymaps/default/keymap.c index ebbb128bd..ebbb128bd 100644 --- a/keyboards/nakey/keymaps/default/keymap.c +++ b/keyboards/ckeys/nakey/keymaps/default/keymap.c | |||
diff --git a/keyboards/nakey/keymaps/default/readme.md b/keyboards/ckeys/nakey/keymaps/default/readme.md index c842dc99a..c842dc99a 100644 --- a/keyboards/nakey/keymaps/default/readme.md +++ b/keyboards/ckeys/nakey/keymaps/default/readme.md | |||
diff --git a/keyboards/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c index ba2fb90eb..ba2fb90eb 100644 --- a/keyboards/nakey/nakey.c +++ b/keyboards/ckeys/nakey/nakey.c | |||
diff --git a/keyboards/nakey/nakey.h b/keyboards/ckeys/nakey/nakey.h index 3cbfda844..3cbfda844 100644 --- a/keyboards/nakey/nakey.h +++ b/keyboards/ckeys/nakey/nakey.h | |||
diff --git a/keyboards/nakey/readme.md b/keyboards/ckeys/nakey/readme.md index 62688c1ae..c7250cf50 100644 --- a/keyboards/nakey/readme.md +++ b/keyboards/ckeys/nakey/readme.md | |||
| @@ -6,9 +6,11 @@ Keyboard Maintainer: [James Underwood](https://github.com/ju0) | |||
| 6 | Hardware Supported: naKey | 6 | Hardware Supported: naKey |
| 7 | Hardware Availability: [ckeys.org](https://ckeys.org) | 7 | Hardware Availability: [ckeys.org](https://ckeys.org) |
| 8 | 8 | ||
| 9 | To build this keyboard, follow the [build guide](https://ckeys.org/tutorials/nakey-numpad-build-guide/). | ||
| 10 | |||
| 9 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
| 10 | 12 | ||
| 11 | make nakey:default | 13 | make ckeys/nakey:default |
| 12 | 14 | ||
| 13 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 15 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. |
| 14 | 16 | ||
| @@ -18,7 +20,7 @@ For the full Quantum feature list, see [the parent readme](/). | |||
| 18 | 20 | ||
| 19 | ## Building | 21 | ## Building |
| 20 | 22 | ||
| 21 | Download or clone the whole firmware and navigate to the root folder. Once your dev env is setup, you'll be able to type `make naKey-default` to generate your .hex - you can then use the Teensy Loader to program your .hex file. | 23 | Download or clone the whole firmware and navigate to the root folder. Once your dev env is setup, you'll be able to type `make ckeys/nakey:default` to generate your .hex - you can then use the Teensy Loader to program your .hex file. |
| 22 | 24 | ||
| 23 | (Note: replace naKey with the name of your keyboard.) | 25 | (Note: replace naKey with the name of your keyboard.) |
| 24 | 26 | ||
| @@ -26,7 +28,7 @@ Depending on which keymap you would like to use, you will have to compile slight | |||
| 26 | 28 | ||
| 27 | ### Default | 29 | ### Default |
| 28 | 30 | ||
| 29 | To build with the default keymap, simply run `make naKey-default`. | 31 | To build with the default keymap, simply run `make ckeys/nakey:default`. |
| 30 | 32 | ||
| 31 | ### Other Keymaps | 33 | ### Other Keymaps |
| 32 | 34 | ||
diff --git a/keyboards/nakey/rules.mk b/keyboards/ckeys/nakey/rules.mk index a3571e8de..a3571e8de 100644 --- a/keyboards/nakey/rules.mk +++ b/keyboards/ckeys/nakey/rules.mk | |||
diff --git a/keyboards/obelus/config.h b/keyboards/ckeys/obelus/config.h index a1451c142..a1451c142 100644 --- a/keyboards/obelus/config.h +++ b/keyboards/ckeys/obelus/config.h | |||
diff --git a/keyboards/obelus/keymaps/default/config.h b/keyboards/ckeys/obelus/keymaps/default/config.h index 04bf9f4a9..04bf9f4a9 100644 --- a/keyboards/obelus/keymaps/default/config.h +++ b/keyboards/ckeys/obelus/keymaps/default/config.h | |||
diff --git a/keyboards/obelus/keymaps/default/keymap.c b/keyboards/ckeys/obelus/keymaps/default/keymap.c index a9b15e934..a9b15e934 100644 --- a/keyboards/obelus/keymaps/default/keymap.c +++ b/keyboards/ckeys/obelus/keymaps/default/keymap.c | |||
diff --git a/keyboards/obelus/keymaps/default/readme.md b/keyboards/ckeys/obelus/keymaps/default/readme.md index bac51fc04..bac51fc04 100644 --- a/keyboards/obelus/keymaps/default/readme.md +++ b/keyboards/ckeys/obelus/keymaps/default/readme.md | |||
diff --git a/keyboards/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c index 2905f0724..2905f0724 100644 --- a/keyboards/obelus/obelus.c +++ b/keyboards/ckeys/obelus/obelus.c | |||
diff --git a/keyboards/obelus/obelus.h b/keyboards/ckeys/obelus/obelus.h index 8444be897..8444be897 100644 --- a/keyboards/obelus/obelus.h +++ b/keyboards/ckeys/obelus/obelus.h | |||
diff --git a/keyboards/obelus/readme.md b/keyboards/ckeys/obelus/readme.md index a9d67b00e..6767956bf 100644 --- a/keyboards/obelus/readme.md +++ b/keyboards/ckeys/obelus/readme.md | |||
| @@ -5,15 +5,15 @@ Obelus | |||
| 5 | 5 | ||
| 6 | Keyboard Maintaintainers: [Ethan Madden](https://github.com/jetpacktuxedo), [James Underwood](https://github.com/ju0) | 6 | Keyboard Maintaintainers: [Ethan Madden](https://github.com/jetpacktuxedo), [James Underwood](https://github.com/ju0) |
| 7 | Hardware Supported: Obelus | 7 | Hardware Supported: Obelus |
| 8 | Hardware Availability: C-Keys soldering workshops, /u/MonkeyPlusPlus | 8 | Hardware Availability: [C-Keys soldering workshops](https://ckeys.org/workshops/), [/u/MonkeyPlusPlus](https://www.reddit.com/user/monkeyplusplus) |
| 9 | 9 | ||
| 10 | Make example for this keyboard (after setting up your build environment): | 10 | Make example for this keyboard (after setting up your build environment): |
| 11 | 11 | ||
| 12 | make obelus:default | 12 | make ckeys/obelus:default |
| 13 | 13 | ||
| 14 | Or to make and flash: | 14 | Or to make and flash: |
| 15 | 15 | ||
| 16 | make obelus:default:dfu | 16 | make ckeys/obelus:default:dfu |
| 17 | 17 | ||
| 18 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) and [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 18 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) and [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. |
| 19 | 19 | ||
diff --git a/keyboards/obelus/rules.mk b/keyboards/ckeys/obelus/rules.mk index d999b118c..d999b118c 100644 --- a/keyboards/obelus/rules.mk +++ b/keyboards/ckeys/obelus/rules.mk | |||
diff --git a/keyboards/ckeys/readme.md b/keyboards/ckeys/readme.md new file mode 100644 index 000000000..01991d9e3 --- /dev/null +++ b/keyboards/ckeys/readme.md | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | # Ckeys.org | ||
| 2 | |||
| 3 | [ckeys](https://ckeys.org/) is a mechanical keyboard based non profit, located in Seattle, Washington. | ||
| 4 | |||
| 5 | In addition, to hosting the [Seattle Mechanical Keyboard Meetups](https://ckeys.org/events/), they have [soldering workshops](https://ckeys.org/workshops/) featuring hardware hosted in this repository. | ||
| 6 | |||
| 7 | * Supported Hardware | ||
| 8 | * The Obelus - 4x4 Macropad | ||
| 9 | * naKey - Through hole numpad \ No newline at end of file | ||
