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

2024-11-11 02:59:09 +00:00 · 2021-01-15 18:34:12 +11:00 · 2021-01-15 18:34:12 +11:00 · ca7da3866d
commit ca7da3866d
parent ab375d3d07 8cf5f72aad
162 changed files with 980 additions and 180 deletions
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@ -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

--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@ -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
--- a/keyboards/bakeneko80/config.h
+++ b/keyboards/bakeneko80/config.h
@ -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
--- a/keyboards/bantam44/config.h
+++ b/keyboards/bantam44/config.h
@ -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
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@ -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
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@ -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
--- a/keyboards/bat43/config.h
+++ b/keyboards/bat43/config.h
@ -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
--- a/keyboards/bigseries/1key/config.h
+++ b/keyboards/bigseries/1key/config.h
@ -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
--- a/keyboards/bigseries/2key/config.h
+++ b/keyboards/bigseries/2key/config.h
@ -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
--- a/keyboards/bigseries/3key/config.h
+++ b/keyboards/bigseries/3key/config.h
@ -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
--- a/keyboards/bigseries/4key/config.h
+++ b/keyboards/bigseries/4key/config.h
@ -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
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@ -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
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@ -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
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@ -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
--- a/keyboards/bm16a/config.h
+++ b/keyboards/bm16a/config.h
@ -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
--- a/keyboards/bm16s/config.h
+++ b/keyboards/bm16s/config.h
@ -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
--- a/keyboards/bm43a/config.h
+++ b/keyboards/bm43a/config.h
@ -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
--- a/keyboards/bm60rgb/config.h
+++ b/keyboards/bm60rgb/config.h
@ -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
--- a/keyboards/boardsource/3x4/config.h
+++ b/keyboards/boardsource/3x4/config.h
@ -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
--- a/keyboards/boardsource/4x12/config.h
+++ b/keyboards/boardsource/4x12/config.h
@ -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
--- a/keyboards/boardsource/5x12/config.h
+++ b/keyboards/boardsource/5x12/config.h
@ -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
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@ -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
--- a/keyboards/boston_meetup/config.h
+++ b/keyboards/boston_meetup/config.h
@ -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

--- a/keyboards/botanicalkeyboards/fm2u/config.h
+++ b/keyboards/botanicalkeyboards/fm2u/config.h
@ -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
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@ -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
--- a/keyboards/bpiphany/pegasushoof/2013/config.h
+++ b/keyboards/bpiphany/pegasushoof/2013/config.h
@ -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
--- a/keyboards/bpiphany/pegasushoof/2015/config.h
+++ b/keyboards/bpiphany/pegasushoof/2015/config.h
@ -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
--- a/keyboards/bpiphany/sixshooter/config.h
+++ b/keyboards/bpiphany/sixshooter/config.h
@ -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
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@ -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
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@ -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
--- a/keyboards/bthlabs/geekpad/config.h
+++ b/keyboards/bthlabs/geekpad/config.h
@ -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
--- a/keyboards/business_card/alpha/config.h
+++ b/keyboards/business_card/alpha/config.h
@ -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
--- a/keyboards/business_card/beta/config.h
+++ b/keyboards/business_card/beta/config.h
@ -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
--- a/keyboards/butterstick/config.h
+++ b/keyboards/butterstick/config.h
@ -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
--- a/keyboards/c39/config.h
+++ b/keyboards/c39/config.h
@ -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
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@ -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
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@ -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
--- a/keyboards/cannonkeys/chimera65/config.h
+++ b/keyboards/cannonkeys/chimera65/config.h
@ -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
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@ -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
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@ -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
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@ -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
--- a/keyboards/cannonkeys/iron165/config.h
+++ b/keyboards/cannonkeys/iron165/config.h
@ -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
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@ -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
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@ -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
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@ -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
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@ -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
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@ -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
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@ -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
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@ -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
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@ -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
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@ -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 Savage65
-#define DESCRIPTION Savage65 Keyboard

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@ -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 TMOv2
-#define DESCRIPTION TMOv2 Keyboard

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    rockydbull
 #define PRODUCT         Catch22 Hotswap Macropad
-#define DESCRIPTION     Budget 22 Key Hotswap Macropad

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/centromere/config.h
+++ b/keyboards/centromere/config.h
@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Southpaw Design
 #define PRODUCT         centromere
-#define DESCRIPTION     Q.M.K. keyboard firmware for Centromere

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Nightingale Studios/Cheshire Designs
 #define PRODUCT         Curiosity
-#define DESCRIPTION     Curiosity

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/chidori/config.h
+++ b/keyboards/chidori/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Kagizaraya
 #define PRODUCT Chidori
-#define DESCRIPTION Yet another split keyboard made with only through - hole components

 /* key matrix size */
 #define MATRIX_ROWS 12
--- a/keyboards/chili/config.h
+++ b/keyboards/chili/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    YDKB
 #define PRODUCT         Chili
-#define DESCRIPTION     QMK keyboard firmware for Chili, a G80-3000 replacement PCB

 /* key matrix size */
 #define MATRIX_ROWS 11
--- a/keyboards/chimera_ergo/config.h
+++ b/keyboards/chimera_ergo/config.h
@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    unknown
 #define PRODUCT         Chimera Ergo
-#define DESCRIPTION     q.m.k. keyboard firmware for Chimera Ergo

 /* key matrix size */
 #define MATRIX_ROWS 6
--- a/keyboards/chimera_ls/config.h
+++ b/keyboards/chimera_ls/config.h
@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    unknown
 #define PRODUCT         Chimera Lets Split
-#define DESCRIPTION     q.m.k. keyboard firmware for Chimera Lets Split

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/chimera_ortho/config.h
+++ b/keyboards/chimera_ortho/config.h
@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    unknown
 #define PRODUCT         Chimera Ortho
-#define DESCRIPTION     q.m.k. keyboard firmware for Chimera Ortho

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/chimera_ortho_plus/config.h
+++ b/keyboards/chimera_ortho_plus/config.h
@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    unknown
 #define PRODUCT         Chimera Ortho Plus
-#define DESCRIPTION     q.m.k. keyboard firmware for Chimera Ortho Plus

 /* key matrix size */
 #define MATRIX_ROWS 6
--- a/keyboards/choc_taro/config.h
+++ b/keyboards/choc_taro/config.h
@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER 0x0001
 #define MANUFACTURER kakunpc
 #define PRODUCT choc_taro
-#define DESCRIPTION A custom keyboard

 /* key matrix size */
 #define MATRIX_ROWS 16
--- a/keyboards/christmas_tree/config.h
+++ b/keyboards/christmas_tree/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x3070
 #define MANUFACTURER    Maple Computing
 #define PRODUCT         Christmas Tree
-#define DESCRIPTION     A tiny 6 key macro pad, in the shape of a christmas tree

 /* key matrix size */
 #define MATRIX_ROWS 6
--- a/keyboards/ckeys/handwire_101/config.h
+++ b/keyboards/ckeys/handwire_101/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    ckeys_handwire
 #define PRODUCT         ckeys_handwire
-#define DESCRIPTION     4x4 handwire workshop board

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/config.h
@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    cKeys
 #define PRODUCT         naKey
-#define DESCRIPTION     The cKeys through hole ten key pad

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/config.h
@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    You
 #define PRODUCT         obelus
-#define DESCRIPTION     4x4 QMK test platform

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@ -24,7 +24,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER ckeys
 #define PRODUCT thedora
-#define DESCRIPTION A board for keyboard exploration.

 #define ENCODERS_PAD_A { B13 }
 #define ENCODERS_PAD_B { B15 }
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER 0x0001
 #define MANUFACTURER merlin04
 #define PRODUCT Washington Macropad
-#define DESCRIPTION Washington State shaped macropad

 /* key matrix size */
 #define MATRIX_ROWS 3
--- a/keyboards/claw44/rev1/config.h
+++ b/keyboards/claw44/rev1/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER 0x0001
 #define MANUFACTURER yfuku
 #define PRODUCT claw44
-#define DESCRIPTION A split keyboard with 3x6 vertically staggered keys and 4 thumb keys

 /* key matrix size */
 #define MATRIX_ROWS 8
--- a/keyboards/clawsome/bookerboard/config.h
+++ b/keyboards/clawsome/bookerboard/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AlisGraveNil
 #define PRODUCT         Bookerboard
-#define DESCRIPTION     A 12-key QMK-powered macropod

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/clawsome/coupe/config.h
+++ b/keyboards/clawsome/coupe/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AlisGraveNil
 #define PRODUCT         The Coupe
-#define DESCRIPTION     A 61-key/60% QMK-powered custom keyboard

 /* key matrix size */
 #define MATRIX_ROWS 10
--- a/keyboards/clawsome/gamebuddy/config.h
+++ b/keyboards/clawsome/gamebuddy/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AlisGraveNil
 #define PRODUCT         GameBuddy
-#define DESCRIPTION     A 26-key QMK-powered macropad designed for gaming!

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/clawsome/sedan/config.h
+++ b/keyboards/clawsome/sedan/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AlisGraveNil
 #define PRODUCT         The Sedan
-#define DESCRIPTION     A QMK-powered 68% custom keyboard

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/clawsome/sidekick/config.h
+++ b/keyboards/clawsome/sidekick/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AlisGraveNil
 #define PRODUCT         Sidekick
-#define DESCRIPTION     A 27-key QMK-powered macropad

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/cocoa40/config.h
+++ b/keyboards/cocoa40/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    recompile keys
 #define PRODUCT         cocoa40
-#define DESCRIPTION     A 40% keyboard for programmers.

 /* key matrix size */
 #define MATRIX_ROWS 8
--- a/keyboards/comet46/config.h
+++ b/keyboards/comet46/config.h
@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    SatT
 #define PRODUCT         Comet46
-#define DESCRIPTION     qmk keyboard firmware for Comet46

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/contra/config.h
+++ b/keyboards/contra/config.h
@ -9,7 +9,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Cartel
 #define PRODUCT         Contra
-#define DESCRIPTION     Keyboard

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/converter/adb_usb/config.h
+++ b/keyboards/converter/adb_usb/config.h
@ -24,7 +24,6 @@ Ported to QMK by Peter Roe <pete@13bit.me>
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    QMK
 #define PRODUCT         ADB keyboard converter
-#define DESCRIPTION     Convert ADB keyboard to USB

 /* matrix size */
 #define MATRIX_ROWS 16  // keycode bit: 3-0
--- a/keyboards/converter/hp_46010a/config.h
+++ b/keyboards/converter/hp_46010a/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER        0x0001
 #define MANUFACTURER      QMK
 #define PRODUCT           46010A keyboard converter
-#define DESCRIPTION       46010A keyboard converter
                          
 #define MATRIX_ROWS       14
 #define MATRIX_COLS       8
--- a/keyboards/converter/ibm_5291/config.h
+++ b/keyboards/converter/ibm_5291/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER          0x0001
 #define MANUFACTURER        QMK
 #define PRODUCT             5291 keyboard converter
-#define DESCRIPTION         5291 keyboard converter

 #define MATRIX_ROWS         24
 #define MATRIX_COLS         4
--- a/keyboards/converter/ibm_terminal/config.h
+++ b/keyboards/converter/ibm_terminal/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         IBM Terminal Keyboard
-#define DESCRIPTION     USB converter for IBM Terminal Keyboard


 /* matrix size */
--- a/keyboards/converter/m0110_usb/config.h
+++ b/keyboards/converter/m0110_usb/config.h
@ -26,7 +26,6 @@ Ported to QMK by Techsock <info@techsock.com>
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    Apple
 #define PRODUCT         M0110(A)
-#define DESCRIPTION     Converts M0110(A) to USB and/or BT

 /* matrix size */
 #define MATRIX_ROWS 14
--- a/keyboards/converter/m0110_usb/readme.md
+++ b/keyboards/converter/m0110_usb/readme.md
@ -5,7 +5,7 @@ This is a port of the original M0110 converter from TMK to QMK. The original con

 ## Enabling Bluetooth for the Adafruit Feather 32U4 BLE

-Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` and `DESCRIPTION` values from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
+Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.


 ## Pins
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    iw0rm3r
 #define PRODUCT         IBM Model M 101/102
-#define DESCRIPTION     Controlled by AVR chip

 /* key matrix size */
 #define MATRIX_ROWS 8
--- a/keyboards/converter/numeric_keypad_IIe/config.h
+++ b/keyboards/converter/numeric_keypad_IIe/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Apple Inc.
 #define PRODUCT         Numeric Keypad IIe
-#define DESCRIPTION     "Numeric Keypad IIe, A2M2003"

 /*

--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/config.h
@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         Stowaway converter
-#define DESCRIPTION     USB converter for Stowaway keyboard

 // IO pins to serial
 // https://deskthority.net/wiki/Arduino_Pro_Micro for pin lookup
--- a/keyboards/converter/siemens_tastatur/config.h
+++ b/keyboards/converter/siemens_tastatur/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define MANUFACTURER Yiancar-Designs
 #define PRODUCT Siemens Tastatur
-#define DESCRIPTION Practice

 /* key matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/converter/sun_usb/config.h
+++ b/keyboards/converter/sun_usb/config.h
@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    QMK
 #define PRODUCT         Sun keyboard converter
-#define DESCRIPTION     USB converter for Sun type 5 keyboard

 /* matrix size */
 #define MATRIX_ROWS 16
--- a/keyboards/converter/usb_usb/ble/config.h
+++ b/keyboards/converter/usb_usb/ble/config.h
@ -2,8 +2,6 @@

 #undef PRODUCT
 #define PRODUCT         QMK BLE Adapter
-#undef DESCRIPTION
-#define DESCRIPTION

 // Turn off the mode leds on the BLE module
 #define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    QMK
 #define PRODUCT         QMK USB-USB Converter
-#define DESCRIPTION     USB to USB Keyboard Converter with QMK

 /* size of virtual matrix */
 #define MATRIX_ROWS 16
--- a/keyboards/converter/xt_usb/config.h
+++ b/keyboards/converter/xt_usb/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    QMK
 #define PRODUCT         XT keyboard converter
-#define DESCRIPTION     convert XT keyboard to USB


 /* matrix size */
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@ -0,0 +1,153 @@
+/*
+Copyright 2021 Ohashi
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Ohashi
+#define PRODUCT      cool836A
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D1, B5, B4, F4, B1, B6 }
+#define MATRIX_COL_PINS { F5, D0, B2, C6, D7, E6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+//#define DIODE_DIRECTION COL2ROW
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
--- a/keyboards/cool836a/cool836a.c
+++ b/keyboards/cool836a/cool836a.c
@ -0,0 +1,17 @@
+/* Copyright 2021 Ohashi
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cool836a.h"
--- a/keyboards/cool836a/cool836a.h
+++ b/keyboards/cool836a/cool836a.h
@ -0,0 +1,42 @@
+/* Copyright 2021 Ohashi
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+  K000, K001, K002, K003, K004, K005,   K300, K301, K302, K303, K304, K305, \
+  K100, K101, K102, K103, K104, K105,   K400, K401, K402, K403, K404, K405, \
+  K200, K201, K202, K203, K204, K205,   K500, K501, K502, K503, K504, K505 \
+) \
+{ \
+  { K000, K001, K002, K003, K004, K005 }, \
+  { K100, K101, K102, K103, K104, K105 }, \
+  { K200, K201, K202, K203, K204, K205 }, \
+  { K300, K301, K302, K303, K304, K305 }, \
+  { K400, K401, K402, K403, K404, K405 }, \
+  { K500, K501, K502, K503, K504, K505 }, \
+}
--- a/keyboards/cool836a/info.json
+++ b/keyboards/cool836a/info.json
@ -0,0 +1,19 @@
+{
+    "keyboard_name": "cool836a",
+    "url": "https://github.com/telzo2000/cool836A",
+    "maintainer": "Ohashi",
+    "width": 12,
+    "height": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "y": 0},{"x": 4, "y": 0},{"x": 5, "y": 0},
+                {"x": 7.5, "y": 0},{"x": 8.5, "y": 0},{"x": 9.5, "y": 0},{"x": 10.5, "y": 0},{"x": 11.5,"y": 0},{"x": 12.5,"y": 0},
+                {"x": 0, "y": 1},{"x": 1.5, "y": 1},{"x": 2.5, "y": 1},{"x": 3.5, "y": 1},{"x": 4.5, "y": 1},{"x": 5.5, "y": 1},
+                {"x": 8, "y": 1},{"x": 9, "y": 1},{"x": 10, "y": 1},{"x": 11, "y": 1},{"x": 12,"y": 1},{"x": 13,"y": 1},
+                {"x": 0, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2},
+                {"x": 7.5, "y": 2},{"x": 8.5, "y": 2},{"x": 9.5, "y": 2},{"x": 10.5, "y": 2},{"x": 11.5,"y": 2},{"x": 12.5,"y": 2}
+            ]
+        }
+    }
+}
--- a/keyboards/cool836a/keymaps/default/keymap.c
+++ b/keyboards/cool836a/keymaps/default/keymap.c
@ -0,0 +1,41 @@
+/* Copyright 2021 Ohashi
+* 
+* This program is free software: you can redistribute it and/or modify 
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation, either version 2 of the License, or 
+* (at your option) any later version. 
+* 
+* This program is distributed in the hope that it will be useful, 
+* but WITHOUT ANY WARRANTY; without even the implied warranty of 
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+* GNU General Public License for more details. 
+* 
+* You should have received a copy of the GNU General Public License 
+* along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESC,  LALT_T(KC_Q), KC_W,        KC_E, KC_R,        KC_T,        KC_Y,   KC_U,           KC_I, KC_O, KC_P,     KC_BSPC,
+        KC_LCTL, KC_A,         KC_S,        KC_D, KC_F,        KC_G,        KC_H,   KC_J,           KC_K, KC_L, KC_MINS,  KC_ENTER,
+        KC_LSFT, KC_Z,         GUI_T(KC_X), KC_C, LT(3, KC_V), LT(2, KC_B), KC_SPC, LT(1, KC_N), KC_M, KC_COMM, KC_DOT,   KC_SPC
+    ),
+    [1] = LAYOUT(
+        KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,       KC_6,    KC_7,     KC_8,    KC_9,    KC_0,   KC_BSPC,
+        KC_LCTL, KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC,    KC_PLUS, KC_MINS, KC_ASTR, KC_PSLS, KC_EQL,  KC_ENTER,
+        KC_LSFT, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, KC_SPC
+    ),
+    [2] = LAYOUT(
+        KC_TAB,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_BSPC,
+        KC_LCTL, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN,  KC_COLN,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUES, KC_ENTER,
+        KC_LSFT, KC_UNDS, KC_PIPE, KC_CIRC, KC_TILD, _______,    _______, _______, _______, _______,  _______,  KC_SPC
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_LPRN, KC_RPRN, _______,
+        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
+    )
+};
--- a/keyboards/cool836a/keymaps/default/readme.md
+++ b/keyboards/cool836a/keymaps/default/readme.md
@ -0,0 +1,15 @@
+# m.ki様によるデフォルトキーマップ
+
+[レッドバージョン　ビルドガイド](https://github.com/telzo2000/cool836A/blob/master/buildguide_red.md)で紹介されていたキーマップです。チートシートを見ながらコードに書き写しました。
+
+-------
+## チートシート
+以下、[同ページ](https://github.com/telzo2000/cool836A/blob/master/buildguide_red.md)の画像のコピーを添付します。
+ Layer=0
+![Layer=0](https://github.com/oha-Ohashi/qmk_firmware/blob/images/default_keymap/default_0.png)
+ Layer=1
+![Layer=1](https://github.com/oha-Ohashi/qmk_firmware/blob/images/default_keymap/default_1.png)
+ Layer=2
+![Layer=2](https://github.com/oha-Ohashi/qmk_firmware/blob/images/default_keymap/default_2.png)
+ Layer=3
+![Layer=3](https://github.com/oha-Ohashi/qmk_firmware/blob/images/default_keymap/default_3.png)
--- a/keyboards/cool836a/readme.md
+++ b/keyboards/cool836a/readme.md
@ -0,0 +1,51 @@
+# cool836A
+
+- このプロジェクトの詳細については設計者たる[m.ki様](https://twitter.com/0002ozlet)による[GitHubリポジトリ](https://github.com/telzo2000/cool836A)の記述をご覧ください。
+
+### バージョン(A, B+, C+)について
+- m.ki様によるとどのバージョンも回路は同じで、ファームウェアを分ける必要はないとのことです。
+- しかしながらこのファームウェアは、cool836A ver.B+ (通称レッドバージョン)のみでテストされています(2021年1月7日現在)。そのため念のため、当面の間はサブフォルダの名前をcool836A/verB_REDとさせていただきます。
+- ほかのバージョンに書き込んだときに不具合等がありましたら、方はお気軽に私[オオハシ](https://twitter.com/oha_oha_Ohashi)までご連絡ください。
+
+
+## 申し訳程度のチュートリアル
+詳細に書き込む労力は払えませんでしたが、最低限のコードのみ記します。
+
+git clone のあと、
+
+``` make cool836A/verB_RED:default ```
+
+でコンパイル可能であることを確認し、
+
+``` make cool836A/verB_RED:default:avrdude ```
+
+によってデフォルトキーマップをPro Microに焼けるかもしれません。
+`default`の代わりに`Ohasheen`を利用することもできます。
+
+初心者の方はもっと素晴らしいウェブサイトでGitやqmk firmwareの使い方を覚えていただくのがよいかと思います。
+
+
+
+-----------------
+## English
+- [Here](https://github.com/telzo2000/cool836A) are a full description of this project and build guide by the great Designer: [m.ki](imgur.com image replace me!)
+
+- Each virsions(A, B+, C+) of cool836A has the same circuit and that means you can install this firmware on any of them.
+- However, this repository is currently(Jan 7, 2021) tested on ver.B+ (RED version) only. Feel free to contact [ME](https://github.com/ketcha-k) for any problems.
+
+- firmware maintainer: [Ohashi](https://github.com/ketcha-k)
+
+## Such a humble tutorial
+The author would like to provide a minimum guide.
+
+After cloning the repository, you may want to 
+
+``` make cool836A/verB_RED ```
+
+to make sure it's compilable, and 
+
+``` make cool836A/verB_RED:default ```
+
+which leads you to the goal.
+
+It is recommended that beginners learn how to get started with qmk firmware/configurator at other fantastic websites rather than here......
--- a/keyboards/cool836a/rules.mk
+++ b/keyboards/cool836a/rules.mk
@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Copenhagen Click
 #define PRODUCT         Click Pad V1
-#define DESCRIPTION     A single switch macropad given out at the Copenhagen Click 2019 meetup.

 /* key matrix size */
 #define MATRIX_ROWS 1
--- a/Show more
+++ b/Show more