Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jun 15, 2023
2 parents dd69649 + 66f06a1 commit 53d7604
Show file tree
Hide file tree
Showing 10 changed files with 228 additions and 0 deletions.
6 changes: 6 additions & 0 deletions keyboards/artemis/paragon/hotswap/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"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"]
}
}
1 change: 1 addition & 0 deletions keyboards/artemis/paragon/hotswap/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank
122 changes: 122 additions & 0 deletions keyboards/artemis/paragon/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"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
},
"build": {
"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 }
]
}
}
}
33 changes: 33 additions & 0 deletions keyboards/artemis/paragon/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
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 <http://www.gnu.org/licenses/>.
*/

#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
)
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
};
#endif
1 change: 1 addition & 0 deletions keyboards/artemis/paragon/keymaps/default/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
33 changes: 33 additions & 0 deletions keyboards/artemis/paragon/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
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 <http://www.gnu.org/licenses/>.
*/

#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
)
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
};
#endif
2 changes: 2 additions & 0 deletions keyboards/artemis/paragon/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
23 changes: 23 additions & 0 deletions keyboards/artemis/paragon/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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/hotswap:default

Flashing example for this keyboard:

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).

## 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
6 changes: 6 additions & 0 deletions keyboards/artemis/paragon/soldered/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"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"]
}
}
1 change: 1 addition & 0 deletions keyboards/artemis/paragon/soldered/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank

0 comments on commit 53d7604

Please sign in to comment.