From 73dc35c1e7e1646c5dbe1ca9150d11e506eba24b Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Fri, 12 May 2023 14:30:14 -0400 Subject: [PATCH 1/8] commit --- keyboards/artemis/paragon/hotswap/config.h | 20 +++ keyboards/artemis/paragon/hotswap/info.json | 124 ++++++++++++++++++ .../paragon/hotswap/keymaps/default/keymap.c | 29 ++++ .../paragon/hotswap/keymaps/via/keymap.c | 46 +++++++ .../paragon/hotswap/keymaps/via/rules.mk | 1 + keyboards/artemis/paragon/hotswap/readme.md | 27 ++++ keyboards/artemis/paragon/hotswap/rules.mk | 3 + keyboards/artemis/paragon/soldered/config.h | 20 +++ keyboards/artemis/paragon/soldered/info.json | 124 ++++++++++++++++++ .../paragon/soldered/keymaps/default/keymap.c | 29 ++++ .../paragon/soldered/keymaps/via/keymap.c | 46 +++++++ .../paragon/soldered/keymaps/via/rules.mk | 1 + keyboards/artemis/paragon/soldered/readme.md | 27 ++++ keyboards/artemis/paragon/soldered/rules.mk | 3 + 14 files changed, 500 insertions(+) create mode 100644 keyboards/artemis/paragon/hotswap/config.h create mode 100644 keyboards/artemis/paragon/hotswap/info.json create mode 100644 keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c create mode 100644 keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c create mode 100644 keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk create mode 100644 keyboards/artemis/paragon/hotswap/readme.md create mode 100644 keyboards/artemis/paragon/hotswap/rules.mk create mode 100644 keyboards/artemis/paragon/soldered/config.h create mode 100644 keyboards/artemis/paragon/soldered/info.json create mode 100644 keyboards/artemis/paragon/soldered/keymaps/default/keymap.c create mode 100644 keyboards/artemis/paragon/soldered/keymaps/via/keymap.c create mode 100644 keyboards/artemis/paragon/soldered/keymaps/via/rules.mk create mode 100644 keyboards/artemis/paragon/soldered/readme.md create mode 100644 keyboards/artemis/paragon/soldered/rules.mk diff --git a/keyboards/artemis/paragon/hotswap/config.h b/keyboards/artemis/paragon/hotswap/config.h new file mode 100644 index 000000000000..606cc9a0518d --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Sleepdealer (@Sleepdealr) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * 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 diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/info.json new file mode 100644 index 000000000000..b5652f71ba7a --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/info.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "Artemis", + "keyboard_name": "Paragon", + "maintainer": "Sleepdealr", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "lto": true + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "B3", "B6", "B5", "B4", "D7", "D4", "D6"], + "rows": ["D2", "D1", "D0", "B2", "B1", "C6"] + }, + "processor": "atmega32u4", + "url": "", + "encoder": { + "rotary": [ + { "pin_a": "D3", "pin_b": "D5" } + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x3449", + "vid": "0x8C27" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 2], "x": 1.5, "y": 0 }, + { "matrix": [0, 3], "x": 2.5, "y": 0 }, + { "matrix": [0, 4], "x": 3.5, "y": 0 }, + { "matrix": [0, 5], "x": 4.5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10.5, "y": 0 }, + { "matrix": [0, 11], "x": 11.5, "y": 0 }, + { "matrix": [0, 12], "x": 12.5, "y": 0 }, + { "matrix": [0, 13], "x": 13.5, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "matrix": [1, 12], "x": 12, "y": 1.5 }, + { "matrix": [1, 13], "x": 13, "y": 1.5 }, + { "matrix": [1, 14], "x": 14, "y": 1.5 }, + { "matrix": [1, 15], "x": 15, "y": 1.5 }, + { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, + { "matrix": [2, 15], "x": 15, "y": 2.5 }, + { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, + { "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "matrix": [3, 12], "x": 12.75, "y": 3.5 }, + { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 }, + { "matrix": [3, 15], "x": 15, "y": 3.5 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, + { "matrix": [4, 1], "x": 1.25, "y": 4.5 }, + { "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "matrix": [4, 11], "x": 11.25, "y": 4.5 }, + { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 }, + { "matrix": [4, 13], "x": 14, "y": 4.5 }, + { "matrix": [4, 15], "x": 15, "y": 4.5 }, + { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, + { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 }, + { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 }, + { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 }, + { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 }, + { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 }, + { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 }, + { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 }, + { "matrix": [5, 12], "x": 13, "y": 5.5 }, + { "matrix": [5, 13], "x": 14, "y": 5.5 }, + { "matrix": [5, 15], "x": 15, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c b/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c new file mode 100644 index 000000000000..122a188aaad2 --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c @@ -0,0 +1,29 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, 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_GRV, 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_BSPC, KC_HOME, + 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_PGUP, + 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_NUBS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c b/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c new file mode 100644 index 000000000000..fecd6ca636d1 --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, 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_GRV, 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_BSPC, KC_HOME, + 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_PGUP, + 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_NUBS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [2] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [3] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk b/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/artemis/paragon/hotswap/readme.md b/keyboards/artemis/paragon/hotswap/readme.md new file mode 100644 index 000000000000..9f838d9784c9 --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/readme.md @@ -0,0 +1,27 @@ +# paragon + +![paragon](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make paragon:default + +Flashing example for this keyboard: + + make paragon: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**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/artemis/paragon/hotswap/rules.mk b/keyboards/artemis/paragon/hotswap/rules.mk new file mode 100644 index 000000000000..f48c420d792c --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/rules.mk @@ -0,0 +1,3 @@ +# This file intentionally left blank + +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/config.h b/keyboards/artemis/paragon/soldered/config.h new file mode 100644 index 000000000000..606cc9a0518d --- /dev/null +++ b/keyboards/artemis/paragon/soldered/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Sleepdealer (@Sleepdealr) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * 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 diff --git a/keyboards/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/info.json new file mode 100644 index 000000000000..8888739c8545 --- /dev/null +++ b/keyboards/artemis/paragon/soldered/info.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "Artemis", + "keyboard_name": "Paragon", + "maintainer": "Sleepdealr", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "lto": true + }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B3", "D0", "D1", "D2", "D3", "D7", "D5"], + "rows": ["B2", "C7", "C6", "B6", "B5", "B4"] + }, + "processor": "atmega32u4", + "url": "", + "encoder": { + "rotary": [ + { "pin_a": "D4", "pin_b": "D6" } + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x3449", + "vid": "0x8C27" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 2], "x": 1.5, "y": 0 }, + { "matrix": [0, 3], "x": 2.5, "y": 0 }, + { "matrix": [0, 4], "x": 3.5, "y": 0 }, + { "matrix": [0, 5], "x": 4.5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10.5, "y": 0 }, + { "matrix": [0, 11], "x": 11.5, "y": 0 }, + { "matrix": [0, 12], "x": 12.5, "y": 0 }, + { "matrix": [0, 13], "x": 13.5, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "matrix": [1, 12], "x": 12, "y": 1.5 }, + { "matrix": [1, 13], "x": 13, "y": 1.5 }, + { "matrix": [1, 14], "x": 14, "y": 1.5 }, + { "matrix": [1, 15], "x": 15, "y": 1.5 }, + { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, + { "matrix": [2, 15], "x": 15, "y": 2.5 }, + { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, + { "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "matrix": [3, 12], "x": 12.75, "y": 3.5 }, + { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 }, + { "matrix": [3, 15], "x": 15, "y": 3.5 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, + { "matrix": [4, 1], "x": 1.25, "y": 4.5 }, + { "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "matrix": [4, 11], "x": 11.25, "y": 4.5 }, + { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 }, + { "matrix": [4, 13], "x": 14, "y": 4.5 }, + { "matrix": [4, 15], "x": 15, "y": 4.5 }, + { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, + { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 }, + { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 }, + { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 }, + { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 }, + { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 }, + { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 }, + { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 }, + { "matrix": [5, 12], "x": 13, "y": 5.5 }, + { "matrix": [5, 13], "x": 14, "y": 5.5 }, + { "matrix": [5, 15], "x": 15, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c new file mode 100644 index 000000000000..122a188aaad2 --- /dev/null +++ b/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c @@ -0,0 +1,29 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, 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_GRV, 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_BSPC, KC_HOME, + 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_PGUP, + 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_NUBS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c new file mode 100644 index 000000000000..fecd6ca636d1 --- /dev/null +++ b/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, 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_GRV, 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_BSPC, KC_HOME, + 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_PGUP, + 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_NUBS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [2] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [3] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk b/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/readme.md b/keyboards/artemis/paragon/soldered/readme.md new file mode 100644 index 000000000000..9f838d9784c9 --- /dev/null +++ b/keyboards/artemis/paragon/soldered/readme.md @@ -0,0 +1,27 @@ +# paragon + +![paragon](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make paragon:default + +Flashing example for this keyboard: + + make paragon: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**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/artemis/paragon/soldered/rules.mk b/keyboards/artemis/paragon/soldered/rules.mk new file mode 100644 index 000000000000..f48c420d792c --- /dev/null +++ b/keyboards/artemis/paragon/soldered/rules.mk @@ -0,0 +1,3 @@ +# This file intentionally left blank + +ENCODER_MAP_ENABLE = yes From f6c44ba27697dbcd7ef3ff2fb1619c475901bee5 Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Fri, 12 May 2023 14:40:12 -0400 Subject: [PATCH 2/8] Fix stuff --- keyboards/artemis/paragon/hotswap/config.h | 20 ------------------- .../paragon/hotswap/keymaps/default/keymap.c | 14 +++++++++++++ .../paragon/hotswap/keymaps/default/rules.mk | 1 + .../paragon/hotswap/keymaps/via/keymap.c | 14 +++++++++++++ .../paragon/hotswap/keymaps/via/rules.mk | 1 + keyboards/artemis/paragon/hotswap/readme.md | 14 +++++-------- keyboards/artemis/paragon/hotswap/rules.mk | 2 -- keyboards/artemis/paragon/soldered/config.h | 20 ------------------- .../paragon/soldered/keymaps/default/keymap.c | 14 +++++++++++++ .../paragon/soldered/keymaps/default/rules.mk | 1 + .../paragon/soldered/keymaps/via/keymap.c | 14 +++++++++++++ .../paragon/soldered/keymaps/via/rules.mk | 1 + keyboards/artemis/paragon/soldered/readme.md | 14 +++++-------- keyboards/artemis/paragon/soldered/rules.mk | 2 -- 14 files changed, 70 insertions(+), 62 deletions(-) delete mode 100644 keyboards/artemis/paragon/hotswap/config.h create mode 100644 keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk delete mode 100644 keyboards/artemis/paragon/soldered/config.h create mode 100644 keyboards/artemis/paragon/soldered/keymaps/default/rules.mk diff --git a/keyboards/artemis/paragon/hotswap/config.h b/keyboards/artemis/paragon/hotswap/config.h deleted file mode 100644 index 606cc9a0518d..000000000000 --- a/keyboards/artemis/paragon/hotswap/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Sleepdealer (@Sleepdealr) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * 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 diff --git a/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c b/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c index 122a188aaad2..9901c47aec02 100644 --- a/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c +++ b/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c @@ -1,3 +1,17 @@ +/* +Copyright 2023 Sleepdealer +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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk b/keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c b/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c index fecd6ca636d1..852872b910a2 100644 --- a/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c +++ b/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c @@ -1,3 +1,17 @@ +/* +Copyright 2023 Sleepdealer +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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk b/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk index 1e5b99807cb7..f1adcab005e8 100644 --- a/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk +++ b/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/hotswap/readme.md b/keyboards/artemis/paragon/hotswap/readme.md index 9f838d9784c9..287d141ccc67 100644 --- a/keyboards/artemis/paragon/hotswap/readme.md +++ b/keyboards/artemis/paragon/hotswap/readme.md @@ -1,20 +1,16 @@ -# paragon - -![paragon](imgur.com image replace me!) - -*A short description of the keyboard/project* +# Artemis/Paragon * Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Paragon PCB +* Hardware Availability: GB Make example for this keyboard (after setting up your build environment): - make paragon:default + make artemis/paragon/hotswap:default Flashing example for this keyboard: - make paragon:default:flash + make artemis/paragon/hotswap: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). diff --git a/keyboards/artemis/paragon/hotswap/rules.mk b/keyboards/artemis/paragon/hotswap/rules.mk index f48c420d792c..6e7633bfe015 100644 --- a/keyboards/artemis/paragon/hotswap/rules.mk +++ b/keyboards/artemis/paragon/hotswap/rules.mk @@ -1,3 +1 @@ # This file intentionally left blank - -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/config.h b/keyboards/artemis/paragon/soldered/config.h deleted file mode 100644 index 606cc9a0518d..000000000000 --- a/keyboards/artemis/paragon/soldered/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Sleepdealer (@Sleepdealr) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * 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 diff --git a/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c index 122a188aaad2..9901c47aec02 100644 --- a/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c +++ b/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c @@ -1,3 +1,17 @@ +/* +Copyright 2023 Sleepdealer +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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk b/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c index fecd6ca636d1..852872b910a2 100644 --- a/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c +++ b/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c @@ -1,3 +1,17 @@ +/* +Copyright 2023 Sleepdealer +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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk b/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk index 1e5b99807cb7..f1adcab005e8 100644 --- a/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk +++ b/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/readme.md b/keyboards/artemis/paragon/soldered/readme.md index 9f838d9784c9..287d141ccc67 100644 --- a/keyboards/artemis/paragon/soldered/readme.md +++ b/keyboards/artemis/paragon/soldered/readme.md @@ -1,20 +1,16 @@ -# paragon - -![paragon](imgur.com image replace me!) - -*A short description of the keyboard/project* +# Artemis/Paragon * Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Paragon PCB +* Hardware Availability: GB Make example for this keyboard (after setting up your build environment): - make paragon:default + make artemis/paragon/hotswap:default Flashing example for this keyboard: - make paragon:default:flash + make artemis/paragon/hotswap: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). diff --git a/keyboards/artemis/paragon/soldered/rules.mk b/keyboards/artemis/paragon/soldered/rules.mk index f48c420d792c..6e7633bfe015 100644 --- a/keyboards/artemis/paragon/soldered/rules.mk +++ b/keyboards/artemis/paragon/soldered/rules.mk @@ -1,3 +1 @@ # This file intentionally left blank - -ENCODER_MAP_ENABLE = yes From f020b8be32c7f481368798fd8d89ea447620c5c2 Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Fri, 12 May 2023 14:45:41 -0400 Subject: [PATCH 3/8] readme fix --- keyboards/artemis/paragon/soldered/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/artemis/paragon/soldered/readme.md b/keyboards/artemis/paragon/soldered/readme.md index 287d141ccc67..a5ce90ffae76 100644 --- a/keyboards/artemis/paragon/soldered/readme.md +++ b/keyboards/artemis/paragon/soldered/readme.md @@ -6,11 +6,11 @@ Make example for this keyboard (after setting up your build environment): - make artemis/paragon/hotswap:default + make artemis/paragon/soldered:default Flashing example for this keyboard: - make artemis/paragon/hotswap:default:flash + make artemis/paragon/soldered: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). From 9370a6434761b5b3ba797a49176b899c8ef309b4 Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Sun, 14 May 2023 10:38:04 -0400 Subject: [PATCH 4/8] Change file structure --- keyboards/artemis/paragon/hotswap/info.json | 118 ----------------- keyboards/artemis/paragon/info.json | 120 ++++++++++++++++++ .../{hotswap => }/keymaps/default/keymap.c | 0 .../{hotswap => }/keymaps/default/rules.mk | 0 .../{hotswap => }/keymaps/via/keymap.c | 0 .../{hotswap => }/keymaps/via/rules.mk | 0 .../artemis/paragon/{hotswap => }/readme.md | 0 keyboards/artemis/paragon/rules.mk | 1 + keyboards/artemis/paragon/soldered/info.json | 118 ----------------- .../paragon/soldered/keymaps/default/keymap.c | 43 ------- .../paragon/soldered/keymaps/default/rules.mk | 1 - .../paragon/soldered/keymaps/via/keymap.c | 60 --------- .../paragon/soldered/keymaps/via/rules.mk | 2 - keyboards/artemis/paragon/soldered/readme.md | 23 ---- 14 files changed, 121 insertions(+), 365 deletions(-) create mode 100644 keyboards/artemis/paragon/info.json rename keyboards/artemis/paragon/{hotswap => }/keymaps/default/keymap.c (100%) rename keyboards/artemis/paragon/{hotswap => }/keymaps/default/rules.mk (100%) rename keyboards/artemis/paragon/{hotswap => }/keymaps/via/keymap.c (100%) rename keyboards/artemis/paragon/{hotswap => }/keymaps/via/rules.mk (100%) rename keyboards/artemis/paragon/{hotswap => }/readme.md (100%) create mode 100644 keyboards/artemis/paragon/rules.mk delete mode 100644 keyboards/artemis/paragon/soldered/keymaps/default/keymap.c delete mode 100644 keyboards/artemis/paragon/soldered/keymaps/default/rules.mk delete mode 100644 keyboards/artemis/paragon/soldered/keymaps/via/keymap.c delete mode 100644 keyboards/artemis/paragon/soldered/keymaps/via/rules.mk delete mode 100644 keyboards/artemis/paragon/soldered/readme.md diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/info.json index b5652f71ba7a..c57b49a047d4 100644 --- a/keyboards/artemis/paragon/hotswap/info.json +++ b/keyboards/artemis/paragon/hotswap/info.json @@ -1,124 +1,6 @@ { - "manufacturer": "Artemis", - "keyboard_name": "Paragon", - "maintainer": "Sleepdealr", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "encoder": true, - "lto": true - }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "B3", "B6", "B5", "B4", "D7", "D4", "D6"], "rows": ["D2", "D1", "D0", "B2", "B1", "C6"] - }, - "processor": "atmega32u4", - "url": "", - "encoder": { - "rotary": [ - { "pin_a": "D3", "pin_b": "D5" } - ] - }, - "usb": { - "device_version": "1.0.0", - "pid": "0x3449", - "vid": "0x8C27" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 2], "x": 1.5, "y": 0 }, - { "matrix": [0, 3], "x": 2.5, "y": 0 }, - { "matrix": [0, 4], "x": 3.5, "y": 0 }, - { "matrix": [0, 5], "x": 4.5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10.5, "y": 0 }, - { "matrix": [0, 11], "x": 11.5, "y": 0 }, - { "matrix": [0, 12], "x": 12.5, "y": 0 }, - { "matrix": [0, 13], "x": 13.5, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1.5 }, - { "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "matrix": [1, 4], "x": 4, "y": 1.5 }, - { "matrix": [1, 5], "x": 5, "y": 1.5 }, - { "matrix": [1, 6], "x": 6, "y": 1.5 }, - { "matrix": [1, 7], "x": 7, "y": 1.5 }, - { "matrix": [1, 8], "x": 8, "y": 1.5 }, - { "matrix": [1, 9], "x": 9, "y": 1.5 }, - { "matrix": [1, 10], "x": 10, "y": 1.5 }, - { "matrix": [1, 11], "x": 11, "y": 1.5 }, - { "matrix": [1, 12], "x": 12, "y": 1.5 }, - { "matrix": [1, 13], "x": 13, "y": 1.5 }, - { "matrix": [1, 14], "x": 14, "y": 1.5 }, - { "matrix": [1, 15], "x": 15, "y": 1.5 }, - { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2.5 }, - { "matrix": [2, 2], "x": 2.5, "y": 2.5 }, - { "matrix": [2, 3], "x": 3.5, "y": 2.5 }, - { "matrix": [2, 4], "x": 4.5, "y": 2.5 }, - { "matrix": [2, 5], "x": 5.5, "y": 2.5 }, - { "matrix": [2, 6], "x": 6.5, "y": 2.5 }, - { "matrix": [2, 7], "x": 7.5, "y": 2.5 }, - { "matrix": [2, 8], "x": 8.5, "y": 2.5 }, - { "matrix": [2, 9], "x": 9.5, "y": 2.5 }, - { "matrix": [2, 10], "x": 10.5, "y": 2.5 }, - { "matrix": [2, 11], "x": 11.5, "y": 2.5 }, - { "matrix": [2, 12], "x": 12.5, "y": 2.5 }, - { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, - { "matrix": [2, 15], "x": 15, "y": 2.5 }, - { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "matrix": [3, 1], "x": 1.75, "y": 3.5 }, - { "matrix": [3, 2], "x": 2.75, "y": 3.5 }, - { "matrix": [3, 3], "x": 3.75, "y": 3.5 }, - { "matrix": [3, 4], "x": 4.75, "y": 3.5 }, - { "matrix": [3, 5], "x": 5.75, "y": 3.5 }, - { "matrix": [3, 6], "x": 6.75, "y": 3.5 }, - { "matrix": [3, 7], "x": 7.75, "y": 3.5 }, - { "matrix": [3, 8], "x": 8.75, "y": 3.5 }, - { "matrix": [3, 9], "x": 9.75, "y": 3.5 }, - { "matrix": [3, 10], "x": 10.75, "y": 3.5 }, - { "matrix": [3, 11], "x": 11.75, "y": 3.5 }, - { "matrix": [3, 12], "x": 12.75, "y": 3.5 }, - { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 }, - { "matrix": [3, 15], "x": 15, "y": 3.5 }, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, - { "matrix": [4, 1], "x": 1.25, "y": 4.5 }, - { "matrix": [4, 2], "x": 2.25, "y": 4.5 }, - { "matrix": [4, 3], "x": 3.25, "y": 4.5 }, - { "matrix": [4, 4], "x": 4.25, "y": 4.5 }, - { "matrix": [4, 5], "x": 5.25, "y": 4.5 }, - { "matrix": [4, 6], "x": 6.25, "y": 4.5 }, - { "matrix": [4, 7], "x": 7.25, "y": 4.5 }, - { "matrix": [4, 8], "x": 8.25, "y": 4.5 }, - { "matrix": [4, 9], "x": 9.25, "y": 4.5 }, - { "matrix": [4, 10], "x": 10.25, "y": 4.5 }, - { "matrix": [4, 11], "x": 11.25, "y": 4.5 }, - { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 }, - { "matrix": [4, 13], "x": 14, "y": 4.5 }, - { "matrix": [4, 15], "x": 15, "y": 4.5 }, - { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, - { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 }, - { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 }, - { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 }, - { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 }, - { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 }, - { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 }, - { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 }, - { "matrix": [5, 12], "x": 13, "y": 5.5 }, - { "matrix": [5, 13], "x": 14, "y": 5.5 }, - { "matrix": [5, 15], "x": 15, "y": 5.5 } - ] - } } } diff --git a/keyboards/artemis/paragon/info.json b/keyboards/artemis/paragon/info.json new file mode 100644 index 000000000000..007191798b2d --- /dev/null +++ b/keyboards/artemis/paragon/info.json @@ -0,0 +1,120 @@ +{ + "manufacturer": "Artemis", + "keyboard_name": "Paragon", + "maintainer": "Sleepdealr", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "lto": true + }, + "processor": "atmega32u4", + "url": "", + "encoder": { + "rotary": [ + { "pin_a": "D3", "pin_b": "D5" } + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x3449", + "vid": "0x8C27" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 2], "x": 1.5, "y": 0 }, + { "matrix": [0, 3], "x": 2.5, "y": 0 }, + { "matrix": [0, 4], "x": 3.5, "y": 0 }, + { "matrix": [0, 5], "x": 4.5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10.5, "y": 0 }, + { "matrix": [0, 11], "x": 11.5, "y": 0 }, + { "matrix": [0, 12], "x": 12.5, "y": 0 }, + { "matrix": [0, 13], "x": 13.5, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "matrix": [1, 12], "x": 12, "y": 1.5 }, + { "matrix": [1, 13], "x": 13, "y": 1.5 }, + { "matrix": [1, 14], "x": 14, "y": 1.5 }, + { "matrix": [1, 15], "x": 15, "y": 1.5 }, + { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, + { "matrix": [2, 15], "x": 15, "y": 2.5 }, + { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, + { "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "matrix": [3, 12], "x": 12.75, "y": 3.5 }, + { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 }, + { "matrix": [3, 15], "x": 15, "y": 3.5 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, + { "matrix": [4, 1], "x": 1.25, "y": 4.5 }, + { "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "matrix": [4, 11], "x": 11.25, "y": 4.5 }, + { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 }, + { "matrix": [4, 13], "x": 14, "y": 4.5 }, + { "matrix": [4, 15], "x": 15, "y": 4.5 }, + { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, + { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 }, + { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 }, + { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 }, + { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 }, + { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 }, + { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 }, + { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 }, + { "matrix": [5, 12], "x": 13, "y": 5.5 }, + { "matrix": [5, 13], "x": 14, "y": 5.5 }, + { "matrix": [5, 15], "x": 15, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c b/keyboards/artemis/paragon/keymaps/default/keymap.c similarity index 100% rename from keyboards/artemis/paragon/hotswap/keymaps/default/keymap.c rename to keyboards/artemis/paragon/keymaps/default/keymap.c diff --git a/keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk b/keyboards/artemis/paragon/keymaps/default/rules.mk similarity index 100% rename from keyboards/artemis/paragon/hotswap/keymaps/default/rules.mk rename to keyboards/artemis/paragon/keymaps/default/rules.mk diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c b/keyboards/artemis/paragon/keymaps/via/keymap.c similarity index 100% rename from keyboards/artemis/paragon/hotswap/keymaps/via/keymap.c rename to keyboards/artemis/paragon/keymaps/via/keymap.c diff --git a/keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk b/keyboards/artemis/paragon/keymaps/via/rules.mk similarity index 100% rename from keyboards/artemis/paragon/hotswap/keymaps/via/rules.mk rename to keyboards/artemis/paragon/keymaps/via/rules.mk diff --git a/keyboards/artemis/paragon/hotswap/readme.md b/keyboards/artemis/paragon/readme.md similarity index 100% rename from keyboards/artemis/paragon/hotswap/readme.md rename to keyboards/artemis/paragon/readme.md diff --git a/keyboards/artemis/paragon/rules.mk b/keyboards/artemis/paragon/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/artemis/paragon/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/info.json index 8888739c8545..5158add71e2b 100644 --- a/keyboards/artemis/paragon/soldered/info.json +++ b/keyboards/artemis/paragon/soldered/info.json @@ -1,124 +1,6 @@ { - "manufacturer": "Artemis", - "keyboard_name": "Paragon", - "maintainer": "Sleepdealr", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "encoder": true, - "lto": true - }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B3", "D0", "D1", "D2", "D3", "D7", "D5"], "rows": ["B2", "C7", "C6", "B6", "B5", "B4"] - }, - "processor": "atmega32u4", - "url": "", - "encoder": { - "rotary": [ - { "pin_a": "D4", "pin_b": "D6" } - ] - }, - "usb": { - "device_version": "1.0.0", - "pid": "0x3449", - "vid": "0x8C27" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 2], "x": 1.5, "y": 0 }, - { "matrix": [0, 3], "x": 2.5, "y": 0 }, - { "matrix": [0, 4], "x": 3.5, "y": 0 }, - { "matrix": [0, 5], "x": 4.5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10.5, "y": 0 }, - { "matrix": [0, 11], "x": 11.5, "y": 0 }, - { "matrix": [0, 12], "x": 12.5, "y": 0 }, - { "matrix": [0, 13], "x": 13.5, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1.5 }, - { "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "matrix": [1, 4], "x": 4, "y": 1.5 }, - { "matrix": [1, 5], "x": 5, "y": 1.5 }, - { "matrix": [1, 6], "x": 6, "y": 1.5 }, - { "matrix": [1, 7], "x": 7, "y": 1.5 }, - { "matrix": [1, 8], "x": 8, "y": 1.5 }, - { "matrix": [1, 9], "x": 9, "y": 1.5 }, - { "matrix": [1, 10], "x": 10, "y": 1.5 }, - { "matrix": [1, 11], "x": 11, "y": 1.5 }, - { "matrix": [1, 12], "x": 12, "y": 1.5 }, - { "matrix": [1, 13], "x": 13, "y": 1.5 }, - { "matrix": [1, 14], "x": 14, "y": 1.5 }, - { "matrix": [1, 15], "x": 15, "y": 1.5 }, - { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2.5 }, - { "matrix": [2, 2], "x": 2.5, "y": 2.5 }, - { "matrix": [2, 3], "x": 3.5, "y": 2.5 }, - { "matrix": [2, 4], "x": 4.5, "y": 2.5 }, - { "matrix": [2, 5], "x": 5.5, "y": 2.5 }, - { "matrix": [2, 6], "x": 6.5, "y": 2.5 }, - { "matrix": [2, 7], "x": 7.5, "y": 2.5 }, - { "matrix": [2, 8], "x": 8.5, "y": 2.5 }, - { "matrix": [2, 9], "x": 9.5, "y": 2.5 }, - { "matrix": [2, 10], "x": 10.5, "y": 2.5 }, - { "matrix": [2, 11], "x": 11.5, "y": 2.5 }, - { "matrix": [2, 12], "x": 12.5, "y": 2.5 }, - { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, - { "matrix": [2, 15], "x": 15, "y": 2.5 }, - { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "matrix": [3, 1], "x": 1.75, "y": 3.5 }, - { "matrix": [3, 2], "x": 2.75, "y": 3.5 }, - { "matrix": [3, 3], "x": 3.75, "y": 3.5 }, - { "matrix": [3, 4], "x": 4.75, "y": 3.5 }, - { "matrix": [3, 5], "x": 5.75, "y": 3.5 }, - { "matrix": [3, 6], "x": 6.75, "y": 3.5 }, - { "matrix": [3, 7], "x": 7.75, "y": 3.5 }, - { "matrix": [3, 8], "x": 8.75, "y": 3.5 }, - { "matrix": [3, 9], "x": 9.75, "y": 3.5 }, - { "matrix": [3, 10], "x": 10.75, "y": 3.5 }, - { "matrix": [3, 11], "x": 11.75, "y": 3.5 }, - { "matrix": [3, 12], "x": 12.75, "y": 3.5 }, - { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 }, - { "matrix": [3, 15], "x": 15, "y": 3.5 }, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, - { "matrix": [4, 1], "x": 1.25, "y": 4.5 }, - { "matrix": [4, 2], "x": 2.25, "y": 4.5 }, - { "matrix": [4, 3], "x": 3.25, "y": 4.5 }, - { "matrix": [4, 4], "x": 4.25, "y": 4.5 }, - { "matrix": [4, 5], "x": 5.25, "y": 4.5 }, - { "matrix": [4, 6], "x": 6.25, "y": 4.5 }, - { "matrix": [4, 7], "x": 7.25, "y": 4.5 }, - { "matrix": [4, 8], "x": 8.25, "y": 4.5 }, - { "matrix": [4, 9], "x": 9.25, "y": 4.5 }, - { "matrix": [4, 10], "x": 10.25, "y": 4.5 }, - { "matrix": [4, 11], "x": 11.25, "y": 4.5 }, - { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 }, - { "matrix": [4, 13], "x": 14, "y": 4.5 }, - { "matrix": [4, 15], "x": 15, "y": 4.5 }, - { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, - { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 }, - { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 }, - { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 }, - { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 }, - { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 }, - { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 }, - { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 }, - { "matrix": [5, 12], "x": 13, "y": 5.5 }, - { "matrix": [5, 13], "x": 14, "y": 5.5 }, - { "matrix": [5, 15], "x": 15, "y": 5.5 } - ] - } } } diff --git a/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c deleted file mode 100644 index 9901c47aec02..000000000000 --- a/keyboards/artemis/paragon/soldered/keymaps/default/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2023 Sleepdealer -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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_ESC, 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_GRV, 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_BSPC, KC_HOME, - 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_PGUP, - 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_NUBS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } -}; -#endif diff --git a/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk b/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk deleted file mode 100644 index ee325681483f..000000000000 --- a/keyboards/artemis/paragon/soldered/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c b/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c deleted file mode 100644 index 852872b910a2..000000000000 --- a/keyboards/artemis/paragon/soldered/keymaps/via/keymap.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2023 Sleepdealer -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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_ESC, 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_GRV, 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_BSPC, KC_HOME, - 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_PGUP, - 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_NUBS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [2] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [3] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } -}; -#endif diff --git a/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk b/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005e8..000000000000 --- a/keyboards/artemis/paragon/soldered/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/artemis/paragon/soldered/readme.md b/keyboards/artemis/paragon/soldered/readme.md deleted file mode 100644 index a5ce90ffae76..000000000000 --- a/keyboards/artemis/paragon/soldered/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Artemis/Paragon - -* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr) -* Hardware Supported: Paragon PCB -* Hardware Availability: GB - -Make example for this keyboard (after setting up your build environment): - - make artemis/paragon/soldered:default - -Flashing example for this keyboard: - - make artemis/paragon/soldered: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**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 4b2a3f77f612c75deac592848bebbc8f39bc8735 Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Sun, 14 May 2023 20:41:15 -0400 Subject: [PATCH 5/8] Remove rules.mk --- keyboards/artemis/paragon/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/artemis/paragon/rules.mk diff --git a/keyboards/artemis/paragon/rules.mk b/keyboards/artemis/paragon/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/artemis/paragon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From cb8fa2ed60734f338de169ac3d0213cd9605d1c6 Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Mon, 12 Jun 2023 01:17:49 -0400 Subject: [PATCH 6/8] remove unnecessary transparent keys --- .../artemis/paragon/keymaps/default/keymap.c | 14 ++------- .../artemis/paragon/keymaps/via/keymap.c | 31 ++----------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/keyboards/artemis/paragon/keymaps/default/keymap.c b/keyboards/artemis/paragon/keymaps/default/keymap.c index 9901c47aec02..1a7d1f761624 100644 --- a/keyboards/artemis/paragon/keymaps/default/keymap.c +++ b/keyboards/artemis/paragon/keymaps/default/keymap.c @@ -23,21 +23,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_NUBS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS - ) + ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } }; #endif diff --git a/keyboards/artemis/paragon/keymaps/via/keymap.c b/keyboards/artemis/paragon/keymaps/via/keymap.c index 852872b910a2..6c9147c6ad33 100644 --- a/keyboards/artemis/paragon/keymaps/via/keymap.c +++ b/keyboards/artemis/paragon/keymaps/via/keymap.c @@ -23,38 +23,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_NUBS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) + ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [2] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [3] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } }; #endif From de98791fe422d5cc542f1f60620e61b45470ceed Mon Sep 17 00:00:00 2001 From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:23:31 -0400 Subject: [PATCH 7/8] fix encoder directions --- keyboards/artemis/paragon/keymaps/default/keymap.c | 2 +- keyboards/artemis/paragon/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/artemis/paragon/keymaps/default/keymap.c b/keyboards/artemis/paragon/keymaps/default/keymap.c index 1a7d1f761624..d980180a347b 100644 --- a/keyboards/artemis/paragon/keymaps/default/keymap.c +++ b/keyboards/artemis/paragon/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } }; #endif diff --git a/keyboards/artemis/paragon/keymaps/via/keymap.c b/keyboards/artemis/paragon/keymaps/via/keymap.c index 6c9147c6ad33..84f5735d97b4 100644 --- a/keyboards/artemis/paragon/keymaps/via/keymap.c +++ b/keyboards/artemis/paragon/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } }; #endif From abf3dbabf6dcbd7b7b1c6d2a4e92a32a4a311b36 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Wed, 14 Jun 2023 22:27:52 -0600 Subject: [PATCH 8/8] Update keyboards/artemis/paragon/info.json --- keyboards/artemis/paragon/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/artemis/paragon/info.json b/keyboards/artemis/paragon/info.json index 007191798b2d..2a2cf046a85a 100644 --- a/keyboards/artemis/paragon/info.json +++ b/keyboards/artemis/paragon/info.json @@ -11,7 +11,9 @@ "extrakey": true, "mousekey": true, "nkro": true, - "encoder": true, + "encoder": true + }, + "build": { "lto": true }, "processor": "atmega32u4",