From d861a35ebf0b067a1cc4d7fce3d09b16462a078d Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Tue, 25 Oct 2022 01:05:22 -0400
Subject: [PATCH] [Keyboard] Add Ellipse hotswap PCB support (#18707)
Co-authored-by: Ryan <fauxpark@gmail.com>
---
keyboards/cannonkeys/ellipse_hs/info.json | 94 +++++++++++++++++++
.../ellipse_hs/keymaps/default/keymap.c | 45 +++++++++
.../ellipse_hs/keymaps/via/keymap.c | 45 +++++++++
.../ellipse_hs/keymaps/via/rules.mk | 1 +
keyboards/cannonkeys/ellipse_hs/readme.md | 25 +++++
keyboards/cannonkeys/ellipse_hs/rules.mk | 2 +
6 files changed, 212 insertions(+)
create mode 100644 keyboards/cannonkeys/ellipse_hs/info.json
create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
create mode 100644 keyboards/cannonkeys/ellipse_hs/readme.md
create mode 100644 keyboards/cannonkeys/ellipse_hs/rules.mk
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
new file mode 100644
index 0000000000..76cb0cfae2
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -0,0 +1,94 @@
+{
+ "manufacturer": "CannonKeys",
+ "keyboard_name": "Ellipse HS",
+ "maintainer": "awkannan",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "processor": "STM32F072",
+ "url": "https://cannonkeys.com/",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0xCA04",
+ "pid": "0x0016"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+ { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
+ { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+ { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7cf77c4f90
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _BASE,
+ _FN1,
+ _FN2,
+ _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_all(
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_INC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, QK_BOOT
+ ),
+
+ [_FN2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [_FN3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6a0943e9bb
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _BASE,
+ _FN1,
+ _FN2,
+ _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_all(
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, QK_BOOT
+ ),
+
+ [_FN2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [_FN3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk b/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/ellipse_hs/readme.md b/keyboards/cannonkeys/ellipse_hs/readme.md
new file mode 100644
index 0000000000..e516ee49e3
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/readme.md
@@ -0,0 +1,25 @@
+# Ellipse Hotswap
+
+*A ellipse inspired 60% keyboard with 3 mounting styles from Skepur*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cannonkeys/ellipse_hs:default
+
+Flashing example for this keyboard:
+
+ make cannonkeys/ellipse_hs: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/ellipse_hs/rules.mk b/keyboards/cannonkeys/ellipse_hs/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF