diff options
-rw-r--r-- | quantum/template/avr/config.h | 186 | ||||
-rw-r--r-- | quantum/template/avr/readme.md | 10 | ||||
-rw-r--r-- | quantum/template/avr/rules.mk | 18 | ||||
-rw-r--r-- | quantum/template/base/info.json | 11 | ||||
-rw-r--r-- | quantum/template/base/keyboard.c | 33 | ||||
-rw-r--r-- | quantum/template/base/keyboard.h | 3 | ||||
-rw-r--r-- | quantum/template/base/keymaps/default/config.h | 19 | ||||
-rw-r--r-- | quantum/template/base/keymaps/default/keymap.c | 14 | ||||
-rw-r--r-- | quantum/template/ps2avrgb/config.h | 122 | ||||
-rw-r--r-- | quantum/template/ps2avrgb/readme.md | 6 | ||||
-rw-r--r-- | quantum/template/ps2avrgb/rules.mk | 19 | ||||
-rwxr-xr-x | util/new_keyboard.sh | 2 |
12 files changed, 172 insertions, 271 deletions
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h index 88402fbdd..8b0961f24 100644 --- a/quantum/template/avr/config.h +++ b/quantum/template/avr/config.h | |||
@@ -20,12 +20,12 @@ 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 0xFEED |
24 | #define PRODUCT_ID 0x0000 | 24 | #define PRODUCT_ID 0x0000 |
25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
26 | #define MANUFACTURER %YOUR_NAME% | 26 | #define MANUFACTURER %YOUR_NAME% |
27 | #define PRODUCT %KEYBOARD% | 27 | #define PRODUCT %KEYBOARD% |
28 | #define DESCRIPTION A custom keyboard | 28 | #define DESCRIPTION A custom keyboard |
29 | 29 | ||
30 | /* key matrix size */ | 30 | /* key matrix size */ |
31 | #define MATRIX_ROWS 2 | 31 | #define MATRIX_ROWS 2 |
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
45 | #define MATRIX_COL_PINS { F1, F0, B0 } | 45 | #define MATRIX_COL_PINS { F1, F0, B0 } |
46 | #define UNUSED_PINS | 46 | #define UNUSED_PINS |
47 | 47 | ||
48 | /* COL2ROW, ROW2COL*/ | 48 | /* COL2ROW, ROW2COL */ |
49 | #define DIODE_DIRECTION COL2ROW | 49 | #define DIODE_DIRECTION COL2ROW |
50 | 50 | ||
51 | /* | 51 | /* |
@@ -53,37 +53,37 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
53 | */ | 53 | */ |
54 | #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 | 54 | #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 |
55 | 55 | ||
56 | // #define BACKLIGHT_PIN B7 | 56 | //#define BACKLIGHT_PIN B7 |
57 | // #define BACKLIGHT_BREATHING | 57 | //#define BACKLIGHT_LEVELS 3 |
58 | // #define BACKLIGHT_LEVELS 3 | 58 | //#define BACKLIGHT_BREATHING |
59 | 59 | ||
60 | // #define RGB_DI_PIN E2 | 60 | //#define RGB_DI_PIN E2 |
61 | // #ifdef RGB_DI_PIN | 61 | //#ifdef RGB_DI_PIN |
62 | // #define RGBLED_NUM 16 | 62 | //# define RGBLED_NUM 16 |
63 | // #define RGBLIGHT_HUE_STEP 8 | 63 | //# define RGBLIGHT_HUE_STEP 8 |
64 | // #define RGBLIGHT_SAT_STEP 8 | 64 | //# define RGBLIGHT_SAT_STEP 8 |
65 | // #define RGBLIGHT_VAL_STEP 8 | 65 | //# define RGBLIGHT_VAL_STEP 8 |
66 | // #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ | 66 | //# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ |
67 | // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ | 67 | //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ |
68 | // /*== all animations enable ==*/ | 68 | /*== all animations enable ==*/ |
69 | // #define RGBLIGHT_ANIMATIONS | 69 | //# define RGBLIGHT_ANIMATIONS |
70 | // /*== or choose animations ==*/ | 70 | /*== or choose animations ==*/ |
71 | // #define RGBLIGHT_EFFECT_BREATHING | 71 | //# define RGBLIGHT_EFFECT_BREATHING |
72 | // #define RGBLIGHT_EFFECT_RAINBOW_MOOD | 72 | //# define RGBLIGHT_EFFECT_RAINBOW_MOOD |
73 | // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | 73 | //# define RGBLIGHT_EFFECT_RAINBOW_SWIRL |
74 | // #define RGBLIGHT_EFFECT_SNAKE | 74 | //# define RGBLIGHT_EFFECT_SNAKE |
75 | // #define RGBLIGHT_EFFECT_KNIGHT | 75 | //# define RGBLIGHT_EFFECT_KNIGHT |
76 | // #define RGBLIGHT_EFFECT_CHRISTMAS | 76 | //# define RGBLIGHT_EFFECT_CHRISTMAS |
77 | // #define RGBLIGHT_EFFECT_STATIC_GRADIENT | 77 | //# define RGBLIGHT_EFFECT_STATIC_GRADIENT |
78 | // #define RGBLIGHT_EFFECT_RGB_TEST | 78 | //# define RGBLIGHT_EFFECT_RGB_TEST |
79 | // #define RGBLIGHT_EFFECT_ALTERNATING | 79 | //# define RGBLIGHT_EFFECT_ALTERNATING |
80 | // /*== customize breathing effect ==*/ | 80 | /*== customize breathing effect ==*/ |
81 | // /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ | 81 | /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ |
82 | // #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 | 82 | //# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 |
83 | // /*==== use exp() and sin() ====*/ | 83 | /*==== use exp() and sin() ====*/ |
84 | // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 | 84 | //# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 |
85 | // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 | 85 | //# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 |
86 | // #endif | 86 | //#endif |
87 | 87 | ||
88 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 88 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
89 | #define DEBOUNCE 5 | 89 | #define DEBOUNCE 5 |
@@ -97,9 +97,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
97 | #define LOCKING_RESYNC_ENABLE | 97 | #define LOCKING_RESYNC_ENABLE |
98 | 98 | ||
99 | /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. | 99 | /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. |
100 | * This is userful for the Windows task manager shortcut (ctrl+shift+esc). | 100 | * This is useful for the Windows task manager shortcut (ctrl+shift+esc). |
101 | */ | 101 | */ |
102 | // #define GRAVE_ESC_CTRL_OVERRIDE | 102 | //#define GRAVE_ESC_CTRL_OVERRIDE |
103 | 103 | ||
104 | /* | 104 | /* |
105 | * Force NKRO | 105 | * Force NKRO |
@@ -123,59 +123,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
123 | //#define FORCE_NKRO | 123 | //#define FORCE_NKRO |
124 | 124 | ||
125 | /* | 125 | /* |
126 | * Magic Key Options | ||
127 | * | ||
128 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
129 | * the keyboard. They are best used in combination with the HID Listen program, | ||
130 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
131 | * | ||
132 | * The options below allow the magic key functionality to be changed. This is | ||
133 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
134 | * | ||
135 | */ | ||
136 | |||
137 | /* key combination for magic key command */ | ||
138 | /* defined by default; to change, uncomment and set to the combination you want */ | ||
139 | // #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) | ||
140 | |||
141 | /* control how magic key switches layers */ | ||
142 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
143 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
144 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
145 | |||
146 | /* override magic key keymap */ | ||
147 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
148 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
149 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
150 | //#define MAGIC_KEY_HELP H | ||
151 | //#define MAGIC_KEY_HELP_ALT SLASH | ||
152 | //#define MAGIC_KEY_DEBUG D | ||
153 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
154 | //#define MAGIC_KEY_DEBUG_KBD K | ||
155 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
156 | //#define MAGIC_KEY_VERSION V | ||
157 | //#define MAGIC_KEY_STATUS S | ||
158 | //#define MAGIC_KEY_CONSOLE C | ||
159 | //#define MAGIC_KEY_LAYER0 0 | ||
160 | //#define MAGIC_KEY_LAYER0_ALT GRAVE | ||
161 | //#define MAGIC_KEY_LAYER1 1 | ||
162 | //#define MAGIC_KEY_LAYER2 2 | ||
163 | //#define MAGIC_KEY_LAYER3 3 | ||
164 | //#define MAGIC_KEY_LAYER4 4 | ||
165 | //#define MAGIC_KEY_LAYER5 5 | ||
166 | //#define MAGIC_KEY_LAYER6 6 | ||
167 | //#define MAGIC_KEY_LAYER7 7 | ||
168 | //#define MAGIC_KEY_LAYER8 8 | ||
169 | //#define MAGIC_KEY_LAYER9 9 | ||
170 | //#define MAGIC_KEY_BOOTLOADER B | ||
171 | //#define MAGIC_KEY_BOOTLOADER_ALT ESC | ||
172 | //#define MAGIC_KEY_LOCK CAPS | ||
173 | //#define MAGIC_KEY_EEPROM E | ||
174 | //#define MAGIC_KEY_EEPROM_CLEAR BSPACE | ||
175 | //#define MAGIC_KEY_NKRO N | ||
176 | //#define MAGIC_KEY_SLEEP_LED Z | ||
177 | |||
178 | /* | ||
179 | * Feature disable options | 126 | * Feature disable options |
180 | * These options are also useful to firmware size reduction. | 127 | * These options are also useful to firmware size reduction. |
181 | */ | 128 | */ |
@@ -195,57 +142,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
195 | #define NO_ACTION_MACRO | 142 | #define NO_ACTION_MACRO |
196 | #define NO_ACTION_FUNCTION | 143 | #define NO_ACTION_FUNCTION |
197 | 144 | ||
198 | /* | ||
199 | * MIDI options | ||
200 | */ | ||
201 | |||
202 | /* Prevent use of disabled MIDI features in the keymap */ | ||
203 | //#define MIDI_ENABLE_STRICT 1 | ||
204 | |||
205 | /* enable basic MIDI features: | ||
206 | - MIDI notes can be sent when in Music mode is on | ||
207 | */ | ||
208 | //#define MIDI_BASIC | ||
209 | |||
210 | /* enable advanced MIDI features: | ||
211 | - MIDI notes can be added to the keymap | ||
212 | - Octave shift and transpose | ||
213 | - Virtual sustain, portamento, and modulation wheel | ||
214 | - etc. | ||
215 | */ | ||
216 | //#define MIDI_ADVANCED | ||
217 | |||
218 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
219 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
220 | |||
221 | /* | ||
222 | * HD44780 LCD Display Configuration | ||
223 | */ | ||
224 | /* | ||
225 | #define LCD_LINES 2 //< number of visible lines of the display | ||
226 | #define LCD_DISP_LENGTH 16 //< visibles characters per line of the display | ||
227 | |||
228 | #define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode | ||
229 | |||
230 | #if LCD_IO_MODE | ||
231 | #define LCD_PORT PORTB //< port for the LCD lines | ||
232 | #define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 | ||
233 | #define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 | ||
234 | #define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 | ||
235 | #define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 | ||
236 | #define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 | ||
237 | #define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 | ||
238 | #define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 | ||
239 | #define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 | ||
240 | #define LCD_RS_PORT LCD_PORT //< port for RS line | ||
241 | #define LCD_RS_PIN 3 //< pin for RS line | ||
242 | #define LCD_RW_PORT LCD_PORT //< port for RW line | ||
243 | #define LCD_RW_PIN 2 //< pin for RW line | ||
244 | #define LCD_E_PORT LCD_PORT //< port for Enable line | ||
245 | #define LCD_E_PIN 1 //< pin for Enable line | ||
246 | #endif | ||
247 | */ | ||
248 | |||
249 | /* Bootmagic Lite key configuration */ | 145 | /* Bootmagic Lite key configuration */ |
250 | // #define BOOTMAGIC_LITE_ROW 0 | 146 | //#define BOOTMAGIC_LITE_ROW 0 |
251 | // #define BOOTMAGIC_LITE_COLUMN 0 | 147 | //#define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/quantum/template/avr/readme.md b/quantum/template/avr/readme.md index 0430dd0fc..fd1455842 100644 --- a/quantum/template/avr/readme.md +++ b/quantum/template/avr/readme.md | |||
@@ -2,14 +2,18 @@ | |||
2 | 2 | ||
3 |  | 3 |  |
4 | 4 | ||
5 | A short description of the keyboard/project | 5 | *A short description of the keyboard/project* |
6 | 6 | ||
7 | * Keyboard Maintainer: [%YOUR_NAME%](https://github.com/yourusername) | 7 | * Keyboard Maintainer: [%YOUR_NAME%](https://github.com/yourusername) |
8 | * Hardware Supported: The PCBs, controllers supported | 8 | * Hardware Supported: *The PCBs, controllers supported* |
9 | * Hardware Availability: Links to where you can find this hardware | 9 | * Hardware Availability: *Links to where you can find this hardware* |
10 | 10 | ||
11 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
12 | 12 | ||
13 | make %KEYBOARD%:default | 13 | make %KEYBOARD%:default |
14 | 14 | ||
15 | Flashing example for this keyboard: | ||
16 | |||
17 | make %KEYBOARD%:default:flash | ||
18 | |||
15 | 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). | 19 | 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/quantum/template/avr/rules.mk b/quantum/template/avr/rules.mk index 2ea91a301..5c0d8f307 100644 --- a/quantum/template/avr/rules.mk +++ b/quantum/template/avr/rules.mk | |||
@@ -2,31 +2,21 @@ | |||
2 | MCU = atmega32u4 | 2 | MCU = atmega32u4 |
3 | 3 | ||
4 | # Bootloader selection | 4 | # Bootloader selection |
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | 5 | BOOTLOADER = atmel-dfu |
13 | 6 | ||
14 | # Build Options | 7 | # Build Options |
15 | # change yes to no to disable | 8 | # change yes to no to disable |
16 | # | 9 | # |
17 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
18 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
20 | CONSOLE_ENABLE = yes # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
21 | COMMAND_ENABLE = yes # Commands for debug and configuration | 14 | COMMAND_ENABLE = no # Commands for debug and configuration |
22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
25 | NKRO_ENABLE = no # USB Nkey Rollover | 18 | NKRO_ENABLE = no # USB Nkey Rollover |
26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
28 | MIDI_ENABLE = no # MIDI support | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
30 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
31 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | ||
32 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs | ||
diff --git a/quantum/template/base/info.json b/quantum/template/base/info.json index b8e8f1f2d..af14d8799 100644 --- a/quantum/template/base/info.json +++ b/quantum/template/base/info.json | |||
@@ -7,11 +7,12 @@ | |||
7 | "layouts": { | 7 | "layouts": { |
8 | "LAYOUT": { | 8 | "LAYOUT": { |
9 | "layout": [ | 9 | "layout": [ |
10 | {"label":"k00", "x":0, "y":0}, | 10 | {"label": "k00", "x": 0, "y": 0}, |
11 | {"label":"k01", "x":1, "y":0}, | 11 | {"label": "k01", "x": 1, "y": 0}, |
12 | {"label":"k02", "x":2, "y":0}, | 12 | {"label": "k02", "x": 2, "y": 0}, |
13 | {"label":"k10", "x":0, "y":1, "w":1.5}, | 13 | |
14 | {"label":"k12", "x":1.5, "y":1, "w":1.5} | 14 | {"label": "k10", "x": 0, "y": 1, "w": 1.5}, |
15 | {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} | ||
15 | ] | 16 | ] |
16 | } | 17 | } |
17 | } | 18 | } |
diff --git a/quantum/template/base/keyboard.c b/quantum/template/base/keyboard.c index fc31c294a..f69ae16ed 100644 --- a/quantum/template/base/keyboard.c +++ b/quantum/template/base/keyboard.c | |||
@@ -15,36 +15,3 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "%KEYBOARD%.h" | 17 | #include "%KEYBOARD%.h" |
18 | |||
19 | // Optional override functions below. | ||
20 | // You can leave any or all of these undefined. | ||
21 | // These are only required if you want to perform custom actions. | ||
22 | |||
23 | /* | ||
24 | void matrix_init_kb(void) { | ||
25 | // put your keyboard start-up code here | ||
26 | // runs once when the firmware starts up | ||
27 | |||
28 | matrix_init_user(); | ||
29 | } | ||
30 | |||
31 | void matrix_scan_kb(void) { | ||
32 | // put your looping keyboard code here | ||
33 | // runs every cycle (a lot) | ||
34 | |||
35 | matrix_scan_user(); | ||
36 | } | ||
37 | |||
38 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||
39 | // put your per-action keyboard code here | ||
40 | // runs for every action, just before processing by the firmware | ||
41 | |||
42 | return process_record_user(keycode, record); | ||
43 | } | ||
44 | |||
45 | bool led_update_kb(led_t led_state) { | ||
46 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here | ||
47 | |||
48 | return led_update_user(led_state); | ||
49 | } | ||
50 | */ | ||
diff --git a/quantum/template/base/keyboard.h b/quantum/template/base/keyboard.h index 8a21d9257..bd2e88d12 100644 --- a/quantum/template/base/keyboard.h +++ b/quantum/template/base/keyboard.h | |||
@@ -29,8 +29,7 @@ | |||
29 | #define LAYOUT( \ | 29 | #define LAYOUT( \ |
30 | k00, k01, k02, \ | 30 | k00, k01, k02, \ |
31 | k10, k12 \ | 31 | k10, k12 \ |
32 | ) \ | 32 | ) { \ |
33 | { \ | ||
34 | { k00, k01, k02 }, \ | 33 | { k00, k01, k02 }, \ |
35 | { k10, KC_NO, k12 } \ | 34 | { k10, KC_NO, k12 } \ |
36 | } | 35 | } |
diff --git a/quantum/template/base/keymaps/default/config.h b/quantum/template/base/keymaps/default/config.h deleted file mode 100644 index 5b00c8956..000000000 --- a/quantum/template/base/keymaps/default/config.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* Copyright %YEAR% %YOUR_NAME% | ||
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 | // place overrides here | ||
diff --git a/quantum/template/base/keymaps/default/keymap.c b/quantum/template/base/keymaps/default/keymap.c index af35ccec1..d8020ab3e 100644 --- a/quantum/template/base/keymaps/default/keymap.c +++ b/quantum/template/base/keymaps/default/keymap.c | |||
@@ -60,17 +60,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
60 | } | 60 | } |
61 | return true; | 61 | return true; |
62 | } | 62 | } |
63 | |||
64 | /* | ||
65 | void matrix_init_user(void) { | ||
66 | |||
67 | } | ||
68 | |||
69 | void matrix_scan_user(void) { | ||
70 | |||
71 | } | ||
72 | |||
73 | bool led_update_user(led_t led_state) { | ||
74 | return true; | ||
75 | } | ||
76 | */ | ||
diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h index 3f3fd5fd7..126afbcbd 100644 --- a/quantum/template/ps2avrgb/config.h +++ b/quantum/template/ps2avrgb/config.h | |||
@@ -19,37 +19,121 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
19 | 19 | ||
20 | #include "config_common.h" | 20 | #include "config_common.h" |
21 | 21 | ||
22 | #define VENDOR_ID 0x20A0 | 22 | /* USB Device descriptor parameter */ |
23 | #define PRODUCT_ID 0x422D | 23 | #define VENDOR_ID 0xFEED |
24 | #define DEVICE_VER 0x0001 | 24 | #define PRODUCT_ID 0x0000 |
25 | #define DEVICE_VER 0x0001 | ||
25 | #define MANUFACTURER %YOUR_NAME% | 26 | #define MANUFACTURER %YOUR_NAME% |
26 | #define PRODUCT %KEYBOARD% | 27 | #define PRODUCT %KEYBOARD% |
27 | #define DESCRIPTION A custom keyboard | 28 | #define DESCRIPTION A custom keyboard |
28 | |||
29 | #define RGBLED_NUM 16 | ||
30 | 29 | ||
30 | /* key matrix size */ | ||
31 | #define MATRIX_ROWS 8 | 31 | #define MATRIX_ROWS 8 |
32 | #define MATRIX_COLS 11 | 32 | #define MATRIX_COLS 15 |
33 | 33 | ||
34 | /* | ||
35 | * Keyboard Matrix Assignments | ||
36 | * | ||
37 | * Change this to how you wired your keyboard | ||
38 | * COLS: AVR pins used for columns, left to right | ||
39 | * ROWS: AVR pins used for rows, top to bottom | ||
40 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
41 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
42 | * | ||
43 | */ | ||
34 | #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } | 44 | #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } |
35 | #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 } | 45 | #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } |
36 | // #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, C0, D7 } | 46 | #define UNUSED_PINS |
37 | #define UNUSED_PINS {} | ||
38 | 47 | ||
48 | /* COL2ROW, ROW2COL */ | ||
39 | #define DIODE_DIRECTION COL2ROW | 49 | #define DIODE_DIRECTION COL2ROW |
50 | |||
51 | #define BACKLIGHT_PIN D4 | ||
52 | #define BACKLIGHT_LEVELS 3 | ||
53 | //#define BACKLIGHT_BREATHING | ||
54 | |||
55 | #define RGBLED_NUM 16 | ||
56 | //#define RGBLIGHT_HUE_STEP 8 | ||
57 | //#define RGBLIGHT_SAT_STEP 8 | ||
58 | //#define RGBLIGHT_VAL_STEP 8 | ||
59 | //#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ | ||
60 | //#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ | ||
61 | /*== all animations enable ==*/ | ||
62 | //#define RGBLIGHT_ANIMATIONS | ||
63 | /*== or choose animations ==*/ | ||
64 | //#define RGBLIGHT_EFFECT_BREATHING | ||
65 | //#define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
66 | //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
67 | //#define RGBLIGHT_EFFECT_SNAKE | ||
68 | //#define RGBLIGHT_EFFECT_KNIGHT | ||
69 | //#define RGBLIGHT_EFFECT_CHRISTMAS | ||
70 | //#define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
71 | //#define RGBLIGHT_EFFECT_RGB_TEST | ||
72 | //#define RGBLIGHT_EFFECT_ALTERNATING | ||
73 | /*== customize breathing effect ==*/ | ||
74 | /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ | ||
75 | //#define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 | ||
76 | /*==== use exp() and sin() ====*/ | ||
77 | //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 | ||
78 | //#define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 | ||
79 | |||
80 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
40 | #define DEBOUNCE 5 | 81 | #define DEBOUNCE 5 |
41 | 82 | ||
42 | #define BACKLIGHT_LEVELS 1 | 83 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ |
43 | #define RGBLIGHT_ANIMATIONS | 84 | //#define MATRIX_HAS_GHOST |
85 | |||
86 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||
87 | #define LOCKING_SUPPORT_ENABLE | ||
88 | /* Locking resynchronize hack */ | ||
89 | #define LOCKING_RESYNC_ENABLE | ||
90 | |||
91 | /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. | ||
92 | * This is useful for the Windows task manager shortcut (ctrl+shift+esc). | ||
93 | */ | ||
94 | //#define GRAVE_ESC_CTRL_OVERRIDE | ||
95 | |||
96 | /* | ||
97 | * Force NKRO | ||
98 | * | ||
99 | * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved | ||
100 | * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the | ||
101 | * makefile for this to work.) | ||
102 | * | ||
103 | * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) | ||
104 | * until the next keyboard reset. | ||
105 | * | ||
106 | * NKRO may prevent your keystrokes from being detected in the BIOS, but it is | ||
107 | * fully operational during normal computer usage. | ||
108 | * | ||
109 | * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) | ||
110 | * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by | ||
111 | * bootmagic, NKRO mode will always be enabled until it is toggled again during a | ||
112 | * power-up. | ||
113 | * | ||
114 | */ | ||
115 | //#define FORCE_NKRO | ||
116 | |||
117 | /* | ||
118 | * Feature disable options | ||
119 | * These options are also useful to firmware size reduction. | ||
120 | */ | ||
121 | |||
122 | /* disable debug print */ | ||
123 | //#define NO_DEBUG | ||
124 | |||
125 | /* disable print */ | ||
126 | //#define NO_PRINT | ||
127 | |||
128 | /* disable action features */ | ||
129 | //#define NO_ACTION_LAYER | ||
130 | //#define NO_ACTION_TAPPING | ||
131 | //#define NO_ACTION_ONESHOT | ||
44 | 132 | ||
45 | /* disable these deprecated features by default */ | 133 | /* disable these deprecated features by default */ |
46 | #define NO_ACTION_MACRO | 134 | #define NO_ACTION_MACRO |
47 | #define NO_ACTION_FUNCTION | 135 | #define NO_ACTION_FUNCTION |
48 | 136 | ||
49 | /* key combination for magic key command */ | ||
50 | /* defined by default; to change, uncomment and set to the combination you want */ | ||
51 | // #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) | ||
52 | |||
53 | /* Bootmagic Lite key configuration */ | 137 | /* Bootmagic Lite key configuration */ |
54 | // #define BOOTMAGIC_LITE_ROW 0 | 138 | //#define BOOTMAGIC_LITE_ROW 0 |
55 | // #define BOOTMAGIC_LITE_COLUMN 0 | 139 | //#define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/quantum/template/ps2avrgb/readme.md b/quantum/template/ps2avrgb/readme.md index b45ef91c9..f19743a16 100644 --- a/quantum/template/ps2avrgb/readme.md +++ b/quantum/template/ps2avrgb/readme.md | |||
@@ -2,11 +2,11 @@ | |||
2 | 2 | ||
3 |  | 3 |  |
4 | 4 | ||
5 | A short description of the keyboard/project | 5 | *A short description of the keyboard/project* |
6 | 6 | ||
7 | * Keyboard Maintainer: [%YOUR_NAME%](https://github.com/yourusername) | 7 | * Keyboard Maintainer: [%YOUR_NAME%](https://github.com/yourusername) |
8 | * Hardware Supported: The PCBs, controllers supported | 8 | * Hardware Supported: *The PCBs, controllers supported* |
9 | * Hardware Availability: links to where you can find this hardware | 9 | * Hardware Availability: *Links to where you can find this hardware* |
10 | 10 | ||
11 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
12 | 12 | ||
diff --git a/quantum/template/ps2avrgb/rules.mk b/quantum/template/ps2avrgb/rules.mk index 9e18b3382..1b61e9534 100644 --- a/quantum/template/ps2avrgb/rules.mk +++ b/quantum/template/ps2avrgb/rules.mk | |||
@@ -2,23 +2,18 @@ | |||
2 | MCU = atmega32a | 2 | MCU = atmega32a |
3 | 3 | ||
4 | # Bootloader selection | 4 | # Bootloader selection |
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = bootloadHID | 5 | BOOTLOADER = bootloadHID |
13 | 6 | ||
14 | # Build Options | 7 | # Build Options |
15 | # change yes to no to disable | 8 | # change yes to no to disable |
16 | # | 9 | # |
17 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
18 | MOUSEKEY_ENABLE = no # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
20 | CONSOLE_ENABLE = yes # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
21 | COMMAND_ENABLE = yes # Commands for debug and configuration | 14 | COMMAND_ENABLE = no # Commands for debug and configuration |
15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
22 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 17 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
23 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 18 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
24 | WS2812_DRIVER = i2c | 19 | WS2812_DRIVER = i2c |
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh index 1f08790ad..cf3339f9a 100755 --- a/util/new_keyboard.sh +++ b/util/new_keyboard.sh | |||
@@ -78,7 +78,6 @@ replace_year_placeholders() { | |||
78 | "${keyboard_dir}/config.h" | 78 | "${keyboard_dir}/config.h" |
79 | "${keyboard_dir}/${keyboard_base_name}.c" | 79 | "${keyboard_dir}/${keyboard_base_name}.c" |
80 | "${keyboard_dir}/${keyboard_base_name}.h" | 80 | "${keyboard_dir}/${keyboard_base_name}.h" |
81 | "${keyboard_dir}/keymaps/default/config.h" | ||
82 | "${keyboard_dir}/keymaps/default/keymap.c" | 81 | "${keyboard_dir}/keymaps/default/keymap.c" |
83 | ) | 82 | ) |
84 | replace_placeholders "%YEAR%" "$(date +%Y)" "${replace_year_filenames[@]}" | 83 | replace_placeholders "%YEAR%" "$(date +%Y)" "${replace_year_filenames[@]}" |
@@ -104,7 +103,6 @@ replace_name_placeholders() { | |||
104 | "${keyboard_dir}/readme.md" | 103 | "${keyboard_dir}/readme.md" |
105 | "${keyboard_dir}/${keyboard_base_name}.c" | 104 | "${keyboard_dir}/${keyboard_base_name}.c" |
106 | "${keyboard_dir}/${keyboard_base_name}.h" | 105 | "${keyboard_dir}/${keyboard_base_name}.h" |
107 | "${keyboard_dir}/keymaps/default/config.h" | ||
108 | "${keyboard_dir}/keymaps/default/keymap.c" | 106 | "${keyboard_dir}/keymaps/default/keymap.c" |
109 | ) | 107 | ) |
110 | replace_placeholders "%YOUR_NAME%" "$username" "${replace_name_filenames[@]}" | 108 | replace_placeholders "%YOUR_NAME%" "$username" "${replace_name_filenames[@]}" |