From 81164c1663fbf155233475dfd23b324ccd53b46e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 28 Nov 2020 16:59:25 -0800
Subject: Cozykeys Speedo Configurator fix (#11058)
* Cozykeys Speedo Configurator fix
Outgoing codebase worked when compiled locally, but not from QMK Configurator because its API requires an exact directory structure.
* fix make commands in the readme
---
keyboards/cozykeys/speedo/readme.md | 6 ++++--
keyboards/cozykeys/speedo/speedo.h | 4 ++--
keyboards/cozykeys/speedo/v2/speedo_v2.c | 17 ---------------
keyboards/cozykeys/speedo/v2/speedo_v2.h | 36 --------------------------------
keyboards/cozykeys/speedo/v2/v2.c | 17 +++++++++++++++
keyboards/cozykeys/speedo/v2/v2.h | 36 ++++++++++++++++++++++++++++++++
keyboards/cozykeys/speedo/v3/speedo_v3.c | 17 ---------------
keyboards/cozykeys/speedo/v3/speedo_v3.h | 36 --------------------------------
keyboards/cozykeys/speedo/v3/v3.c | 17 +++++++++++++++
keyboards/cozykeys/speedo/v3/v3.h | 36 ++++++++++++++++++++++++++++++++
10 files changed, 112 insertions(+), 110 deletions(-)
delete mode 100644 keyboards/cozykeys/speedo/v2/speedo_v2.c
delete mode 100644 keyboards/cozykeys/speedo/v2/speedo_v2.h
create mode 100644 keyboards/cozykeys/speedo/v2/v2.c
create mode 100644 keyboards/cozykeys/speedo/v2/v2.h
delete mode 100644 keyboards/cozykeys/speedo/v3/speedo_v3.c
delete mode 100644 keyboards/cozykeys/speedo/v3/speedo_v3.h
create mode 100644 keyboards/cozykeys/speedo/v3/v3.c
create mode 100644 keyboards/cozykeys/speedo/v3/v3.h
(limited to 'keyboards')
diff --git a/keyboards/cozykeys/speedo/readme.md b/keyboards/cozykeys/speedo/readme.md
index 4a26c1a00a..e2193363b7 100644
--- a/keyboards/cozykeys/speedo/readme.md
+++ b/keyboards/cozykeys/speedo/readme.md
@@ -8,11 +8,13 @@
Make example for this keyboard (after setting up your build environment):
- make speedo:default
+ make cozykeys/speedo/v2:default # for Speedo v2
+ make cozykeys/speedo/v3:default # for Speedo v3
Flashing example for this keyboard:
- make speedo:default:flash
+ make cozykeys/speedo/v2:default:flash # for Speedo v2
+ make cozykeys/speedo/v3:default:flash # for Speedo v3
See the
[build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and
diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h
index 3b3c89d932..2a2adff423 100644
--- a/keyboards/cozykeys/speedo/speedo.h
+++ b/keyboards/cozykeys/speedo/speedo.h
@@ -17,7 +17,7 @@ along with this program. If not, see .
#pragma once
#ifdef KEYBOARD_cozykeys_speedo_v2
- #include "speedo_v2.h"
+ #include "v2.h"
#elif KEYBOARD_cozykeys_speedo_v3
- #include "speedo_v3.h"
+ #include "v3.h"
#endif
diff --git a/keyboards/cozykeys/speedo/v2/speedo_v2.c b/keyboards/cozykeys/speedo/v2/speedo_v2.c
deleted file mode 100644
index 8b5c7ff69d..0000000000
--- a/keyboards/cozykeys/speedo/v2/speedo_v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#include "speedo_v2.h"
diff --git a/keyboards/cozykeys/speedo/v2/speedo_v2.h b/keyboards/cozykeys/speedo/v2/speedo_v2.h
deleted file mode 100644
index 295d6f8faf..0000000000
--- a/keyboards/cozykeys/speedo/v2/speedo_v2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
- k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
- k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
- k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
- k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
- { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
- { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
- { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
- { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
- { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
-}
diff --git a/keyboards/cozykeys/speedo/v2/v2.c b/keyboards/cozykeys/speedo/v2/v2.c
new file mode 100644
index 0000000000..1cab752140
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/v2.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Paul Ewing
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+#include "v2.h"
diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h
new file mode 100644
index 0000000000..295d6f8faf
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/v2.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 Paul Ewing
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT( \
+ k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
+ k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
+ k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
+ k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
+ k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
+) \
+{ \
+ { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
+ { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
+ { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
+ { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
+ { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+}
diff --git a/keyboards/cozykeys/speedo/v3/speedo_v3.c b/keyboards/cozykeys/speedo/v3/speedo_v3.c
deleted file mode 100644
index 759052c271..0000000000
--- a/keyboards/cozykeys/speedo/v3/speedo_v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#include "speedo_v3.h"
diff --git a/keyboards/cozykeys/speedo/v3/speedo_v3.h b/keyboards/cozykeys/speedo/v3/speedo_v3.h
deleted file mode 100644
index a8623c0f95..0000000000
--- a/keyboards/cozykeys/speedo/v3/speedo_v3.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
- k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
- k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
- k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
- { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
- { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \
- { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \
- { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \
- { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
-}
diff --git a/keyboards/cozykeys/speedo/v3/v3.c b/keyboards/cozykeys/speedo/v3/v3.c
new file mode 100644
index 0000000000..f35be99e22
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/v3.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Paul Ewing
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+#include "v3.h"
diff --git a/keyboards/cozykeys/speedo/v3/v3.h b/keyboards/cozykeys/speedo/v3/v3.h
new file mode 100644
index 0000000000..a8623c0f95
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/v3.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 Paul Ewing
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT( \
+ k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
+ k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
+ k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \
+ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
+ k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
+) \
+{ \
+ { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
+ { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \
+ { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \
+ { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \
+ { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+}
--
cgit v1.2.3