Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark
2021-01-15 18:34:12 +11:00
162 changed files with 980 additions and 180 deletions
+13
View File
@@ -318,6 +318,19 @@ You can disable a single effect by defining `DISABLE_[EFFECT_NAME]` in your `con
|`#define DISABLE_RGB_MATRIX_SOLID_SPLASH` |Disables `RGB_MATRIX_SOLID_SPLASH` |
|`#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH` |Disables `RGB_MATRIX_SOLID_MULTISPLASH` |
### RGB Matrix Effect Typing Heatmap :id=rgb-matrix-effect-typing-heatmap
This effect will color the RGB matrix according to a heatmap of recently pressed
keys. Whenever a key is pressed its "temperature" increases as well as that of
its neighboring keys. The temperature of each key is then decreased
automatically every 25 milliseconds by default.
In order to change the delay of temperature decrease define
`RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS`:
```c
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
```
## Custom RGB Matrix Effects :id=custom-rgb-matrix-effects
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Yiancar
#define PRODUCT Baguette
#define DESCRIPTION A French Custom
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Koichi Katano
#define PRODUCT Bakeneko 80
#define DESCRIPTION Open source tenkeyless keyboard
/* key matrix size */
#define MATRIX_ROWS 6
-1
View File
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Bantam Keyboards
#define PRODUCT Bantam44
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 10
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice RGB
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 10
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT bat43
#define DESCRIPTION 43key keyboard
/* key matrix size */
#define MATRIX_ROWS 8
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define MANUFACTURER WoodKeys.click
#define PRODUCT BigSeries Single Keyboard
#define DESCRIPTION Single key board for Novelkeys Big Series Switch
/* key matrix size */
#define MATRIX_ROWS 1
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define MANUFACTURER WoodKeys.click
#define PRODUCT BigSeries Single Keyboard
#define DESCRIPTION Single key board for Novelkeys Big Series Switch
/* key matrix size */
#define MATRIX_ROWS 1
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER WoodKeys.click
#define PRODUCT BigSeries Triple Keyboard
#define DESCRIPTION Triple key board for Novelkeys Big Series Switch
/* key matrix size */
#define MATRIX_ROWS 1
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define MANUFACTURER WoodKeys.click
#define PRODUCT BigSeries Quad Keyboard
#define DESCRIPTION 4-key board for Novelkeys Big Series Switch
/* key matrix size */
#define MATRIX_ROWS 2
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI G60 BLE
#define DESCRIPTION BIOI G60 BLE
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x1001
#define MANUFACTURER Pixlup
#define PRODUCT Blackplum Keeb
#define DESCRIPTION Blackplum 68 Percent Mechanical Keyboard
/* key matrix size */
#define MATRIX_ROWS 9
-1
View File
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Eucalyn
#define PRODUCT Blockey
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 10
-1
View File
@@ -24,7 +24,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER KPrepublic
#define PRODUCT bm16a
#define DESCRIPTION KPrepublic bm16a
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -7,7 +7,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER KPrepublic
#define PRODUCT bm16s
#define DESCRIPTION KPrepublic bm16s
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER KPRepublic
#define PRODUCT BM43A
#define DESCRIPTION A QMK-powered custom keyboard
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER KP Republic
#define PRODUCT BM60 RGB
#define DESCRIPTION A 60% hotswap inswitch rgb board
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -10,7 +10,6 @@
#define DEVICE_VER 0x0000
#define MANUFACTURER Boardsource
#define PRODUCT 3x4
#define DESCRIPTION Little macro pad
/* key matrix size */
#define MATRIX_ROWS 3
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0000
#define MANUFACTURER Boardsource
#define PRODUCT 4x12
#define DESCRIPTION 40 percent ortho keyboard
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0000
#define MANUFACTURER Boardsource
#define PRODUCT 5x12
#define DESCRIPTION 50 percent ortho keyboard
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER shensmobile
#define PRODUCT Boardwalk
#define DESCRIPTION QMK keyboard firmware for Boardwalk
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x26BE
#define MANUFACTURER ishtob
#define PRODUCT Boston Meetup Board
#define DESCRIPTION A limited-run community meetup board
//#define AUDIO_VOICES
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER botanicalkeyboards
#define PRODUCT fm2u
#define DESCRIPTION A 1 key macropad
/* key matrix size */
#define MATRIX_ROWS 1
-1
View File
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Bathroom Epiphanies
#define PRODUCT frosty_flake
#define DESCRIPTION Frosty Flake controller for the CM Storm Quick Fire Rapid
/*
* Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0104
#define MANUFACTURER Filco
#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013
#define DESCRIPTION QMK firmware for Majestouch TKL
/* key matrix size */
#define MATRIX_ROWS 8
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0104
#define MANUFACTURER Filco
#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015
#define DESCRIPTION QMK firmware for Majestouch TKL
/* key matrix size */
#define MATRIX_ROWS 8
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER bpiphany
#define PRODUCT sixshooter
#define DESCRIPTION A PCB for the CM Storm switch tester utilizing a Teensy 2.0.
/* key matrix size */
#define MATRIX_ROWS 2
-1
View File
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Bathroom Epiphanies
#define PRODUCT tiger_lily
#define DESCRIPTION Tiger Lily controller for the Filco Majestouch 2
/*
* Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER BathroomEpiphanies
#define PRODUCT Unloved Bastard
#define DESCRIPTION Unloved Bastard controller for CM Masterkeys S
/* key matrix size */
#define MATRIX_ROWS 8
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER BTHLabs
#define PRODUCT GeekPad
#define DESCRIPTION 3x3 custom macro pad
/* key matrix size */
#define MATRIX_ROWS 3
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER kakunpc
#define PRODUCT business_card
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 2
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER kakunpc
#define PRODUCT business_card
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 3
-1
View File
@@ -8,7 +8,6 @@
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT Butter Stick
#define DESCRIPTION Its a stick of butter
#define VERSION "Paula Deen"
#define DEBOUNCE 5
-1
View File
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER Maple Computing
#define PRODUCT C39
#define DESCRIPTION A compact 39 key keyboard
/* key matrix size */
#define MATRIX_ROWS 3
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT AN-C
#define DESCRIPTION AN-C Keyboard
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Atlas
#define DESCRIPTION Atlas Keyboard
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Chimera65
#define DESCRIPTION Chimera65 Keyboard
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER CannonKeys
#define PRODUCT DB60
#define DESCRIPTION DB60 Keyboard
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT DevastatingTKL
#define DESCRIPTION Devastating Keyboard
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Instant60
#define DESCRIPTION Instant 60 Keyboard
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER SmithAndRune
#define PRODUCT Iron165
#define DESCRIPTION Iron165 Keyboard
/* key matrix size */
#define MATRIX_ROWS 5
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Obliterated75
#define DESCRIPTION Obliterated75 Keyboard
/* key matrix size */
#define MATRIX_ROWS 6
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER QMK
#define PRODUCT Ortho48
#define DESCRIPTION Ortho48
/* key matrix size */
#define MATRIX_ROWS 4
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER QMK
#define PRODUCT Ortho60
#define DESCRIPTION Ortho60
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Ortho75
#define DESCRIPTION Ortho75
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Practice 60
#define DESCRIPTION Practice 60
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Practice 65
#define DESCRIPTION Practice 65
/* key matrix size */
#define MATRIX_ROWS 5
-1
View File
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Rekt1800
#define DESCRIPTION Rekt1800 Keyboard
/* key matrix size */
#define MATRIX_ROWS 6
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER CannonKeys
#define PRODUCT Satisfaction75
#define DESCRIPTION Satisfaction 75 Keyboard
/* key matrix size */
#define MATRIX_ROWS 6

Some files were not shown because too many files have changed in this diff Show More