aboutsummaryrefslogtreecommitdiff
path: root/keyboards/acheron
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-02-25 11:28:07 +0000
committerGitHub <noreply@github.com>2020-02-25 11:28:07 +0000
commit891d28a37954ada620fab3727499fe2e9ee3fe65 (patch)
tree38d29a0eb11a2ce12fe2dd1aa6bf3de9055fdd98 /keyboards/acheron
parentbb8d4b4d23ee04f6034f8880b8a9f93fa4673c38 (diff)
downloadqmk_firmware-891d28a37954ada620fab3727499fe2e9ee3fe65.tar.gz
qmk_firmware-891d28a37954ada620fab3727499fe2e9ee3fe65.zip
Acheron VIA support (#8204)
* Update acheron USB IDs * Add shark via keymap * Update austin via keymap * Fix eeprom build error * 3 layers fit
Diffstat (limited to 'keyboards/acheron')
-rw-r--r--keyboards/acheron/austin/config.h4
-rw-r--r--keyboards/acheron/austin/keymaps/via/config.h3
-rw-r--r--keyboards/acheron/austin/keymaps/via/keymap.c13
-rw-r--r--keyboards/acheron/austin/keymaps/via/rules.mk1
-rw-r--r--keyboards/acheron/shark/config.h4
-rw-r--r--keyboards/acheron/shark/keymaps/via/keymap.c100
-rw-r--r--keyboards/acheron/shark/keymaps/via/rules.mk2
7 files changed, 112 insertions, 15 deletions
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index 859c9051c..c6a41c7bc 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#pragma once 18#pragma once
19 19
20/* USB Device descriptor parameter */ 20/* USB Device descriptor parameter */
21#define VENDOR_ID 0x0159 21#define VENDOR_ID 0xAC11
22#define PRODUCT_ID 0xA71C 22#define PRODUCT_ID 0x4175
23#define DEVICE_VER 0x0001 23#define DEVICE_VER 0x0001
24#define MANUFACTURER DriftMechanics 24#define MANUFACTURER DriftMechanics
25#define PRODUCT Austin 25#define PRODUCT Austin
diff --git a/keyboards/acheron/austin/keymaps/via/config.h b/keyboards/acheron/austin/keymaps/via/config.h
new file mode 100644
index 000000000..a3b77a5b4
--- /dev/null
+++ b/keyboards/acheron/austin/keymaps/via/config.h
@@ -0,0 +1,3 @@
1#pragma once
2
3#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/acheron/austin/keymaps/via/keymap.c b/keyboards/acheron/austin/keymaps/via/keymap.c
index d745542e0..f588185d5 100644
--- a/keyboards/acheron/austin/keymaps/via/keymap.c
+++ b/keyboards/acheron/austin/keymaps/via/keymap.c
@@ -35,21 +35,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
36 ), 36 ),
37 37
38 [2] = LAYOUT_all( 38 [2] = LAYOUT_all(
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
45 ), 45 )
46
47 [3] = LAYOUT_all(
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
53 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
54 )
55}; 46};
diff --git a/keyboards/acheron/austin/keymaps/via/rules.mk b/keyboards/acheron/austin/keymaps/via/rules.mk
index 1e5b99807..ee1e4ceeb 100644
--- a/keyboards/acheron/austin/keymaps/via/rules.mk
+++ b/keyboards/acheron/austin/keymaps/via/rules.mk
@@ -1 +1,2 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2BOOTMAGIC_ENABLE = lite
diff --git a/keyboards/acheron/shark/config.h b/keyboards/acheron/shark/config.h
index 5a46ac5b7..ac6df1424 100644
--- a/keyboards/acheron/shark/config.h
+++ b/keyboards/acheron/shark/config.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "config_common.h" 20#include "config_common.h"
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED 23#define VENDOR_ID 0xAC11
24#define PRODUCT_ID 0xAC11 24#define PRODUCT_ID 0x5368
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER AcheronProject 26#define MANUFACTURER AcheronProject
27#define PRODUCT SharkPCB 27#define PRODUCT SharkPCB
diff --git a/keyboards/acheron/shark/keymaps/via/keymap.c b/keyboards/acheron/shark/keymaps/via/keymap.c
new file mode 100644
index 000000000..806d242b0
--- /dev/null
+++ b/keyboards/acheron/shark/keymaps/via/keymap.c
@@ -0,0 +1,100 @@
1/* Copyright 2019
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18enum layers {
19 _QWERTY = 0,
20 _LOWER,
21 _RAISE,
22 _ADJUST,
23};
24
25#define LOWER FN_MO13
26#define RAISE FN_MO23
27
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29/* Qwerty
30 * ,-----------------------------------------------------------------------------------.
31 * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
32 * |------+------+------+------+------+-------------+------+------+------+------+------|
33 * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
34 * |------+------+------+------+------+------|------+------+------+------+------+------|
35 * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
36 * |------+------+------+------+------+------+------+------+------+------+------+------|
37 * | Ctrl | Alt | GUI | |Lower | Space| Space|Raise | Left | Down | Up |Right |
38 * `-----------------------------------------------------------------------------------'
39 */
40[_QWERTY] = LAYOUT_ortho_4x12( \
41 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
42 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
43 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
44 KC_LCTL, KC_LALT, KC_LGUI, _______, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
45),
46
47/* Lower
48 * ,-----------------------------------------------------------------------------------.
49 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
50 * |------+------+------+------+------+-------------+------+------+------+------+------|
51 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
52 * |------+------+------+------+------+------|------+------+------+------+------+------|
53 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
54 * |------+------+------+------+------+------+------+------+------+------+------+------|
55 * | | | | | | | | Next | Vol- | Vol+ | Play |
56 * `-----------------------------------------------------------------------------------'
57 */
58[_LOWER] = LAYOUT_ortho_4x12( \
59 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
60 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
61 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_TOGG, BL_INC , BL_DEC , _______, _______, \
62 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
63),
64
65/* Raise
66 * ,-----------------------------------------------------------------------------------.
67 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
68 * |------+------+------+------+------+-------------+------+------+------+------+------|
69 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
70 * |------+------+------+------+------+------|------+------+------+------+------+------|
71 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter |
72 * |------+------+------+------+------+------+------+------+------+------+------+------|
73 * | | | | | | | | Next | Vol- | Vol+ | Play |
74 * `-----------------------------------------------------------------------------------'
75 */
76[_RAISE] = LAYOUT_ortho_4x12( \
77 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
78 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
79 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
80 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
81),
82
83/* Adjust (Lower + Raise)
84 * ,-----------------------------------------------------------------------------------.
85 * | | Reset| | | | | | | | | | Del |
86 * |------+------+------+------+------+-------------+------+------+------+------+------|
87 * | | | | | | | | | | | | |
88 * |------+------+------+------+------+------|------+------+------+------+------+------|
89 * | | | | | | | | | | | | |
90 * |------+------+------+------+------+------+------+------+------+------+------+------|
91 * | | | | | | | | | | | |
92 * `-----------------------------------------------------------------------------------'
93 */
94[_ADJUST] = LAYOUT_ortho_4x12( \
95 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
97 _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,\
98 _______, BL_TOGG, BL_INC, BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______ \
99)
100};
diff --git a/keyboards/acheron/shark/keymaps/via/rules.mk b/keyboards/acheron/shark/keymaps/via/rules.mk
new file mode 100644
index 000000000..ee1e4ceeb
--- /dev/null
+++ b/keyboards/acheron/shark/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2BOOTMAGIC_ENABLE = lite