summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-05-09 21:37:04 -0700
committerJack Humbert <jack.humb@gmail.com>2018-05-10 00:37:04 -0400
commitc5264d6d89899f19bdeeaf9e2daeb90531617a48 (patch)
tree8f3862554b76a24766df6addfc1009a719d722a8
parent5346cb2d20100f2bbf35e8c8107ae272404f2198 (diff)
Move ckeys workshop to its own directory (#2928)0.6.31
* 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.md9
17 files changed, 17 insertions, 6 deletions
diff --git a/keyboards/nakey/config.h b/keyboards/ckeys/nakey/config.h
index 38fed297ef..38fed297ef 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 b44d0daf74..b44d0daf74 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 ebbb128bd2..ebbb128bd2 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 c842dc99a7..c842dc99a7 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 ba2fb90ebe..ba2fb90ebe 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 3cbfda844d..3cbfda844d 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 62688c1aeb..c7250cf506 100644
--- a/keyboards/nakey/readme.md
+++ b/keyboards/ckeys/nakey/readme.md
@@ -6,9 +6,11 @@ Keyboard Maintainer: [James Underwood](https://github.com/ju0)
Hardware Supported: naKey
Hardware Availability: [ckeys.org](https://ckeys.org)
+To build this keyboard, follow the [build guide](https://ckeys.org/tutorials/nakey-numpad-build-guide/).
+
Make example for this keyboard (after setting up your build environment):
- make nakey:default
+ make ckeys/nakey:default
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.
@@ -18,7 +20,7 @@ For the full Quantum feature list, see [the parent readme](/).
## Building
-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.
+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.
(Note: replace naKey with the name of your keyboard.)
@@ -26,7 +28,7 @@ Depending on which keymap you would like to use, you will have to compile slight
### Default
-To build with the default keymap, simply run `make naKey-default`.
+To build with the default keymap, simply run `make ckeys/nakey:default`.
### Other Keymaps
diff --git a/keyboards/nakey/rules.mk b/keyboards/ckeys/nakey/rules.mk
index a3571e8deb..a3571e8deb 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 a1451c1420..a1451c1420 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 04bf9f4a9d..04bf9f4a9d 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 a9b15e9347..a9b15e9347 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 bac51fc043..bac51fc043 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 2905f0724d..2905f0724d 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 8444be897c..8444be897c 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 a9d67b00e8..6767956bf9 100644
--- a/keyboards/obelus/readme.md
+++ b/keyboards/ckeys/obelus/readme.md
@@ -5,15 +5,15 @@ Obelus
Keyboard Maintaintainers: [Ethan Madden](https://github.com/jetpacktuxedo), [James Underwood](https://github.com/ju0)
Hardware Supported: Obelus
-Hardware Availability: C-Keys soldering workshops, /u/MonkeyPlusPlus
+Hardware Availability: [C-Keys soldering workshops](https://ckeys.org/workshops/), [/u/MonkeyPlusPlus](https://www.reddit.com/user/monkeyplusplus)
Make example for this keyboard (after setting up your build environment):
- make obelus:default
+ make ckeys/obelus:default
Or to make and flash:
- make obelus:default:dfu
+ make ckeys/obelus:default:dfu
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.
diff --git a/keyboards/obelus/rules.mk b/keyboards/ckeys/obelus/rules.mk
index d999b118cb..d999b118cb 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 0000000000..01991d9e3f
--- /dev/null
+++ b/keyboards/ckeys/readme.md
@@ -0,0 +1,9 @@
+# Ckeys.org
+
+[ckeys](https://ckeys.org/) is a mechanical keyboard based non profit, located in Seattle, Washington.
+
+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.
+
+* Supported Hardware
+ * The Obelus - 4x4 Macropad
+ * naKey - Through hole numpad \ No newline at end of file