From c66df1664497546f32662409778731143e45a552 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:02:18 -0800
Subject: 2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
---
keyboards/cozykeys/speedo/v2/config.h | 44 ++++++++++++
keyboards/cozykeys/speedo/v2/info.json | 79 ++++++++++++++++++++++
.../cozykeys/speedo/v2/keymaps/default/keymap.c | 58 ++++++++++++++++
.../cozykeys/speedo/v2/keymaps/default/readme.md | 1 +
keyboards/cozykeys/speedo/v2/rules.mk | 22 ++++++
keyboards/cozykeys/speedo/v2/speedo_v2.c | 17 +++++
keyboards/cozykeys/speedo/v2/speedo_v2.h | 36 ++++++++++
7 files changed, 257 insertions(+)
create mode 100644 keyboards/cozykeys/speedo/v2/config.h
create mode 100644 keyboards/cozykeys/speedo/v2/info.json
create mode 100644 keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
create mode 100644 keyboards/cozykeys/speedo/v2/keymaps/default/readme.md
create mode 100644 keyboards/cozykeys/speedo/v2/rules.mk
create mode 100644 keyboards/cozykeys/speedo/v2/speedo_v2.c
create mode 100644 keyboards/cozykeys/speedo/v2/speedo_v2.h
(limited to 'keyboards/cozykeys/speedo/v2')
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/cozykeys/speedo/v2/keymaps/default/keymap.c b/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..814aeb60c9
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
@@ -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 .
+*/
+#include QMK_KEYBOARD_H
+
+enum {
+ LAYER_DEFAULT,
+ LAYER_FN,
+ LAYER_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] = {
+
+[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, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LEFT, KC_RGHT, 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, FN, TODO, KC_RALT, KC_RGUI, KC_RCTL \
+),
+
+[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, _______, _______, \
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_INS, _______, _______, KC_PGDN, KC_LBRC, KC_RBRC, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+),
+
+[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, \
+ 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, KC_NO, KC_NO \
+)
+
+};
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 } \
+}
--
cgit v1.2.3