diff --git a/keyboards/cozykeys/speedo/readme.md b/keyboards/cozykeys/speedo/readme.md
new file mode 100644
index 0000000000..4a26c1a00a
--- /dev/null
+++ b/keyboards/cozykeys/speedo/readme.md
@@ -0,0 +1,26 @@
+# Speedo
+
+
+
+- Keyboard Maintainer: [Paul Ewing](https://github.com/pcewing)
+- Hardware Supported: Elite-C
+- Hardware Availability: [Speedo Repository](https://github.com/cozykeys/speedo)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make speedo:default
+
+Flashing example for this keyboard:
+
+ make speedo:default:flash
+
+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).
+
+## Flashing the Firmware
+
+See the QMK docs for handwiring a keyboard; there is a section with
+instructions on how to flash the *.hex* file to the Teensy 2.0 controller.
diff --git a/keyboards/cozykeys/speedo/speedo.c b/keyboards/cozykeys/speedo/speedo.c
new file mode 100644
index 0000000000..852459f8c6
--- /dev/null
+++ b/keyboards/cozykeys/speedo/speedo.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 "speedo.h"
diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h
new file mode 100644
index 0000000000..3b3c89d932
--- /dev/null
+++ b/keyboards/cozykeys/speedo/speedo.h
@@ -0,0 +1,23 @@
+/*
+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
+
+#ifdef KEYBOARD_cozykeys_speedo_v2
+ #include "speedo_v2.h"
+#elif KEYBOARD_cozykeys_speedo_v3
+ #include "speedo_v3.h"
+#endif
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
new file mode 100644
index 0000000000..1ab81ed7d1
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -0,0 +1,44 @@
+/*
+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 "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x1192
+#define DEVICE_VER 0x0002
+#define MANUFACTURER CozyKeys
+#define PRODUCT Speedo
+
+// Key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
+#define UNUSED_PINS { D5, D4, D6, D7, B4 }
+#define DIODE_DIRECTION COL2ROW
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
new file mode 100644
index 0000000000..714de357e3
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -0,0 +1,79 @@
+{
+ "keyboard_name": "Speedo",
+ "url": "https://github.com/cozykeys/speedo",
+ "maintainer": "pcewing",
+ "width": 14,
+ "height": 5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "k01", "x": 0.693, "y": 0.0, "r": 10 },
+ { "label": "k02", "x": 1.675, "y": 0.173, "r": 10 },
+ { "label": "k03", "x": 2.685, "y": 0.191, "r": 10 },
+ { "label": "k04", "x": 3.712, "y": 0.106, "r": 10 },
+ { "label": "k05", "x": 4.64, "y": 0.589, "r": 10 },
+ { "label": "k06", "x": 5.577, "y": 1.021, "r": 10 },
+ { "label": "k07", "x": 7.571, "y": 1.021, "r": -10 },
+ { "label": "k08", "x": 8.507, "y": 0.589, "r": -10 },
+ { "label": "k09", "x": 9.435, "y": 0.106, "r": -10 },
+ { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
+ { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
+ { "label": "k12", "x": 12.454, "y": 0.0, "r": -10 },
+ { "label": "k13", "x": 0.52, "y": 0.982, "r": 10 },
+ { "label": "k14", "x": 1.502, "y": 1.155, "r": 10 },
+ { "label": "k15", "x": 2.511, "y": 1.174, "r": 10 },
+ { "label": "k16", "x": 3.539, "y": 1.088, "r": 10 },
+ { "label": "k17", "x": 4.467, "y": 1.572, "r": 10 },
+ { "label": "k18", "x": 5.403, "y": 2.003, "r": 10 },
+ { "label": "k19", "x": 6.574, "y": 2.559, "r": 0 },
+ { "label": "k20", "x": 7.744, "y": 2.003, "r": -10 },
+ { "label": "k21", "x": 8.681, "y": 1.572, "r": -10 },
+ { "label": "k22", "x": 9.608, "y": 1.088, "r": -10 },
+ { "label": "k23", "x": 10.636, "y": 1.174, "r": -10 },
+ { "label": "k24", "x": 11.645, "y": 1.155, "r": -10 },
+ { "label": "k25", "x": 12.628, "y": 0.982, "r": -10 },
+ { "label": "k26", "x": 0.346, "y": 1.964, "r": 10 },
+ { "label": "k27", "x": 1.329, "y": 2.138, "r": 10 },
+ { "label": "k28", "x": 2.338, "y": 2.156, "r": 10 },
+ { "label": "k29", "x": 3.366, "y": 2.07, "r": 10 },
+ { "label": "k30", "x": 4.294, "y": 2.554, "r": 10 },
+ { "label": "k31", "x": 5.23, "y": 2.986, "r": 10 },
+ { "label": "k32", "x": 6.574, "y": 3.557, "r": 0 },
+ { "label": "k33", "x": 7.917, "y": 2.986, "r": -10 },
+ { "label": "k34", "x": 8.854, "y": 2.554, "r": -10 },
+ { "label": "k35", "x": 9.781, "y": 2.07, "r": -10 },
+ { "label": "k36", "x": 10.809, "y": 2.156, "r": -10 },
+ { "label": "k37", "x": 11.819, "y": 2.138, "r": -10 },
+ { "label": "k38", "x": 12.801, "y": 1.964, "r": -10 },
+ { "label": "k39", "x": 0.173, "y": 2.947, "r": 10 },
+ { "label": "k40", "x": 1.155, "y": 3.12, "r": 10 },
+ { "label": "k41", "x": 2.165, "y": 3.138, "r": 10 },
+ { "label": "k42", "x": 3.193, "y": 3.053, "r": 10 },
+ { "label": "k43", "x": 4.12, "y": 3.536, "r": 10 },
+ { "label": "k44", "x": 5.057, "y": 3.968, "r": 10 },
+ { "label": "k45", "x": 6.075, "y": 4.554, "r": 0 },
+ { "label": "k46", "x": 7.072, "y": 4.554, "r": 0 },
+ { "label": "k47", "x": 8.09, "y": 3.968, "r": -10 },
+ { "label": "k48", "x": 9.027, "y": 3.536, "r": -10 },
+ { "label": "k49", "x": 9.954, "y": 3.053, "r": -10 },
+ { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
+ { "label": "k51", "x": 11.992, "y": 3.12, "r": -10 },
+ { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
+ { "label": "k53", "x": 0.0, "y": 3.929, "r": 10 },
+ { "label": "k54", "x": 0.982, "y": 4.102, "r": 10 },
+ { "label": "k55", "x": 1.992, "y": 4.12, "r": 10 },
+ { "label": "k56", "x": 3.02, "y": 4.035, "r": 10 },
+ { "label": "k57", "x": 3.947, "y": 4.518, "r": 10 },
+ { "label": "k58", "x": 4.994, "y": 5.235, "r": 40 },
+ { "label": "k59", "x": 5.753, "y": 6.064, "r": 55 },
+ { "label": "k60", "x": 7.395, "y": 6.064, "r": -55 },
+ { "label": "k61", "x": 8.154, "y": 5.235, "r": 40 },
+ { "label": "k62", "x": 9.2, "y": 4.518, "r": -10 },
+ { "label": "k63", "x": 10.128, "y": 4.035, "r": -10 },
+ { "label": "k64", "x": 11.155, "y": 4.12, "r": -10 },
+ { "label": "k65", "x": 12.165, "y": 4.102, "r": -10 },
+ { "label": "k66", "x": 13.147, "y": 3.929, "r": -10 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/speedo/keymaps/default/keymap.c b/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
similarity index 66%
rename from keyboards/speedo/keymaps/default/keymap.c
rename to keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
index f5365b1223..814aeb60c9 100644
--- a/keyboards/speedo/keymaps/default/keymap.c
+++ b/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
@@ -1,35 +1,37 @@
-/* Copyright 2017 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 .
- */
+/*
+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 QMK_KEYBOARD_H
-#define FN MO(_FN)
-#define TORST TO(_RESET)
-#define TODFT TO(_DEFAULT)
-#define TODO KC_NO
+enum {
+ LAYER_DEFAULT,
+ LAYER_FN,
+ LAYER_RESET,
-enum speedo_layers {
- _DEFAULT,
- _FN,
- _RESET
+ __LAYER_COUNT,
};
+#define FN MO(LAYER_FN)
+#define TORST TO(LAYER_RESET)
+#define TODFT TO(LAYER_DEFAULT)
+#define TODO KC_NO
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DEFAULT] = LAYOUT(
+[LAYER_DEFAULT] = LAYOUT(
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_UP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DOWN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
@@ -37,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, FN, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, FN, TODO, KC_RALT, KC_RGUI, KC_RCTL \
),
-[_FN] = LAYOUT(
+[LAYER_FN] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TORST, \
_______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, KC_PGUP, KC_HOME, KC_END, _______, _______, _______, \
KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_PAUS, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \
@@ -45,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
),
-[_RESET] = LAYOUT(
+[LAYER_RESET] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TODFT, \
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
@@ -54,19 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md b/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..46d98fad1c
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# CozyKeys Speedo v2 Default Keymap
diff --git a/keyboards/cozykeys/speedo/v2/rules.mk b/keyboards/cozykeys/speedo/v2/rules.mk
new file mode 100644
index 0000000000..53127aafba
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/cozykeys/speedo/v2/speedo_v2.c b/keyboards/cozykeys/speedo/v2/speedo_v2.c
new file mode 100644
index 0000000000..8b5c7ff69d
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/speedo_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 "speedo_v2.h"
diff --git a/keyboards/cozykeys/speedo/v2/speedo_v2.h b/keyboards/cozykeys/speedo/v2/speedo_v2.h
new file mode 100644
index 0000000000..295d6f8faf
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/speedo_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/config.h b/keyboards/cozykeys/speedo/v3/config.h
new file mode 100644
index 0000000000..9928e91f98
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -0,0 +1,58 @@
+/*
+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 "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x1192
+#define DEVICE_VER 0x0003
+#define MANUFACTURER CozyKeys
+#define PRODUCT Speedo
+
+// Key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
+#define UNUSED_PINS { D2, D3, B0, B4 }
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN B5
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_BREATHE_TABLE_SIZE 256
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85
+#define RGBLIGHT_EFFECT_BREATHE_MAX 255
+#endif
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
new file mode 100644
index 0000000000..079f5de46f
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -0,0 +1,79 @@
+{
+ "keyboard_name": "Speedo",
+ "url": "https://github.com/cozykeys/speedo",
+ "maintainer": "pcewing",
+ "width": 14,
+ "height": 5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "k01", "x": 0.695, "y": 0, "r": 10 },
+ { "label": "k02", "x": 1.679, "y": 0.174, "r": 10 },
+ { "label": "k03", "x": 2.692, "y": 0.192, "r": 10 },
+ { "label": "k04", "x": 3.722, "y": 0.107, "r": 10 },
+ { "label": "k05", "x": 4.652, "y": 0.591, "r": 10 },
+ { "label": "k06", "x": 5.591, "y": 1.023, "r": 10 },
+ { "label": "k07", "x": 9.457, "y": 1.023, "r": -10 },
+ { "label": "k08", "x": 10.396, "y": 0.591, "r": -10 },
+ { "label": "k09", "x": 11.326, "y": 0.107, "r": -10 },
+ { "label": "k10", "x": 12.356, "y": 0.192, "r": -10 },
+ { "label": "k11", "x": 13.369, "y": 0.174, "r": -10 },
+ { "label": "k12", "x": 14.353, "y": 0, "r": -10 },
+ { "label": "k13", "x": 0.521, "y": 0.985, "r": 10 },
+ { "label": "k14", "x": 1.506, "y": 1.158, "r": 10 },
+ { "label": "k15", "x": 2.518, "y": 1.177, "r": 10 },
+ { "label": "k16", "x": 3.548, "y": 1.092, "r": 10 },
+ { "label": "k17", "x": 4.478, "y": 1.576, "r": 10 },
+ { "label": "k18", "x": 5.418, "y": 2.008, "r": 10 },
+ { "label": "k19", "x": 7.524, "y": 3.305, "r": 0 },
+ { "label": "k20", "x": 9.63, "y": 2.008, "r": -10 },
+ { "label": "k21", "x": 10.57, "y": 1.576, "r": -10 },
+ { "label": "k22", "x": 11.5, "y": 1.092, "r": -10 },
+ { "label": "k23", "x": 12.53, "y": 1.177, "r": -10 },
+ { "label": "k24", "x": 13.542, "y": 1.158, "r": -10 },
+ { "label": "k25", "x": 14.527, "y": 0.985, "r": -10 },
+ { "label": "k26", "x": 0.347, "y": 1.97, "r": 10 },
+ { "label": "k27", "x": 1.332, "y": 2.143, "r": 10 },
+ { "label": "k28", "x": 2.344, "y": 2.162, "r": 10 },
+ { "label": "k29", "x": 3.375, "y": 2.077, "r": 10 },
+ { "label": "k30", "x": 4.305, "y": 2.561, "r": 10 },
+ { "label": "k31", "x": 5.244, "y": 2.993, "r": 10 },
+ { "label": "k32", "x": 6.524, "y": 3.805, "r": 0 },
+ { "label": "k33", "x": 8.524, "y": 3.805, "r": 0 },
+ { "label": "k34", "x": 9.804, "y": 2.993, "r": -10 },
+ { "label": "k35", "x": 10.743, "y": 2.561, "r": -10 },
+ { "label": "k36", "x": 11.673, "y": 2.077, "r": -10 },
+ { "label": "k37", "x": 12.704, "y": 2.162, "r": -10 },
+ { "label": "k38", "x": 13.716, "y": 2.143, "r": -10 },
+ { "label": "k39", "x": 14.701, "y": 1.97, "r": -10 },
+ { "label": "k40", "x": 0.174, "y": 2.954, "r": 10 },
+ { "label": "k41", "x": 1.158, "y": 3.128, "r": 10 },
+ { "label": "k42", "x": 2.171, "y": 3.147, "r": 10 },
+ { "label": "k43", "x": 3.201, "y": 3.062, "r": 10 },
+ { "label": "k44", "x": 4.131, "y": 3.546, "r": 10 },
+ { "label": "k45", "x": 5.07, "y": 3.978, "r": 10 },
+ { "label": "k46", "x": 7.524, "y": 4.305, "r": 0 },
+ { "label": "k47", "x": 9.978, "y": 3.978, "r": -10 },
+ { "label": "k48", "x": 10.917, "y": 3.546, "r": -10 },
+ { "label": "k49", "x": 11.847, "y": 3.062, "r": -10 },
+ { "label": "k50", "x": 12.877, "y": 3.147, "r": -10 },
+ { "label": "k51", "x": 13.89, "y": 3.128, "r": -10 },
+ { "label": "k52", "x": 14.874, "y": 2.954, "r": -10 },
+ { "label": "k53", "x": 0, "y": 3.939, "r": 10 },
+ { "label": "k54", "x": 0.985, "y": 4.113, "r": 10 },
+ { "label": "k55", "x": 1.997, "y": 4.131, "r": 10 },
+ { "label": "k56", "x": 3.027, "y": 4.047, "r": 10 },
+ { "label": "k57", "x": 3.957, "y": 4.53, "r": 10 },
+ { "label": "k58", "x": 4.897, "y": 4.963, "r": 10 },
+ { "label": "k59", "x": 5.881, "y": 5.136, "r": 10 },
+ { "label": "k60", "x": 9.166, "y": 5.136, "r": -10 },
+ { "label": "k61", "x": 10.151, "y": 4.963, "r": -10 },
+ { "label": "k62", "x": 11.09, "y": 4.53, "r": -10 },
+ { "label": "k63", "x": 12.021, "y": 4.047, "r": -10 },
+ { "label": "k64", "x": 13.051, "y": 4.131, "r": -10 },
+ { "label": "k65", "x": 14.063, "y": 4.113, "r": -10 },
+ { "label": "k66", "x": 15.048, "y": 3.939, "r": -10 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c b/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4319bd18be
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+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 QMK_KEYBOARD_H
+
+enum {
+ LAYER_DEFAULT,
+ LAYER_FN,
+
+ __LAYER_COUNT,
+};
+
+#define FN MO(LAYER_FN)
+
+#define RGB_N RGB_MOD // Rotate to next RGB mode
+#define RGB_P RGB_RMOD // Rotate to next RGB mode
+
+const uint16_t PROGMEM keymaps[__LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+
+[LAYER_DEFAULT] = LAYOUT(
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_UP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, KC_RGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, FN, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_RALT, KC_RGUI, KC_RCTL
+),
+
+[LAYER_FN] = LAYOUT(
+ RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, RESET,
+ _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_TOG, _______, KC_GRV, KC_LBRC, KC_RBRC, _______, _______,
+ KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_INS, RGB_N, RGB_P, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_PAUS, RGB_M_P, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+};
diff --git a/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md b/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md
new file mode 100644
index 0000000000..a69d6f3894
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# CozyKeys Speedo v3 Default Keymap
+
+## Default Layer
+
+
+
+## Function Layer
+
+
+
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
new file mode 100644
index 0000000000..15eb4da919
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/cozykeys/speedo/v3/speedo_v3.c b/keyboards/cozykeys/speedo/v3/speedo_v3.c
new file mode 100644
index 0000000000..759052c271
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/speedo_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 "speedo_v3.h"
diff --git a/keyboards/cozykeys/speedo/v3/speedo_v3.h b/keyboards/cozykeys/speedo/v3/speedo_v3.h
new file mode 100644
index 0000000000..a8623c0f95
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/speedo_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 } \
+}
diff --git a/keyboards/speedo/config.h b/keyboards/speedo/config.h
deleted file mode 100644
index 04195b8665..0000000000
--- a/keyboards/speedo/config.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-Copyright 2017 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 .
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER You
-#define PRODUCT speedo
-#define DESCRIPTION A custom keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { D0, D5 }
-#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
-#define UNUSED_PINS { D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1 H
-//#define MAGIC_KEY_HELP2 SLASH
-//#define MAGIC_KEY_DEBUG D
-//#define MAGIC_KEY_DEBUG_MATRIX X
-//#define MAGIC_KEY_DEBUG_KBD K
-//#define MAGIC_KEY_DEBUG_MOUSE M
-//#define MAGIC_KEY_VERSION V
-//#define MAGIC_KEY_STATUS S
-//#define MAGIC_KEY_CONSOLE C
-//#define MAGIC_KEY_LAYER0_ALT1 ESC
-//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
-//#define MAGIC_KEY_LAYER0 0
-//#define MAGIC_KEY_LAYER1 1
-//#define MAGIC_KEY_LAYER2 2
-//#define MAGIC_KEY_LAYER3 3
-//#define MAGIC_KEY_LAYER4 4
-//#define MAGIC_KEY_LAYER5 5
-//#define MAGIC_KEY_LAYER6 6
-//#define MAGIC_KEY_LAYER7 7
-//#define MAGIC_KEY_LAYER8 8
-//#define MAGIC_KEY_LAYER9 9
-//#define MAGIC_KEY_BOOTLOADER PAUSE
-//#define MAGIC_KEY_LOCK CAPS
-//#define MAGIC_KEY_EEPROM E
-//#define MAGIC_KEY_NKRO N
-//#define MAGIC_KEY_SLEEP_LED Z
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
- - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
- - MIDI notes can be added to the keymap
- - Octave shift and transpose
- - Virtual sustain, portamento, and modulation wheel
- - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
-#endif
diff --git a/keyboards/speedo/info.json b/keyboards/speedo/info.json
deleted file mode 100644
index 3f4b7b2799..0000000000
--- a/keyboards/speedo/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "Speedo",
- "url": "",
- "maintainer": "qmk",
- "bootloader": "",
- "width": 15,
- "height": 6.5,
- "layouts": {
- "LAYOUT": {
- "layout": [{"label":"k00", "x":0, "y":0.375}, {"label":"k01", "x":1, "y":0.375}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.25}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":9, "y":0.5}, {"label":"k07", "x":10, "y":0.25}, {"label":"k08", "x":11, "y":0}, {"label":"k09", "x":12, "y":0.25}, {"label":"k10", "x":13, "y":0.375}, {"label":"k11", "x":14, "y":0.375}, {"label":"k12", "x":0, "y":1.375}, {"label":"k13", "x":1, "y":1.375}, {"label":"k14", "x":2, "y":1.25}, {"label":"k15", "x":3, "y":1}, {"label":"k16", "x":4, "y":1.25}, {"label":"k17", "x":5, "y":1.5}, {"label":"k18", "x":7, "y":2}, {"label":"k19", "x":9, "y":1.5}, {"label":"k20", "x":10, "y":1.25}, {"label":"k21", "x":11, "y":1}, {"label":"k22", "x":12, "y":1.25}, {"label":"k23", "x":13, "y":1.375}, {"label":"k24", "x":14, "y":1.375}, {"label":"k25", "x":0, "y":2.375}, {"label":"k26", "x":1, "y":2.375}, {"label":"k27", "x":2, "y":2.25}, {"label":"k28", "x":3, "y":2}, {"label":"k29", "x":4, "y":2.25}, {"label":"k30", "x":5, "y":2.5}, {"label":"k31", "x":7, "y":3}, {"label":"k32", "x":9, "y":2.5}, {"label":"k33", "x":10, "y":2.25}, {"label":"k34", "x":11, "y":2}, {"label":"k35", "x":12, "y":2.25}, {"label":"k36", "x":13, "y":2.375}, {"label":"k37", "x":14, "y":2.375}, {"label":"k38", "x":0, "y":3.375}, {"label":"k39", "x":1, "y":3.375}, {"label":"k40", "x":2, "y":3.25}, {"label":"k41", "x":3, "y":3}, {"label":"k42", "x":4, "y":3.25}, {"label":"k43", "x":5, "y":3.5}, {"label":"k44", "x":6.5, "y":4}, {"label":"k45", "x":7.5, "y":4}, {"label":"k46", "x":9, "y":3.5}, {"label":"k47", "x":10, "y":3.25}, {"label":"k48", "x":11, "y":3}, {"label":"k49", "x":12, "y":3.25}, {"label":"k50", "x":13, "y":3.375}, {"label":"k51", "x":14, "y":3.375}, {"label":"k52", "x":0, "y":4.375}, {"label":"k53", "x":1, "y":4.375}, {"label":"k54", "x":2, "y":4.25}, {"label":"k55", "x":3, "y":4}, {"label":"k56", "x":4, "y":4.25}, {"label":"k57", "x":5.5, "y":5}, {"label":"k58", "x":6.5, "y":5.5}, {"label":"k59", "x":7.5, "y":5.5}, {"label":"k60", "x":8.5, "y":5}, {"label":"k61", "x":10, "y":4.25}, {"label":"k62", "x":11, "y":4}, {"label":"k63", "x":12, "y":4.25}, {"label":"k64", "x":13, "y":4.375}, {"label":"k65", "x":14, "y":4.375}]
- }
- }
-}
diff --git a/keyboards/speedo/keymaps/default/config.h b/keyboards/speedo/keymaps/default/config.h
deleted file mode 100644
index 0ab49e8bc4..0000000000
--- a/keyboards/speedo/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 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
-
-// place overrides here
diff --git a/keyboards/speedo/keymaps/default/readme.md b/keyboards/speedo/keymaps/default/readme.md
deleted file mode 100644
index 6d373b4c65..0000000000
--- a/keyboards/speedo/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for speedo
\ No newline at end of file
diff --git a/keyboards/speedo/readme.md b/keyboards/speedo/readme.md
deleted file mode 100644
index 882c16583d..0000000000
--- a/keyboards/speedo/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Speedo
-
-
-
-Keyboard Maintainer: [Paul Ewing](https://github.com/pcewing)
-Hardware Supported: Teensy 2.0
-Hardware Availability: You will have to get the plates cut by an online service such as Ponoko. Case files are available in the [Speedo Repository](https://github.com/pcewing/speedo).
-
-Make example for this keyboard (after setting up your build environment):
-
- make speedo:default
-
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
-
-## Flashing the Firmware
-See the QMK docs for handwiring a keyboard; there is a section with instructions on how to flash the *.hex* file to the Teensy 2.0 controller.
diff --git a/keyboards/speedo/rules.mk b/keyboards/speedo/rules.mk
deleted file mode 100644
index b961b08c06..0000000000
--- a/keyboards/speedo/rules.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-# Teensy halfkay
-# Pro Micro caterina
-# Atmel DFU atmel-dfu
-# LUFA DFU lufa-dfu
-# QMK DFU qmk-dfu
-# ATmega32A bootloadHID
-# ATmega328P USBasp
-BOOTLOADER = halfkay
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no # USB Nkey Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no # MIDI support
-UNICODE_ENABLE = no # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no # Audio output on port C6
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
diff --git a/keyboards/speedo/speedo.c b/keyboards/speedo/speedo.c
deleted file mode 100644
index 74c97c841f..0000000000
--- a/keyboards/speedo/speedo.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2017 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.h"
-
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
- // put your looping keyboard code here
- // runs every cycle (a lot)
-
- matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
- // put your per-action keyboard code here
- // runs for every action, just before processing by the firmware
-
- return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
- // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
- led_set_user(usb_led);
-}
diff --git a/keyboards/speedo/speedo.h b/keyboards/speedo/speedo.h
deleted file mode 100644
index cf11aa5a22..0000000000
--- a/keyboards/speedo/speedo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2017 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 .
- */
-#ifndef SPEEDO_H
-#define SPEEDO_H
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, 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 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO, k06, k07, k08, k09, k10, k11 }, \
- { k12, k13, k14, k15, k16, k17, k18, KC_NO, k19, k20, k21, k22, k23, k24 }, \
- { k25, k26, k27, k28, k29, k30, KC_NO, 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 } \
-}
-
-#endif
-