summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keyboards/gboards/butterstick/butterstick.c (renamed from keyboards/butterstick/butterstick.c)0
-rw-r--r--keyboards/gboards/butterstick/butterstick.h (renamed from keyboards/butterstick/butterstick.h)0
-rw-r--r--keyboards/gboards/butterstick/config.h (renamed from keyboards/butterstick/config.h)0
-rw-r--r--keyboards/gboards/butterstick/info.json (renamed from keyboards/butterstick/info.json)0
-rw-r--r--keyboards/gboards/butterstick/keymaps/default/keymap.c (renamed from keyboards/butterstick/keymaps/default/keymap.c)0
-rw-r--r--keyboards/gboards/butterstick/keymaps/dennytom/README.md (renamed from keyboards/butterstick/keymaps/dennytom/README.md)0
-rw-r--r--keyboards/gboards/butterstick/keymaps/dennytom/keymap.c (renamed from keyboards/butterstick/keymaps/dennytom/keymap.c)0
-rw-r--r--keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json (renamed from keyboards/butterstick/keymaps/dennytom/keymap_def.json)0
-rw-r--r--keyboards/gboards/butterstick/keymaps/dennytom/rules.mk (renamed from keyboards/butterstick/keymaps/dennytom/rules.mk)0
-rw-r--r--keyboards/gboards/butterstick/readme.md (renamed from keyboards/butterstick/readme.md)2
-rw-r--r--keyboards/gboards/butterstick/rules.mk (renamed from keyboards/butterstick/rules.mk)0
-rw-r--r--keyboards/gboards/butterstick/sten.c (renamed from keyboards/butterstick/sten.c)0
-rw-r--r--keyboards/gboards/butterstick/sten.h (renamed from keyboards/butterstick/sten.h)0
-rw-r--r--keyboards/gboards/ergotaco/config.h (renamed from keyboards/ergotaco/config.h)0
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.c (renamed from keyboards/ergotaco/ergotaco.c)0
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.h (renamed from keyboards/ergotaco/ergotaco.h)0
-rw-r--r--keyboards/gboards/ergotaco/info.json (renamed from keyboards/ergotaco/info.json)0
-rw-r--r--keyboards/gboards/ergotaco/keymaps/default/keymap.c (renamed from keyboards/ergotaco/keymaps/default/keymap.c)0
-rw-r--r--keyboards/gboards/ergotaco/keymaps/default/readme.md (renamed from keyboards/ergotaco/keymaps/default/readme.md)2
-rw-r--r--keyboards/gboards/ergotaco/keymaps/default/rules.mk (renamed from keyboards/ergotaco/keymaps/default/rules.mk)0
-rw-r--r--keyboards/gboards/ergotaco/matrix.c (renamed from keyboards/ergotaco/matrix.c)0
-rw-r--r--keyboards/gboards/ergotaco/post_rules.mk (renamed from keyboards/ergotaco/post_rules.mk)0
-rw-r--r--keyboards/gboards/ergotaco/readme.md (renamed from keyboards/ergotaco/readme.md)4
-rw-r--r--keyboards/gboards/ergotaco/rules.mk (renamed from keyboards/ergotaco/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/config.h (renamed from keyboards/georgi/config.h)0
-rw-r--r--keyboards/gboards/georgi/georgi.c (renamed from keyboards/georgi/georgi.c)0
-rw-r--r--keyboards/gboards/georgi/georgi.h (renamed from keyboards/georgi/georgi.h)0
-rw-r--r--keyboards/gboards/georgi/info.json (renamed from keyboards/georgi/info.json)0
-rw-r--r--keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c (renamed from keyboards/georgi/keymaps/colemak-dh/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/colemak-dh/readme.md (renamed from keyboards/georgi/keymaps/colemak-dh/readme.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk (renamed from keyboards/georgi/keymaps/colemak-dh/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default-flipped/keymap.c (renamed from keyboards/georgi/keymaps/default-flipped/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default-flipped/readme.md (renamed from keyboards/georgi/keymaps/default-flipped/readme.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default-flipped/rules.mk (renamed from keyboards/georgi/keymaps/default-flipped/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default/keymap.c (renamed from keyboards/georgi/keymaps/default/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default/readme.md (renamed from keyboards/georgi/keymaps/default/readme.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/default/rules.mk (renamed from keyboards/georgi/keymaps/default/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/keymaps/dennytom/README.md (renamed from keyboards/georgi/keymaps/dennytom/README.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/dennytom/keymap.c (renamed from keyboards/georgi/keymaps/dennytom/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json (renamed from keyboards/georgi/keymaps/dennytom/keymap_def.json)0
-rw-r--r--keyboards/gboards/georgi/keymaps/dennytom/rules.mk (renamed from keyboards/georgi/keymaps/dennytom/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/keymaps/minimal/keymap.c (renamed from keyboards/georgi/keymaps/minimal/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/minimal/readme.md (renamed from keyboards/georgi/keymaps/minimal/readme.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/minimal/rules.mk (renamed from keyboards/georgi/keymaps/minimal/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/keymaps/norman/keymap.c (renamed from keyboards/georgi/keymaps/norman/keymap.c)0
-rw-r--r--keyboards/gboards/georgi/keymaps/norman/readme.md (renamed from keyboards/georgi/keymaps/norman/readme.md)0
-rw-r--r--keyboards/gboards/georgi/keymaps/norman/rules.mk (renamed from keyboards/georgi/keymaps/norman/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/matrix.c (renamed from keyboards/georgi/matrix.c)0
-rw-r--r--keyboards/gboards/georgi/readme.md (renamed from keyboards/georgi/readme.md)6
-rw-r--r--keyboards/gboards/georgi/rules.mk (renamed from keyboards/georgi/rules.mk)0
-rw-r--r--keyboards/gboards/georgi/sten.c (renamed from keyboards/georgi/sten.c)0
-rw-r--r--keyboards/gboards/georgi/sten.h (renamed from keyboards/georgi/sten.h)0
-rw-r--r--keyboards/gboards/gergo/config.h (renamed from keyboards/gergo/config.h)0
-rw-r--r--keyboards/gboards/gergo/gergo.c (renamed from keyboards/gergo/gergo.c)0
-rw-r--r--keyboards/gboards/gergo/gergo.h (renamed from keyboards/gergo/gergo.h)0
-rw-r--r--keyboards/gboards/gergo/info.json (renamed from keyboards/gergo/info.json)0
-rw-r--r--keyboards/gboards/gergo/keymaps/abstractkb/config.h (renamed from keyboards/gergo/keymaps/abstractkb/config.h)0
-rw-r--r--keyboards/gboards/gergo/keymaps/abstractkb/keymap.c (renamed from keyboards/gergo/keymaps/abstractkb/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/abstractkb/readme.md (renamed from keyboards/gergo/keymaps/abstractkb/readme.md)2
-rw-r--r--keyboards/gboards/gergo/keymaps/abstractkb/rules.mk (renamed from keyboards/gergo/keymaps/abstractkb/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/keymap.c (renamed from keyboards/gergo/keymaps/colemak/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/readme.md (renamed from keyboards/gergo/keymaps/colemak/readme.md)2
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/rules.mk (renamed from keyboards/gergo/keymaps/colemak/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/default/config.h (renamed from keyboards/gergo/keymaps/default/config.h)0
-rw-r--r--keyboards/gboards/gergo/keymaps/default/keymap.c (renamed from keyboards/gergo/keymaps/default/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/default/readme.md (renamed from keyboards/gergo/keymaps/germ/readme.md)2
-rw-r--r--keyboards/gboards/gergo/keymaps/default/rules.mk (renamed from keyboards/gergo/keymaps/default/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/drashna/keymap.c (renamed from keyboards/gergo/keymaps/drashna/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/drashna/rules.mk (renamed from keyboards/gergo/keymaps/drashna/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/config.h (renamed from keyboards/gergo/keymaps/germ/config.h)0
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/keymap.c (renamed from keyboards/gergo/keymaps/germ/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/readme.md (renamed from keyboards/gergo/keymaps/oled/readme.md)2
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/rules.mk (renamed from keyboards/gergo/keymaps/germ/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/gotham/config.h (renamed from keyboards/gergo/keymaps/gotham/config.h)0
-rw-r--r--keyboards/gboards/gergo/keymaps/gotham/keymap.c (renamed from keyboards/gergo/keymaps/gotham/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/gotham/readme.md (renamed from keyboards/gergo/keymaps/gotham/readme.md)0
-rw-r--r--keyboards/gboards/gergo/keymaps/gotham/rules.mk (renamed from keyboards/gergo/keymaps/gotham/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h (renamed from keyboards/gergo/keymaps/manna-harbour_miryoku/config.h)0
-rw-r--r--keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c (renamed from keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/config.h4
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/glcdfont.c (renamed from keyboards/gergo/keymaps/oled/glcdfont.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/keymap.c (renamed from keyboards/gergo/keymaps/oled/keymap.c)0
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/readme.md (renamed from keyboards/gergo/keymaps/default/readme.md)2
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/rules.mk (renamed from keyboards/gergo/keymaps/oled/rules.mk)0
-rw-r--r--keyboards/gboards/gergo/matrix.c (renamed from keyboards/gergo/matrix.c)0
-rw-r--r--keyboards/gboards/gergo/readme.md (renamed from keyboards/gergo/readme.md)6
-rw-r--r--keyboards/gboards/gergo/rules.mk (renamed from keyboards/gergo/rules.mk)0
-rw-r--r--keyboards/gboards/readme.md6
-rw-r--r--keyboards/gergo/keymaps/oled/config.h4
89 files changed, 22 insertions, 22 deletions
diff --git a/keyboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
index 3bcbcbe8b4..3bcbcbe8b4 100644
--- a/keyboards/butterstick/butterstick.c
+++ b/keyboards/gboards/butterstick/butterstick.c
diff --git a/keyboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
index f97488c3f5..f97488c3f5 100644
--- a/keyboards/butterstick/butterstick.h
+++ b/keyboards/gboards/butterstick/butterstick.h
diff --git a/keyboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 69632cd4f7..69632cd4f7 100644
--- a/keyboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
diff --git a/keyboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 6bfd58e594..6bfd58e594 100644
--- a/keyboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
diff --git a/keyboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
index 749e9ba071..749e9ba071 100644
--- a/keyboards/butterstick/keymaps/default/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/default/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/README.md b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
index a75bcc7506..a75bcc7506 100644
--- a/keyboards/butterstick/keymaps/dennytom/README.md
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
index bfe0aa2153..bfe0aa2153 100644
--- a/keyboards/butterstick/keymaps/dennytom/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap_def.json b/keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
index 16f02ca529..16f02ca529 100644
--- a/keyboards/butterstick/keymaps/dennytom/keymap_def.json
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/butterstick/keymaps/dennytom/rules.mk b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
index 1155f72c04..1155f72c04 100644
--- a/keyboards/butterstick/keymaps/dennytom/rules.mk
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
diff --git a/keyboards/butterstick/readme.md b/keyboards/gboards/butterstick/readme.md
index 8bae8ba5a0..37e9375d88 100644
--- a/keyboards/butterstick/readme.md
+++ b/keyboards/gboards/butterstick/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butte
Make example for this keyboard (after setting up your build environment):
- make butterstick:default
+ make gboards/butterstick:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
index 4229aa7eec..4229aa7eec 100644
--- a/keyboards/butterstick/rules.mk
+++ b/keyboards/gboards/butterstick/rules.mk
diff --git a/keyboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
index 197abaf92f..197abaf92f 100644
--- a/keyboards/butterstick/sten.c
+++ b/keyboards/gboards/butterstick/sten.c
diff --git a/keyboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 0d5c58df21..0d5c58df21 100644
--- a/keyboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
diff --git a/keyboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index d415e77dc6..d415e77dc6 100644
--- a/keyboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..ecab74b3a2 100644
--- a/keyboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index 5a0cd5e8fb..5a0cd5e8fb 100644
--- a/keyboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
diff --git a/keyboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index e7794e6ee3..e7794e6ee3 100644
--- a/keyboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
index 8de5ea6371..8de5ea6371 100644
--- a/keyboards/ergotaco/keymaps/default/keymap.c
+++ b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
diff --git a/keyboards/ergotaco/keymaps/default/readme.md b/keyboards/gboards/ergotaco/keymaps/default/readme.md
index 653f3774ea..d9c7c1601f 100644
--- a/keyboards/ergotaco/keymaps/default/readme.md
+++ b/keyboards/gboards/ergotaco/keymaps/default/readme.md
@@ -1,6 +1,6 @@
This is the default keymap for the ErgoTaco, Make it your own!
## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/ergotaco/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/ergotaco/keymaps/default/rules.mk
Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/ergotaco/keymaps/default/rules.mk b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
index 870d047dc9..870d047dc9 100644
--- a/keyboards/ergotaco/keymaps/default/rules.mk
+++ b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 16300a7e4f..16300a7e4f 100644
--- a/keyboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/gboards/ergotaco/post_rules.mk
index 0db3171b33..0db3171b33 100644
--- a/keyboards/ergotaco/post_rules.mk
+++ b/keyboards/gboards/ergotaco/post_rules.mk
diff --git a/keyboards/ergotaco/readme.md b/keyboards/gboards/ergotaco/readme.md
index 40077e2a8d..dc9db3bb64 100644
--- a/keyboards/ergotaco/readme.md
+++ b/keyboards/gboards/ergotaco/readme.md
@@ -11,13 +11,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
## Firmware building
Clone the QMK Repo and install dfu-programmer, flash with:
- make ergotaco:default:dfu
+ make gboards/ergotaco:default:dfu
And reset your keyboard!
To just test if your build system is sane, try compiling the default keymap using:
- make ergotaco:default
+ make gboards/ergotaco:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index db236477b0..db236477b0 100644
--- a/keyboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
diff --git a/keyboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 5cd2f1620e..5cd2f1620e 100644
--- a/keyboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
diff --git a/keyboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..8866886ce7 100644
--- a/keyboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
diff --git a/keyboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
index e5a52c585d..e5a52c585d 100644
--- a/keyboards/georgi/georgi.h
+++ b/keyboards/gboards/georgi/georgi.h
diff --git a/keyboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 89d2cd883f..89d2cd883f 100644
--- a/keyboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
diff --git a/keyboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index 29b35f6abd..29b35f6abd 100644
--- a/keyboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
diff --git a/keyboards/georgi/keymaps/colemak-dh/readme.md b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
index f9da34b024..f9da34b024 100644
--- a/