aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/ChangeLog/20190830/PR5849.md3
-rw-r--r--keyboards/atreus/astar/astar.c16
-rw-r--r--keyboards/atreus/astar/astar.h17
-rw-r--r--keyboards/atreus/astar/config.h40
-rw-r--r--keyboards/atreus/astar/rules.mk58
-rw-r--r--keyboards/atreus/atreus.c18
-rw-r--r--keyboards/atreus/atreus.h38
-rw-r--r--keyboards/atreus/config.h57
-rw-r--r--keyboards/atreus/keymaps/alphadox/config.h76
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/config.h88
-rw-r--r--keyboards/atreus/keymaps/erlandsona/config.h88
-rw-r--r--keyboards/atreus/readme.md22
-rw-r--r--keyboards/atreus/rules.mk76
-rw-r--r--keyboards/atreus/teensy2/config.h36
-rw-r--r--keyboards/atreus/teensy2/rules.mk58
-rw-r--r--keyboards/atreus/teensy2/teensy2.c16
-rw-r--r--keyboards/atreus/teensy2/teensy2.h17
17 files changed, 346 insertions, 378 deletions
diff --git a/docs/ChangeLog/20190830/PR5849.md b/docs/ChangeLog/20190830/PR5849.md
new file mode 100644
index 000000000..24dadc1f2
--- /dev/null
+++ b/docs/ChangeLog/20190830/PR5849.md
@@ -0,0 +1,3 @@
1* Update Atreus to current code conventions
2 * Duplicate include guards have bypassed the expected header processing behavior
3 * All keymaps affected are recommended to remove duplication of `<keyboard>/config.h` to `<keyboard>/keymaps/<user>/config.h` and only provide overrides at the keymap level \ No newline at end of file
diff --git a/keyboards/atreus/astar/astar.c b/keyboards/atreus/astar/astar.c
new file mode 100644
index 000000000..19490deb9
--- /dev/null
+++ b/keyboards/atreus/astar/astar.c
@@ -0,0 +1,16 @@
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 "atreus.h"
diff --git a/keyboards/atreus/astar/astar.h b/keyboards/atreus/astar/astar.h
new file mode 100644
index 000000000..bf74ceb17
--- /dev/null
+++ b/keyboards/atreus/astar/astar.h
@@ -0,0 +1,17 @@
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
17#pragma once
diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h
new file mode 100644
index 000000000..a925c6fb1
--- /dev/null
+++ b/keyboards/atreus/astar/config.h
@@ -0,0 +1,40 @@
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
17#pragma once
18
19#include "config_common.h"
20
21/*
22 * Keyboard Matrix Assignments
23 *
24 * Change this to how you wired your keyboard
25 * COLS: AVR pins used for columns, left to right
26 * ROWS: AVR pins used for rows, top to bottom
27 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29 *
30*/
31#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
32#if defined(PCBDOWN)
33 #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
34#else
35 #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
36#endif
37#define UNUSED_PINS
38
39/* COL2ROW, ROW2COL*/
40#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar/rules.mk b/keyboards/atreus/astar/rules.mk
new file mode 100644
index 000000000..dc6f19623
--- /dev/null
+++ b/keyboards/atreus/astar/rules.mk
@@ -0,0 +1,58 @@
1# MCU name
2MCU = atmega32u4
3
4# Processor frequency.
5# This will define a symbol, F_CPU, in all source code files equal to the
6# processor frequency in Hz. You can then use this symbol in your source code to
7# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
8# automatically to create a 32-bit value in your source code.
9#
10# This will be an integer division of F_USB below, as it is sourced by
11# F_USB after it has run through any CPU prescalers. Note that this value
12# does not *change* the processor frequency - it should merely be updated to
13# reflect the processor speed set externally so that the code can use accurate
14# software delays.
15F_CPU = 16000000
16
17
18#
19# LUFA specific
20#
21# Target architecture (see library "Board Types" documentation).
22ARCH = AVR8
23
24# Input clock frequency.
25# This will define a symbol, F_USB, in all source code files equal to the
26# input clock frequency (before any prescaling is performed) in Hz. This value may
27# differ from F_CPU if prescaling is used on the latter, and is required as the
28# raw input clock is fed directly to the PLL sections of the AVR for high speed
29# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
30# at the end, this will be done automatically to create a 32-bit value in your
31# source code.
32#
33# If no clock division is performed on the input clock inside the AVR (via the
34# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
35F_USB = $(F_CPU)
36
37# Interrupt driven control endpoint task(+60)
38OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
39
40
41# Bootloader selection
42# Teensy halfkay
43# Pro Micro caterina
44# Atmel DFU atmel-dfu
45# LUFA DFU lufa-dfu
46# QMK DFU qmk-dfu
47# atmega32a bootloadHID
48BOOTLOADER = caterina
49
50
51# If you don't know the bootloader type, then you can specify the
52# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
53# Teensy halfKay 512
54# Teensy++ halfKay 1024
55# Atmel DFU loader 4096
56# LUFA bootloader 4096
57# USBaspLoader 2048
58# OPT_DEFS += -DBOOTLOADER_SIZE=4096
diff --git a/keyboards/atreus/atreus.c b/keyboards/atreus/atreus.c
index 263ec8732..33bb5f35a 100644
--- a/keyboards/atreus/atreus.c
+++ b/keyboards/atreus/atreus.c
@@ -1 +1,17 @@
1#include "atreus.h" \ No newline at end of file 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
17#include "atreus.h"
diff --git a/keyboards/atreus/atreus.h b/keyboards/atreus/atreus.h
index 8e868ecc0..889a162a2 100644
--- a/keyboards/atreus/atreus.h
+++ b/keyboards/atreus/atreus.h
@@ -1,10 +1,28 @@
1#ifndef ATREUS_H 1/* Copyright 2019
2#define ATREUS_H 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#pragma once
3 17
4#include "quantum.h" 18#include "quantum.h"
5#include "matrix.h" 19#define ___ KC_NO
6#include "backlight.h" 20
7#include <stddef.h> 21#ifdef KEYBOARD_atreus_astar
22 #include "astar.h"
23#elif KEYBOARD_atreus_teensy2
24 #include "teensy2.h"
25#endif
8 26
9// This a shortcut to help you visually see your layout. 27// This a shortcut to help you visually see your layout.
10// The first section contains all of the arguements 28// The first section contains all of the arguements
@@ -16,10 +34,8 @@
16 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ 34 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
17) \ 35) \
18{ \ 36{ \
19 { k00, k01, k02, k03, k04, KC_NO, k05, k06, k07, k08, k09 }, \ 37 { k00, k01, k02, k03, k04, ___, k05, k06, k07, k08, k09 }, \
20 { k10, k11, k12, k13, k14, KC_NO, k15, k16, k17, k18, k19 }, \ 38 { k10, k11, k12, k13, k14, ___, k15, k16, k17, k18, k19 }, \
21 { k20, k21, k22, k23, k24, k35, k25, k26, k27, k28, k29 }, \ 39 { k20, k21, k22, k23, k24, k35, k25, k26, k27, k28, k29 }, \
22 { k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a, k3b } \ 40 { k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a, k3b } \
23} 41}
24
25#endif
diff --git a/keyboards/atreus/config.h b/keyboards/atreus/config.h
index b1559a29d..d18201443 100644
--- a/keyboards/atreus/config.h
+++ b/keyboards/atreus/config.h
@@ -1,22 +1,20 @@
1/* 1/* Copyright 2019
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2 *
3 3 * This program is free software: you can redistribute it and/or modify
4This 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
5it under the terms of the GNU General Public License as published by 5 * the Free Software Foundation, either version 2 of the License, or
6the Free Software Foundation, either version 2 of the License, or 6 * (at your option) any later version.
7(at your option) any later version. 7 *
8 8 * This program is distributed in the hope that it will be useful,
9This program is distributed in the hope that it will be useful, 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * GNU General Public License for more details.
12GNU General Public License for more details. 12 *
13 13 * You should have received a copy of the GNU General Public License
14You should have received a copy of the GNU General Public License 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15 */
16*/
17 16
18#ifndef CONFIG_H 17#pragma once
19#define CONFIG_H
20 18
21#include "config_common.h" 19#include "config_common.h"
22 20
@@ -27,31 +25,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define DEVICE_VER 0x0008 25#define DEVICE_VER 0x0008
28#define MANUFACTURER Technomancy 26#define MANUFACTURER Technomancy
29#define PRODUCT Atreus 27#define PRODUCT Atreus
30#define DESCRIPTION q.m.k. keyboard firmware for Atreus 28#define DESCRIPTION QMK keyboard firmware for Atreus
31 29
32/* key matrix size */ 30/* key matrix size */
33#define MATRIX_ROWS 4 31#define MATRIX_ROWS 4
34#define MATRIX_COLS 11 32#define MATRIX_COLS 11
35 33
36// Change this to how you wired your keyboard
37// COLS: Left to right, ROWS: Top to bottom
38#if defined(ATREUS_ASTAR)
39# define MATRIX_ROW_PINS { D0, D1, D3, D2 }
40#if defined(PCBDOWN)
41# define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
42#else
43# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
44#endif
45# define UNUSED_PINS
46#elif defined(ATREUS_TEENSY2)
47# define MATRIX_ROW_PINS { D0, D1, D2, D3 }
48# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
49# define UNUSED_PINS
50#endif
51
52/* COL2ROW or ROW2COL */
53#define DIODE_DIRECTION COL2ROW
54
55/* define if matrix has ghost */ 34/* define if matrix has ghost */
56//#define MATRIX_HAS_GHOST 35//#define MATRIX_HAS_GHOST
57 36
@@ -83,5 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
83//#define NO_ACTION_ONESHOT 62//#define NO_ACTION_ONESHOT
84//#define NO_ACTION_MACRO 63//#define NO_ACTION_MACRO
85//#define NO_ACTION_FUNCTION 64//#define NO_ACTION_FUNCTION
86
87#endif
diff --git a/keyboards/atreus/keymaps/alphadox/config.h b/keyboards/atreus/keymaps/alphadox/config.h
index e998e5edc..271f48d00 100644
--- a/keyboards/atreus/keymaps/alphadox/config.h
+++ b/keyboards/atreus/keymaps/alphadox/config.h
@@ -1,75 +1,3 @@
1/* 1#pragma once
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3 2
4This program is free software: you can redistribute it and/or modify 3// place overrides here
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#ifndef CONFIG_H
19#define CONFIG_H
20
21#include "config_common.h"
22
23/* USB Device descriptor parameter */
24
25#define VENDOR_ID 0xFEED
26#define PRODUCT_ID 0x6060
27#define DEVICE_VER 0x0001
28#define MANUFACTURER Arbitrary Definitions
29#define PRODUCT Planckeus
30#define DESCRIPTION q.m.k. keyboard firmware for Planckeus
31
32/* key matrix size */
33#define MATRIX_ROWS 4
34#define MATRIX_COLS 11
35
36#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
37#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, B0, B1, B2, B3, B7 }
38#define UNUSED_PINS
39
40/* COL2ROW or ROW2COL */
41#define DIODE_DIRECTION COL2ROW
42
43/* define if matrix has ghost */
44//#define MATRIX_HAS_GHOST
45
46/* number of backlight levels */
47//#define BACKLIGHT_LEVELS 3
48
49/* Set 0 if debouncing isn't needed */
50#define DEBOUNCE 5
51
52/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
53#define LOCKING_SUPPORT_ENABLE
54/* Locking resynchronize hack */
55#define LOCKING_RESYNC_ENABLE
56
57/*
58 * Feature disable options
59 * These options are also useful to firmware size reduction.
60 */
61
62/* disable debug print */
63//#define NO_DEBUG
64
65/* disable print */
66//#define NO_PRINT
67
68/* disable action features */
69//#define NO_ACTION_LAYER
70//#define NO_ACTION_TAPPING
71//#define NO_ACTION_ONESHOT
72//#define NO_ACTION_MACRO
73//#define NO_ACTION_FUNCTION
74
75#endif
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/config.h b/keyboards/atreus/keymaps/dvorak_42_key/config.h
index 12a221d7f..ac5db196d 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/config.h
+++ b/keyboards/atreus/keymaps/dvorak_42_key/config.h
@@ -1,24 +1,6 @@
1/* 1#pragma once
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3 2
4This program is free software: you can redistribute it and/or modify 3// place overrides here
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#ifndef CONFIG_H
19#define CONFIG_H
20
21#include "config_common.h"
22 4
23// mouse speed 5// mouse speed
24 6
@@ -31,69 +13,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
31#define MOUSEKEY_WHEEL_DELTA 1 13#define MOUSEKEY_WHEEL_DELTA 1
32#define MOUSEKEY_WHEEL_MAX_SPEED 1 14#define MOUSEKEY_WHEEL_MAX_SPEED 1
33#define MOUSEKEY_WHEEL_TIME_TO_MAX 100 15#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
34
35/* USB Device descriptor parameter */
36
37#define VENDOR_ID 0xFEED
38#define PRODUCT_ID 0x6060
39#define DEVICE_VER 0x0001
40#define MANUFACTURER Technomancy
41#define PRODUCT Atreus
42#define DESCRIPTION q.m.k. keyboard firmware for Atreus
43
44/* key matrix size */
45#define MATRIX_ROWS 4
46#define MATRIX_COLS 11
47
48// Change this to how you wired your keyboard
49// COLS: Left to right, ROWS: Top to bottom
50#if defined(ATREUS_ASTAR)
51# define MATRIX_ROW_PINS { D0, D1, D3, D2 }
52#if defined(PCBDOWN)
53# define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
54#else
55# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
56#endif
57# define UNUSED_PINS
58#elif defined(ATREUS_TEENSY2)
59# define MATRIX_ROW_PINS { D0, D1, D2, D3 }
60# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
61# define UNUSED_PINS
62#endif
63
64/* COL2ROW or ROW2COL */
65#define DIODE_DIRECTION COL2ROW
66
67/* define if matrix has ghost */
68//#define MATRIX_HAS_GHOST
69
70/* number of backlight levels */
71//#define BACKLIGHT_LEVELS 3
72
73/* Set 0 if debouncing isn't needed */
74#define DEBOUNCE 5
75
76/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
77#define LOCKING_SUPPORT_ENABLE
78/* Locking resynchronize hack */
79#define LOCKING_RESYNC_ENABLE
80
81/*
82 * Feature disable options
83 * These options are also useful to firmware size reduction.
84 */
85
86/* disable debug print */
87//#define NO_DEBUG
88
89/* disable print */
90//#define NO_PRINT
91
92/* disable action features */
93//#define NO_ACTION_LAYER
94//#define NO_ACTION_TAPPING
95//#define NO_ACTION_ONESHOT
96//#define NO_ACTION_MACRO
97//#define NO_ACTION_FUNCTION
98
99#endif
diff --git a/keyboards/atreus/keymaps/erlandsona/config.h b/keyboards/atreus/keymaps/erlandsona/config.h
index 4a7ade96a..aa1d8445c 100644
--- a/keyboards/atreus/keymaps/erlandsona/config.h
+++ b/keyboards/atreus/keymaps/erlandsona/config.h
@@ -1,90 +1,6 @@
1/* 1#pragma once
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3 2
4This program is free software: you can redistribute it and/or modify 3// place overrides here
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#ifndef CONFIG_H
19#define CONFIG_H
20
21#include "config_common.h"
22 4
23/* Make Overloaded Keys switch faster */ 5/* Make Overloaded Keys switch faster */
24#define TAPPING_TERM 150 6#define TAPPING_TERM 150
25
26/* USB Device descriptor parameter */
27
28#define VENDOR_ID 0xFEED
29#define PRODUCT_ID 0x6060
30#define DEVICE_VER 0x0001
31#define MANUFACTURER Technomancy
32#define PRODUCT Atreus
33#define DESCRIPTION q.m.k. keyboard firmware for Atreus
34
35/* key matrix size */
36#define MATRIX_ROWS 4
37#define MATRIX_COLS 11
38
39// Change this to how you wired your keyboard
40// COLS: Left to right, ROWS: Top to bottom
41#if defined(ATREUS_ASTAR)
42# define MATRIX_ROW_PINS { D0, D1, D3, D2 }
43#if defined(PCBDOWN)
44# define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
45#else
46# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
47#endif
48# define UNUSED_PINS
49#elif defined(ATREUS_TEENSY2)
50# define MATRIX_ROW_PINS { D0, D1, D2, D3 }
51# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
52# define UNUSED_PINS
53#endif
54
55/* COL2ROW or ROW2COL */
56#define DIODE_DIRECTION COL2ROW
57
58/* define if matrix has ghost */
59//#define MATRIX_HAS_GHOST
60
61/* number of backlight levels */
62//#define BACKLIGHT_LEVELS 3
63
64/* Set 0 if debouncing isn't needed */
65#define DEBOUNCE 5
66
67/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
68#define LOCKING_SUPPORT_ENABLE
69/* Locking resynchronize hack */
70#define LOCKING_RESYNC_ENABLE
71
72/*
73 * Feature disable options
74 * These options are also useful to firmware size reduction.
75 */
76
77/* disable debug print */
78//#define NO_DEBUG
79
80/* disable print */
81//#define NO_PRINT
82
83/* disable action features */
84//#define NO_ACTION_LAYER
85//#define NO_ACTION_TAPPING
86//#define NO_ACTION_ONESHOT
87//#define NO_ACTION_MACRO
88//#define NO_ACTION_FUNCTION
89
90#endif
diff --git a/keyboards/atreus/readme.md b/keyboards/atreus/readme.md
index 5cd797da9..0dbd098ca 100644
--- a/keyboards/atreus/readme.md
+++ b/keyboards/atreus/readme.md
@@ -1,5 +1,6 @@
1Atreus 1# Atreus
2====== 2
3![Atreus](https://atreus.technomancy.us/photos/1.jpg)
3 4
4A small mechanical keyboard that is based around the shape of the human hand. 5A small mechanical keyboard that is based around the shape of the human hand.
5 6
@@ -9,16 +10,19 @@ Hardware Availability: https://atreus.technomancy.us
9 10
10These configuration files are specifically for the Atreus keyboards created by Phil Hagelberg (@technomancy). This keyboard is available in two variants: one powered by a Teensy 2 (usually hand-wired), one powered by an A-Star (usually using a PCB). You will need to use different `make` commands depending on the variant you have; see examples below. 11These configuration files are specifically for the Atreus keyboards created by Phil Hagelberg (@technomancy). This keyboard is available in two variants: one powered by a Teensy 2 (usually hand-wired), one powered by an A-Star (usually using a PCB). You will need to use different `make` commands depending on the variant you have; see examples below.
11 12
12A-Star:\ 13Make example for this keyboard (after setting up your build environment):
13`make atreus:default:avrdude` 14
15 make atreus:default:avrdude
16
17If you would like to use one of the alternative controllers:
18
19 make atreus/astar:default:avrdude
20 make atreus/teensy2:default:teensy
14 21
15Teensy:\
16`make TEENSY2=yes atreus:default:teensy`
17
18If your keyboard layout is a mirror image of what you expected (i.e. you do not get QWERTY on the left but YTREWQ on the right), then you have an A-Star powered Atreus (older than March 2016) with PCB labels facing *down* instead of up. Specify that by adding `PCBDOWN=yes` to your `make` commands, e.g. 22If your keyboard layout is a mirror image of what you expected (i.e. you do not get QWERTY on the left but YTREWQ on the right), then you have an A-Star powered Atreus (older than March 2016) with PCB labels facing *down* instead of up. Specify that by adding `PCBDOWN=yes` to your `make` commands, e.g.
19 23
20`make PCBDOWN=yes atreus:default:avrdude` 24 make PCBDOWN=yes atreus:default:avrdude
21 25
22*Unlike the TMK firmware, these commands should be run from the root of the repository, not the directory containing this readme.* 26*Unlike the TMK firmware, these commands should be run from the root of the repository, not the directory containing this readme.*
23 27
24See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools), then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 28See 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/atreus/rules.mk b/keyboards/atreus/rules.mk
index eda77404a..403b0b0ca 100644
--- a/keyboards/atreus/rules.mk
+++ b/keyboards/atreus/rules.mk
@@ -1,75 +1,7 @@
1# MCU name
2MCU = atmega32u4
3
4# Processor frequency.
5# This will define a symbol, F_CPU, in all source code files equal to the
6# processor frequency in Hz. You can then use this symbol in your source code to
7# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
8# automatically to create a 32-bit value in your source code.
9#
10# This will be an integer division of F_USB below, as it is sourced by
11# F_USB after it has run through any CPU prescalers. Note that this value
12# does not *change* the processor frequency - it should merely be updated to
13# reflect the processor speed set externally so that the code can use accurate
14# software delays.
15F_CPU = 16000000
16
17#
18# LUFA specific
19#
20# Target architecture (see library "Board Types" documentation).
21ARCH = AVR8
22
23# Input clock frequency.
24# This will define a symbol, F_USB, in all source code files equal to the
25# input clock frequency (before any prescaling is performed) in Hz. This value may
26# differ from F_CPU if prescaling is used on the latter, and is required as the
27# raw input clock is fed directly to the PLL sections of the AVR for high speed
28# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
29# at the end, this will be done automatically to create a 32-bit value in your
30# source code.
31#
32# If no clock division is performed on the input clock inside the AVR (via the
33# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
34F_USB = $(F_CPU)
35
36# Interrupt driven control endpoint task(+60)
37OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
38
39
40# Bootloader selection
41# Teensy halfkay
42# Pro Micro caterina
43# Atmel DFU atmel-dfu
44# LUFA DFU lufa-dfu
45# QMK DFU qmk-dfu
46# atmega32a bootloadHID
47ifdef TEENSY2
48 BOOTLOADER = halfkay
49 OPT_DEFS += -DATREUS_TEENSY2
50else
51 BOOTLOADER = caterina
52 OPT_DEFS += -DATREUS_ASTAR
53 ifdef PCBDOWN
54 OPT_DEFS += -DPCBDOWN
55 endif
56endif
57
58
59# If you don't know the bootloader type, then you can specify the
60# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
61# Teensy halfKay 512
62# Teensy++ halfKay 1024
63# Atmel DFU loader 4096
64# LUFA bootloader 4096
65# USBaspLoader 2048
66# OPT_DEFS += -DBOOTLOADER_SIZE=4096
67
68
69# Build Options 1# Build Options
70# change yes to no to disable 2# change yes to no to disable
71# 3#
72BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 4BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
73MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 5MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
74EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 6EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
75CONSOLE_ENABLE = yes # Console for debug(+400) 7CONSOLE_ENABLE = yes # Console for debug(+400)
@@ -77,12 +9,14 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
77# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 9# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
78SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 10SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
79# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 11# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
80NKRO_ENABLE = yes # USB Nkey Rollover 12NKRO_ENABLE = yes # USB Nkey Rollover
81BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
82RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
83MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 15MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
84UNICODE_ENABLE = yes # Unicode 16UNICODE_ENABLE = yes # Unicode
85BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 17BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
86AUDIO_ENABLE = no # Audio output on port C6 18AUDIO_ENABLE = no # Audio output on port C6
87FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches 19FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
88HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) 20HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
21
22DEFAULT_FOLDER = atreus/astar
diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h
new file mode 100644
index 000000000..4130ef9bb
--- /dev/null
+++ b/keyboards/atreus/teensy2/config.h
@@ -0,0 +1,36 @@
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
17#pragma once
18
19#include "config_common.h"
20
21/*
22 * Keyboard Matrix Assignments
23 *
24 * Change this to how you wired your keyboard
25 * COLS: AVR pins used for columns, left to right
26 * ROWS: AVR pins used for rows, top to bottom
27 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29 *
30*/
31#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
32#define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
33#define UNUSED_PINS
34
35/* COL2ROW, ROW2COL*/
36#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/teensy2/rules.mk b/keyboards/atreus/teensy2/rules.mk
new file mode 100644
index 000000000..3fb7c7e5a
--- /dev/null
+++ b/keyboards/atreus/teensy2/rules.mk
@@ -0,0 +1,58 @@
1# MCU name
2MCU = atmega32u4
3
4# Processor frequency.
5# This will define a symbol, F_CPU, in all source code files equal to the
6# processor frequency in Hz. You can then use this symbol in your source code to
7# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
8# automatically to create a 32-bit value in your source code.
9#
10# This will be an integer division of F_USB below, as it is sourced by
11# F_USB after it has run through any CPU prescalers. Note that this value
12# does not *change* the processor frequency - it should merely be updated to
13# reflect the processor speed set externally so that the code can use accurate
14# software delays.
15F_CPU = 16000000
16
17
18#
19# LUFA specific
20#
21# Target architecture (see library "Board Types" documentation).
22ARCH = AVR8
23
24# Input clock frequency.
25# This will define a symbol, F_USB, in all source code files equal to the
26# input clock frequency (before any prescaling is performed) in Hz. This value may
27# differ from F_CPU if prescaling is used on the latter, and is required as the
28# raw input clock is fed directly to the PLL sections of the AVR for high speed
29# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
30# at the end, this will be done automatically to create a 32-bit value in your
31# source code.
32#
33# If no clock division is performed on the input clock inside the AVR (via the
34# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
35F_USB = $(F_CPU)
36
37# Interrupt driven control endpoint task(+60)
38OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
39
40
41# Bootloader selection
42# Teensy halfkay
43# Pro Micro caterina
44# Atmel DFU atmel-dfu
45# LUFA DFU lufa-dfu
46# QMK DFU qmk-dfu
47# atmega32a bootloadHID
48BOOTLOADER = halfkay
49
50
51# If you don't know the bootloader type, then you can specify the
52# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
53# Teensy halfKay 512
54# Teensy++ halfKay 1024
55# Atmel DFU loader 4096
56# LUFA bootloader 4096
57# USBaspLoader 2048
58# OPT_DEFS += -DBOOTLOADER_SIZE=4096
diff --git a/keyboards/atreus/teensy2/teensy2.c b/keyboards/atreus/teensy2/teensy2.c
new file mode 100644
index 000000000..19490deb9
--- /dev/null
+++ b/keyboards/atreus/teensy2/teensy2.c
@@ -0,0 +1,16 @@
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 "atreus.h"
diff --git a/keyboards/atreus/teensy2/teensy2.h b/keyboards/atreus/teensy2/teensy2.h
new file mode 100644
index 000000000..bf74ceb17
--- /dev/null
+++ b/keyboards/atreus/teensy2/teensy2.h
@@ -0,0 +1,17 @@
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
17#pragma once
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 22:18:59 +0000