diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-01-27 17:39:20 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-01-27 17:39:20 +1100 |
| commit | be897cbc2f9d542dfcc98c8e06aeb04179cc484c (patch) | |
| tree | 5face749c8c02bb2698d8efcb0d1303c1a6b0b32 /keyboards/planck | |
| parent | 349571d11149654d19fe15d19cd44e676af16ae8 (diff) | |
| parent | 6937f1d70e7d48980032446b137462a66c457bd8 (diff) | |
| download | qmk_firmware-be897cbc2f9d542dfcc98c8e06aeb04179cc484c.tar.gz qmk_firmware-be897cbc2f9d542dfcc98c8e06aeb04179cc484c.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/planck')
| -rw-r--r-- | keyboards/planck/ez/config.h | 3 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/default/config.h | 3 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/thermal_printer/config.h | 3 | ||||
| -rw-r--r-- | keyboards/planck/rev6/config.h | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 91723e185..ecab5d5dc 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h | |||
| @@ -109,9 +109,6 @@ | |||
| 109 | * MIDI options | 109 | * MIDI options |
| 110 | */ | 110 | */ |
| 111 | 111 | ||
| 112 | /* Prevent use of disabled MIDI features in the keymap */ | ||
| 113 | //#define MIDI_ENABLE_STRICT 1 | ||
| 114 | |||
| 115 | /* enable basic MIDI features: | 112 | /* enable basic MIDI features: |
| 116 | - MIDI notes can be sent when in Music mode is on | 113 | - MIDI notes can be sent when in Music mode is on |
| 117 | */ | 114 | */ |
diff --git a/keyboards/planck/keymaps/default/config.h b/keyboards/planck/keymaps/default/config.h index 6fa31cc8a..9020d2b9f 100644 --- a/keyboards/planck/keymaps/default/config.h +++ b/keyboards/planck/keymaps/default/config.h | |||
| @@ -14,9 +14,6 @@ | |||
| 14 | * MIDI options | 14 | * MIDI options |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | /* Prevent use of disabled MIDI features in the keymap */ | ||
| 18 | //#define MIDI_ENABLE_STRICT 1 | ||
| 19 | |||
| 20 | /* enable basic MIDI features: | 17 | /* enable basic MIDI features: |
| 21 | - MIDI notes can be sent when in Music mode is on | 18 | - MIDI notes can be sent when in Music mode is on |
| 22 | */ | 19 | */ |
diff --git a/keyboards/planck/keymaps/thermal_printer/config.h b/keyboards/planck/keymaps/thermal_printer/config.h index bcd098930..4460cdbbe 100644 --- a/keyboards/planck/keymaps/thermal_printer/config.h +++ b/keyboards/planck/keymaps/thermal_printer/config.h | |||
| @@ -24,9 +24,6 @@ | |||
| 24 | * MIDI options | 24 | * MIDI options |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | /* Prevent use of disabled MIDI features in the keymap */ | ||
| 28 | //#define MIDI_ENABLE_STRICT 1 | ||
| 29 | |||
| 30 | /* enable basic MIDI features: | 27 | /* enable basic MIDI features: |
| 31 | - MIDI notes can be sent when in Music mode is on | 28 | - MIDI notes can be sent when in Music mode is on |
| 32 | */ | 29 | */ |
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 0adca592b..f60b0ec2e 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h | |||
| @@ -107,9 +107,6 @@ | |||
| 107 | * MIDI options | 107 | * MIDI options |
| 108 | */ | 108 | */ |
| 109 | 109 | ||
| 110 | /* Prevent use of disabled MIDI features in the keymap */ | ||
| 111 | //#define MIDI_ENABLE_STRICT 1 | ||
| 112 | |||
| 113 | /* enable basic MIDI features: | 110 | /* enable basic MIDI features: |
| 114 | - MIDI notes can be sent when in Music mode is on | 111 | - MIDI notes can be sent when in Music mode is on |
| 115 | */ | 112 | */ |