aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/planck/keymaps/brandon/config.h105
-rw-r--r--keyboards/planck/keymaps/circuit/config.h102
-rw-r--r--keyboards/planck/keymaps/default/keymap.c6
-rw-r--r--keyboards/planck/keymaps/khord/config.h2
-rw-r--r--keyboards/planck/keymaps/pvc/config.h41
-rw-r--r--keyboards/planck/keymaps/vifon/config.h99
-rw-r--r--keyboards/planck/keymaps/zach/config.h74
-rw-r--r--keyboards/planck/light/config.h28
-rw-r--r--keyboards/planck/light/info.json7
-rw-r--r--keyboards/planck/light/light.c39
-rw-r--r--keyboards/planck/light/light.h23
-rw-r--r--keyboards/planck/light/rules.mk9
-rw-r--r--keyboards/planck/planck.c1
-rw-r--r--keyboards/planck/rev3/rules.mk11
-rw-r--r--keyboards/planck/rev4/rules.mk10
-rw-r--r--keyboards/planck/rev5/rules.mk8
-rw-r--r--keyboards/planck/rules.mk9
-rw-r--r--quantum/audio/audio.c5
-rw-r--r--quantum/quantum.c3
-rw-r--r--util/travis_build.sh57
20 files changed, 278 insertions, 361 deletions
diff --git a/keyboards/planck/keymaps/brandon/config.h b/keyboards/planck/keymaps/brandon/config.h
index 5442ebf75..29a07dc63 100644
--- a/keyboards/planck/keymaps/brandon/config.h
+++ b/keyboards/planck/keymaps/brandon/config.h
@@ -1,68 +1,30 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3
4This program is free software: you can redistribute it and/or modify
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#define TAPPING_TERM 200
22
23#include "config_common.h"
24
25/* USB Device descriptor parameter */
26#define VENDOR_ID 0xFEED
27#define PRODUCT_ID 0x6060
28#define MANUFACTURER Ortholinear Keyboards
29#define PRODUCT The Planck Keyboard
30#define DESCRIPTION A compact ortholinear keyboard
31
32/* key matrix size */
33#define MATRIX_ROWS 4
34#define MATRIX_COLS 12
35
36/* Planck PCB default pin-out */
37#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
38#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
39#define UNUSED_PINS
40
41#define AUDIO_VOICES
42
43#define BACKLIGHT_PIN B7
44 3
45/* COL2ROW or ROW2COL */ 4#include "../../config.h"
46#define DIODE_DIRECTION COL2ROW
47 5
48/* define if matrix has ghost */ 6/*
49//#define MATRIX_HAS_GHOST 7 * MIDI options
8 */
50 9
51/* number of backlight levels */ 10/* Prevent use of disabled MIDI features in the keymap */
52#define BACKLIGHT_LEVELS 3 11//#define MIDI_ENABLE_STRICT 1
53 12
54/* Set 0 if debouncing isn't needed */ 13/* enable basic MIDI features:
55#define DEBOUNCING_DELAY 5 14 - MIDI notes can be sent when in Music mode is on
15*/
16#define MIDI_BASIC
56 17
57/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 18/* enable advanced MIDI features:
58#define LOCKING_SUPPORT_ENABLE 19 - MIDI notes can be added to the keymap
59/* Locking resynchronize hack */ 20 - Octave shift and transpose
60#define LOCKING_RESYNC_ENABLE 21 - Virtual sustain, portamento, and modulation wheel
22 - etc.
23*/
24//#define MIDI_ADVANCED
61 25
62/* key combination for command */ 26/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
63#define IS_COMMAND() ( \ 27//#define MIDI_TONE_KEYCODE_OCTAVES 2
64 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
65)
66 28
67#define MOUSEKEY_INTERVAL 20 29#define MOUSEKEY_INTERVAL 20
68#define MOUSEKEY_DELAY 0 30#define MOUSEKEY_DELAY 0
@@ -70,29 +32,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
70#define MOUSEKEY_MAX_SPEED 7 32#define MOUSEKEY_MAX_SPEED 7
71#define MOUSEKEY_WHEEL_DELAY 0 33#define MOUSEKEY_WHEEL_DELAY 0
72 34
73/*
74 * Feature disable options
75 * These options are also useful to firmware size reduction.
76 */
77
78/* disable debug print */
79//#define NO_DEBUG
80
81/* disable print */
82//#define NO_PRINT
83
84/* disable action features */
85//#define NO_ACTION_LAYER
86//#define NO_ACTION_TAPPING
87//#define NO_ACTION_ONESHOT
88//#define NO_ACTION_MACRO
89//#define NO_ACTION_FUNCTION
90
91#ifdef SUBPROJECT_rev3
92 #include "rev3/config.h"
93#endif
94#ifdef SUBPROJECT_rev4
95 #include "rev4/config.h"
96#endif
97
98#endif 35#endif
diff --git a/keyboards/planck/keymaps/circuit/config.h b/keyboards/planck/keymaps/circuit/config.h
index 22244f4a7..4c6158199 100644
--- a/keyboards/planck/keymaps/circuit/config.h
+++ b/keyboards/planck/keymaps/circuit/config.h
@@ -1,91 +1,29 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3
4This program is free software: you can redistribute it and/or modify
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/* Tap-dance interval definition */
24#define TAPPING_TERM 200
25
26/* USB Device descriptor parameter */
27#define VENDOR_ID 0xFEED
28#define PRODUCT_ID 0x6060
29#define MANUFACTURER Ortholinear Keyboards
30#define PRODUCT The Planck Keyboard
31#define DESCRIPTION A compact ortholinear keyboard
32
33/* key matrix size */
34#define MATRIX_ROWS 4
35#define MATRIX_COLS 12
36 3
37/* Planck PCB default pin-out */ 4#include "../../config.h"
38#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
39#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
40#define UNUSED_PINS
41
42#define BACKLIGHT_PIN B7
43
44/* COL2ROW or ROW2COL */
45#define DIODE_DIRECTION COL2ROW
46
47/* define if matrix has ghost */
48//#define MATRIX_HAS_GHOST
49
50/* number of backlight levels */
51#define BACKLIGHT_LEVELS 3
52
53/* Set 0 if debouncing isn't needed */
54#define DEBOUNCING_DELAY 5
55
56/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
57#define LOCKING_SUPPORT_ENABLE
58/* Locking resynchronize hack */
59#define LOCKING_RESYNC_ENABLE
60
61/* key combination for command */
62#define IS_COMMAND() ( \
63 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
64)
65 5
66/* 6/*
67 * Feature disable options 7 * MIDI options
68 * These options are also useful to firmware size reduction.
69 */ 8 */
70 9
71/* disable debug print */ 10/* Prevent use of disabled MIDI features in the keymap */
72//#define NO_DEBUG 11//#define MIDI_ENABLE_STRICT 1
73 12
74/* disable print */ 13/* enable basic MIDI features:
75//#define NO_PRINT 14 - MIDI notes can be sent when in Music mode is on
15*/
16#define MIDI_BASIC
76 17
77/* disable action features */ 18/* enable advanced MIDI features:
78//#define NO_ACTION_LAYER 19 - MIDI notes can be added to the keymap
79//#define NO_ACTION_TAPPING 20 - Octave shift and transpose
80//#define NO_ACTION_ONESHOT 21 - Virtual sustain, portamento, and modulation wheel
81//#define NO_ACTION_MACRO 22 - etc.
82//#define NO_ACTION_FUNCTION 23*/
24//#define MIDI_ADVANCED
83 25
84#ifdef SUBPROJECT_rev3 26/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
85 #include "rev3/config.h" 27//#define MIDI_TONE_KEYCODE_OCTAVES 2
86#endif
87#ifdef SUBPROJECT_rev4
88 #include "rev4/config.h"
89#endif
90 28
91#endif 29#endif \ No newline at end of file
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 87789e1d9..04fc33640 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -163,9 +163,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
163 * `-----------------------------------------------------------------------------------' 163 * `-----------------------------------------------------------------------------------'
164 */ 164 */
165[_ADJUST] = { 165[_ADJUST] = {
166 {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL }, 166 {_______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL },
167 {_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, 167 {_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______},
168 {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, 168 {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______},
169 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} 169 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
170} 170}
171 171
@@ -261,4 +261,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
261 break; 261 break;
262 } 262 }
263 return true; 263 return true;
264} \ No newline at end of file 264}
diff --git a/keyboards/planck/keymaps/khord/config.h b/keyboards/planck/keymaps/khord/config.h
index 5482aba52..43c8001cf 100644
--- a/keyboards/planck/keymaps/khord/config.h
+++ b/keyboards/planck/keymaps/khord/config.h
@@ -1,7 +1,7 @@
1#ifndef CONFIG_USER_H 1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H 2#define CONFIG_USER_H
3 3
4#include "../../config.h" 4#include "config_common.h"
5 5
6#ifdef AUDIO_ENABLE 6#ifdef AUDIO_ENABLE
7 #define STARTUP_SONG SONG(SONIC_RING) 7 #define STARTUP_SONG SONG(SONIC_RING)
diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h
index 17f351756..539423735 100644
--- a/keyboards/planck/keymaps/pvc/config.h
+++ b/keyboards/planck/keymaps/pvc/config.h
@@ -29,31 +29,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
29#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } 29#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
30#define UNUSED_PINS 30#define UNUSED_PINS
31 31
32/* COL2ROW or ROW2COL */ 32/*
33#define DIODE_DIRECTION COL2ROW 33 * MIDI options
34 34 */
35/* define if matrix has ghost */
36//#define MATRIX_HAS_GHOST
37
38/* number of backlight levels */
39#define BACKLIGHT_LEVELS 3
40
41/* Set 0 if debouncing isn't needed */
42#define DEBOUNCING_DELAY 5
43 35
44/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 36/* Prevent use of disabled MIDI features in the keymap */
45#define LOCKING_SUPPORT_ENABLE 37//#define MIDI_ENABLE_STRICT 1
46/* Locking resynchronize hack */
47#define LOCKING_RESYNC_ENABLE
48 38
49/* key combination for command */ 39/* enable basic MIDI features:
50#define IS_COMMAND() ( \ 40 - MIDI notes can be sent when in Music mode is on
51 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 41*/
52) 42#define MIDI_BASIC
53 43
54#define BACKLIGHT_PIN B7 44/* enable advanced MIDI features:
55#define BACKLIGHT_BREATHING 45 - MIDI notes can be added to the keymap
46 - Octave shift and transpose
47 - Virtual sustain, portamento, and modulation wheel
48 - etc.
49*/
50//#define MIDI_ADVANCED
56 51
52/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
53//#define MIDI_TONE_KEYCODE_OCTAVES 2
57/* 54/*
58 * Feature disable options 55 * Feature disable options
59 * These options are also useful to firmware size reduction. 56 * These options are also useful to firmware size reduction.
@@ -72,6 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
72/* Only print user print statements */ 69/* Only print user print statements */
73#define USER_PRINT 70#define USER_PRINT
74 71
72#define BACKLIGHT_BREATHING
75 73
76/* disable action features */ 74/* disable action features */
77//#define NO_ACTION_LAYER 75//#define NO_ACTION_LAYER
@@ -79,5 +77,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
79//#define NO_ACTION_ONESHOT 77//#define NO_ACTION_ONESHOT
80//#define NO_ACTION_MACRO 78//#define NO_ACTION_MACRO
81//#define NO_ACTION_FUNCTION 79//#define NO_ACTION_FUNCTION
82
83#endif 80#endif
diff --git a/keyboards/planck/keymaps/vifon/config.h b/keyboards/planck/keymaps/vifon/config.h
index a08b37cbe..4cb4a1235 100644
--- a/keyboards/planck/keymaps/vifon/config.h
+++ b/keyboards/planck/keymaps/vifon/config.h
@@ -1,82 +1,30 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3
4This program is free software: you can redistribute it and/or modify
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#define VENDOR_ID 0xFEED
25#define PRODUCT_ID 0x6060
26#define MANUFACTURER Ortholinear Keyboards
27#define PRODUCT The Planck Keyboard
28#define DESCRIPTION A compact ortholinear keyboard
29
30/* key matrix size */
31#define MATRIX_ROWS 4
32#define MATRIX_COLS 12
33
34/* Planck PCB default pin-out */
35#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
36#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
37#define UNUSED_PINS
38
39#define BACKLIGHT_PIN B7
40 3
41/* COL2ROW or ROW2COL */ 4#include "../../config.h"
42#define DIODE_DIRECTION COL2ROW
43
44/* define if matrix has ghost */
45//#define MATRIX_HAS_GHOST
46
47/* number of backlight levels */
48#define BACKLIGHT_LEVELS 3
49
50/* Set 0 if debouncing isn't needed */
51#define DEBOUNCING_DELAY 5
52
53/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
54#define LOCKING_SUPPORT_ENABLE
55/* Locking resynchronize hack */
56#define LOCKING_RESYNC_ENABLE
57
58/* key combination for command */
59#define IS_COMMAND() ( \
60 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
61)
62 5
63/* 6/*
64 * Feature disable options 7 * MIDI options
65 * These options are also useful to firmware size reduction.
66 */ 8 */
67 9
68/* disable debug print */ 10/* Prevent use of disabled MIDI features in the keymap */
69//#define NO_DEBUG 11//#define MIDI_ENABLE_STRICT 1
70 12
71/* disable print */ 13/* enable basic MIDI features:
72//#define NO_PRINT 14 - MIDI notes can be sent when in Music mode is on
15*/
16#define MIDI_BASIC
73 17
74/* disable action features */ 18/* enable advanced MIDI features:
75//#define NO_ACTION_LAYER 19 - MIDI notes can be added to the keymap
76//#define NO_ACTION_TAPPING 20 - Octave shift and transpose
77//#define NO_ACTION_ONESHOT 21 - Virtual sustain, portamento, and modulation wheel
78//#define NO_ACTION_MACRO 22 - etc.
79//#define NO_ACTION_FUNCTION 23*/
24//#define MIDI_ADVANCED
25
26/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
27//#define MIDI_TONE_KEYCODE_OCTAVES 2
80 28
81/* prevent the modifiers from being stuck, sacrificing some memory */ 29/* prevent the modifiers from being stuck, sacrificing some memory */
82#define PREVENT_STUCK_MODIFIERS 30#define PREVENT_STUCK_MODIFIERS
@@ -86,11 +34,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
86 */ 34 */
87#define DYNAMIC_MACRO_SIZE 256 35#define DYNAMIC_MACRO_SIZE 256
88 36
89#ifdef SUBPROJECT_rev3
90 #include "rev3/config.h"
91#endif
92#ifdef SUBPROJECT_rev4
93 #include "rev4/config.h"
94#endif
95
96#endif 37#endif
diff --git a/keyboards/planck/keymaps/zach/config.h b/keyboards/planck/keymaps/zach/config.h
index d309c9493..19a3856a3 100644
--- a/keyboards/planck/keymaps/zach/config.h
+++ b/keyboards/planck/keymaps/zach/config.h
@@ -1,55 +1,30 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3
4This program is free software: you can redistribute it and/or modify
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#define VENDOR_ID 0xFEED
25#define PRODUCT_ID 0x6060
26#define MANUFACTURER Ortholinear Keyboards
27#define PRODUCT The Planck Keyboard
28#define DESCRIPTION A compact ortholinear keyboard
29 3
30/* key matrix size */ 4#include "../../config.h"
31#define MATRIX_ROWS 4
32#define MATRIX_COLS 12
33 5
34/* Planck PCB default pin-out */ 6/*
35#define MATRIX_ROW_PINS { D0, D5, B5, B6 } 7 * MIDI options
36#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } 8 */
37#define UNUSED_PINS
38
39#define BACKLIGHT_PIN B7
40 9
41/* COL2ROW or ROW2COL */ 10/* Prevent use of disabled MIDI features in the keymap */
42#define DIODE_DIRECTION COL2ROW 11//#define MIDI_ENABLE_STRICT 1
43 12
44/* define if matrix has ghost */ 13/* enable basic MIDI features:
45//#define MATRIX_HAS_GHOST 14 - MIDI notes can be sent when in Music mode is on
15*/
16#define MIDI_BASIC
46 17
47//#define BACKLIGHT_BREATHING // LED breathing 18/* enable advanced MIDI features:
48/* number of backlight levels */ 19 - MIDI notes can be added to the keymap
49#define BACKLIGHT_LEVELS 5 20 - Octave shift and transpose
21 - Virtual sustain, portamento, and modulation wheel
22 - etc.
23*/
24//#define MIDI_ADVANCED
50 25
51/* Set 0 if debouncing isn't needed */ 26/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
52#define DEBOUNCING_DELAY 5 27//#define MIDI_TONE_KEYCODE_OCTAVES 2
53 28
54/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 29/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
55//#define LOCKING_SUPPORT_ENABLE 30//#define LOCKING_SUPPORT_ENABLE
@@ -84,11 +59,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
84//#define DYNAMIC_MACRO_ENABLE // Enable if you need to use the macro functionality 59//#define DYNAMIC_MACRO_ENABLE // Enable if you need to use the macro functionality
85//#define SPACE_CADET // Parenthesis on L/R shift 60//#define SPACE_CADET // Parenthesis on L/R shift
86 61
87#ifdef SUBPROJECT_rev3
88 #include "rev3/config.h"
89#endif
90#ifdef SUBPROJECT_rev4
91 #include "rev4/config.h"
92#endif
93
94#endif 62#endif
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
new file mode 100644
index 000000000..71c924904
--- /dev/null
+++ b/keyboards/planck/light/config.h
@@ -0,0 +1,28 @@
1#ifndef LIGHT_CONFIG_H
2#define LIGHT_CONFIG_H
3
4#include "config_common.h"
5
6#undef PRODUCT
7#define PRODUCT Planck Light
8#undef PRODUCT_ID
9#define PRODUCT_ID 0x6065
10#define DEVICE_VER 0x0001
11
12#undef MATRIX_ROW_PINS
13#undef MATRIX_COL_PINS
14
15#define MATRIX_ROW_PINS { B0, E7, F0, F1 }
16#define MATRIX_COL_PINS { E6, E3, E4, D3, D4, D5, C0, A7, A6, E1, E0, D7 }
17
18#define C6_AUDIO
19#define B5_AUDIO
20
21#undef BACKLIGHT_PIN
22
23#define BACKLIGHT_PIN A5
24
25#define NO_USB_STARTUP_CHECK
26
27
28#endif \ No newline at end of file
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
new file mode 100644
index 000000000..f620bc413
--- /dev/null
+++ b/keyboards/planck/light/info.json
@@ -0,0 +1,7 @@
1{
2 "keyboard_name": "Planck Light",
3 "keyboard_folder": "planck/light",
4 "identifier": "FEED:6065:0001",
5 "processor": "at90usb1286",
6 "bootloader": "qmk-dfu",
7} \ No newline at end of file
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
new file mode 100644
index 000000000..96261616c
--- /dev/null
+++ b/keyboards/planck/light/light.c
@@ -0,0 +1,39 @@
1/* Copyright 2017 Jason Williams
2 * Copyright 2017 Jack Humbert
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#include "light.h"
19
20void matrix_init_kb(void) {
21
22 // Turn status LED on
23 DDRD |= (1<<6);
24 PORTD |= (1<<6);
25
26 matrix_init_user();
27}
28
29bool process_record_kb(uint16_t keycode, keyrecord_t *record)
30{
31 return process_record_user(keycode, record);
32}
33
34uint16_t backlight_task_counter = 0;
35
36void matrix_scan_kb(void)
37{
38 matrix_scan_user();
39} \ No newline at end of file
diff --git a/keyboards/planck/light/light.h b/keyboards/planck/light/light.h
new file mode 100644
index 000000000..111f19865
--- /dev/null
+++ b/keyboards/planck/light/light.h
@@ -0,0 +1,23 @@
1/* Copyright 2017 Jason Williams
2 * Copyright 2017 Jack Humbert
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#ifndef LIGHT_H
19#define LIGHT_H
20
21#include "planck.h"
22
23#endif \ No newline at end of file
diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk
new file mode 100644
index 000000000..02c39c43a
--- /dev/null
+++ b/keyboards/planck/light/rules.mk
@@ -0,0 +1,9 @@
1MIDI_ENABLE = yes
2AUDIO_ENABLE = yes # Audio output on port C6
3MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
4NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
5BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
6
7OPT_DEFS += -DBOOTLOADER_SIZE=8192
8
9MCU = at90usb1286 \ No newline at end of file
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
index 3980b02f5..1d2f91bc5 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -10,6 +10,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
10}; 10};
11#endif 11#endif
12 12
13__attribute__ ((weak))
13void matrix_init_kb(void) { 14void matrix_init_kb(void) {
14 // Turn status LED on 15 // Turn status LED on
15 DDRE |= (1<<6); 16 DDRE |= (1<<6);
diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk
index 114857100..9ecde5958 100644
--- a/keyboards/planck/rev3/rules.mk
+++ b/keyboards/planck/rev3/rules.mk
@@ -1 +1,10 @@
1AUDIO_ENABLE = no # Audio output on port C6 \ No newline at end of file 1
2# Boot Section Size in *bytes*
3# Teensy halfKay 512
4# Teensy++ halfKay 1024
5# Atmel DFU loader 4096
6# LUFA bootloader 4096
7# USBaspLoader 2048
8OPT_DEFS += -DBOOTLOADER_SIZE=4096
9
10AUDIO_ENABLE = no # Audio output on port C6
diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk
index 3b22e0a01..0001fb50f 100644
--- a/keyboards/planck/rev4/rules.mk
+++ b/keyboards/planck/rev4/rules.mk
@@ -1 +1,9 @@
1AUDIO_ENABLE = yes # Audio output on port C6 \ No newline at end of file 1# Boot Section Size in *bytes*
2# Teensy halfKay 512
3# Teensy++ halfKay 1024
4# Atmel DFU loader 4096
5# LUFA bootloader 4096
6# USBaspLoader 2048
7OPT_DEFS += -DBOOTLOADER_SIZE=4096
8
9AUDIO_ENABLE = yes # Audio output on port C6
diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk
index 3b22e0a01..29eae4b49 100644
--- a/keyboards/planck/rev5/rules.mk
+++ b/keyboards/planck/rev5/rules.mk
@@ -1 +1,9 @@
1# Boot Section Size in *bytes*
2# Teensy halfKay 512
3# Teensy++ halfKay 1024
4# Atmel DFU loader 4096
5# LUFA bootloader 4096
6# USBaspLoader 2048
7OPT_DEFS += -DBOOTLOADER_SIZE=4096
8
1AUDIO_ENABLE = yes # Audio output on port C6 \ No newline at end of file 9AUDIO_ENABLE = yes # Audio output on port C6 \ No newline at end of file
diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk
index df575cd6b..1fed5fa58 100644
--- a/keyboards/planck/rules.mk
+++ b/keyboards/planck/rules.mk
@@ -37,15 +37,6 @@ F_USB = $(F_CPU)
37# Interrupt driven control endpoint task(+60) 37# Interrupt driven control endpoint task(+60)
38OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT 38OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
39 39
40
41# Boot Section Size in *bytes*
42# Teensy halfKay 512
43# Teensy++ halfKay 1024
44# Atmel DFU loader 4096
45# LUFA bootloader 4096
46# USBaspLoader 2048
47OPT_DEFS += -DBOOTLOADER_SIZE=4096
48
49# Build Options 40# Build Options
50# change to "no" to disable the options, or define them in the Makefile in 41# change to "no" to disable the options, or define them in the Makefile in
51# the appropriate keymap folder that will get included automatically 42# the appropriate keymap folder that will get included automatically
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index e08233486..29bad8060 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -184,6 +184,9 @@ void audio_init()
184 #ifdef B5_AUDIO 184 #ifdef B5_AUDIO
185 TCCR1A = (0 << COM1A1) | (0 << COM1A0) | (1 << WGM11) | (0 << WGM10); 185 TCCR1A = (0 << COM1A1) | (0 << COM1A0) | (1 << WGM11) | (0 << WGM10);
186 TCCR1B = (1 << WGM13) | (1 << WGM12) | (0 << CS12) | (1 << CS11) | (0 << CS10); 186 TCCR1B = (1 << WGM13) | (1 << WGM12) | (0 << CS12) | (1 << CS11) | (0 << CS10);
187
188 TIMER_1_PERIOD = (uint16_t)(((float)F_CPU) / (440 * CPU_PRESCALER));
189 TIMER_1_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (440 * CPU_PRESCALER)) * note_timbre);
187 #endif 190 #endif
188 191
189 audio_initialized = true; 192 audio_initialized = true;
@@ -192,7 +195,7 @@ void audio_init()
192 if (audio_config.enable) { 195 if (audio_config.enable) {
193 PLAY_SONG(startup_song); 196 PLAY_SONG(startup_song);
194 } 197 }
195 198
196} 199}
197 200
198void stop_all_notes() 201void stop_all_notes()
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 23873852f..099201596 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -1105,8 +1105,6 @@ ISR(TIMER1_COMPA_vect)
1105 1105
1106} 1106}
1107 1107
1108
1109
1110#endif // breathing 1108#endif // breathing
1111 1109
1112#else // backlight 1110#else // backlight
@@ -1168,6 +1166,7 @@ void send_nibble(uint8_t number) {
1168__attribute__((weak)) 1166__attribute__((weak))
1169uint16_t hex_to_keycode(uint8_t hex) 1167uint16_t hex_to_keycode(uint8_t hex)
1170{ 1168{
1169 hex = hex & 0xF;
1171 if (hex == 0x0) { 1170 if (hex == 0x0) {
1172 return KC_0; 1171 return KC_0;
1173 } else if (hex < 0xA) { 1172 } else if (hex < 0xA) {
diff --git a/util/travis_build.sh b/util/travis_build.sh
index c9b5fc323..d12a87a94 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,36 +1,47 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# test force push
4#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
5
3TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" 6TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
4TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" 7TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
8MAKE_ALL="make all:default AUTOGEN=\"true\""
5 9
6if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 10if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
7 exit_code=0 11 exit_code=0
8 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) 12 git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
9 BRANCH=$(git rev-parse --abbrev-ref HEAD) 13 if [ $? -eq 128 ]; then
10 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then 14 echo "Making default keymaps for all keyboards"
11 echo "Making all keymaps for all keyboards" 15 eval $MAKE_ALL
12 make all:default AUTOGEN="true"
13 : $((exit_code = $exit_code + $?)) 16 : $((exit_code = $exit_code + $?))
14 else 17 else
15 MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sort -u) 18 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
16 for KB in $MKB ; do 19 BRANCH=$(git rev-parse --abbrev-ref HEAD)
17 if [[ $KB == *keymaps* ]]; then 20 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
18 continue 21 echo "Making default keymaps for all keyboards"
19 fi 22 eval $MAKE_ALL
20 KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l) 23 : $((exit_code = $exit_code + $?))
21 if [[ $KEYMAP_ONLY -gt 0 ]]; then 24 else
22 echo "Making all keymaps for $KB" 25 MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sort -u)
23 make ${KB}:all AUTOGEN=true 26 for KB in $MKB ; do
24 : $((exit_code = $exit_code + $?)) 27 if [[ $KB == *keymaps* ]]; then
25 else 28 continue
26 MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) 29 fi
27 for KM in $MKM ; do 30 KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l)
28 echo "Making $KM for $KB" 31 if [[ $KEYMAP_ONLY -gt 0 ]]; then
29 make ${KB}:${KM} AUTOGEN=true 32 echo "Making all keymaps for $KB"
33 make ${KB}:all AUTOGEN=true
30 : $((exit_code = $exit_code + $?)) 34 : $((exit_code = $exit_code + $?))
31 done 35 else
32 fi 36 MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
33 done 37 for KM in $MKM ; do
38 echo "Making $KM for $KB"
39 make ${KB}:${KM} AUTOGEN=true
40 : $((exit_code = $exit_code + $?))
41 done
42 fi
43 done
44 fi
34 fi 45 fi
35 exit $exit_code 46 exit $exit_code
36fi 47fi
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 21:07:27 +0000