diff options
| author | Ryan <fauxpark@gmail.com> | 2023-12-02 01:05:46 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 14:05:46 +0000 |
| commit | afa0eab37462e9335832190dedd040679d9cb746 (patch) | |
| tree | bb62606505d22b259d4bd709ff718b96af2c8375 /keyboards | |
| parent | 28dc7ba6a8217a81002d7386b8cb39b7d9da2581 (diff) | |
Fix a bunch of CLI warnings (#22589)
Diffstat (limited to 'keyboards')
47 files changed, 293 insertions, 346 deletions
diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h index 2f2eb82fee..00674eea11 100644 --- a/keyboards/0xcb/splaytoraid/config.h +++ b/keyboards/0xcb/splaytoraid/config.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING | 8 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING |
| 9 | #define RGB_MATRIX_DEFAULT_HUE 152 | 9 | #define RGB_MATRIX_DEFAULT_HUE 152 |
| 10 | #define RGB_MATRIX_DEFAULT_SAT 232 | 10 | #define RGB_MATRIX_DEFAULT_SAT 232 |
| 11 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 12 | #define RGB_MATRIX_DEFAULT_SPD 50 | 11 | #define RGB_MATRIX_DEFAULT_SPD 50 |
| 13 | 12 | ||
| 14 | #define ENABLE_RGB_MATRIX_BREATHING | 13 | #define ENABLE_RGB_MATRIX_BREATHING |
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 28a4e88893..c6e12504a3 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h | |||
| @@ -27,9 +27,7 @@ | |||
| 27 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true | 27 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true |
| 28 | #define RGB_MATRIX_LED_COUNT 96 | 28 | #define RGB_MATRIX_LED_COUNT 96 |
| 29 | #define RGB_MATRIX_DEFAULT_HUE 170 | 29 | #define RGB_MATRIX_DEFAULT_HUE 170 |
| 30 | #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 31 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 | 30 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 |
| 32 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 33 | 31 | ||
| 34 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue | 32 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue |
| 35 | #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes | 33 | #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes |
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index df0ebb0fdc..7dfa48fbd4 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | # define LED_HITS_TO_REMEMBER 10 | 35 | # define LED_HITS_TO_REMEMBER 10 |
| 36 | 36 | ||
| 37 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 | 37 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 |
| 38 | # define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 39 | // the above brighness setting has no effect on rgb_matrix_set_color(). | 38 | // the above brighness setting has no effect on rgb_matrix_set_color(). |
| 40 | // Use darker colors instead. | 39 | // Use darker colors instead. |
| 41 | /* RGB darker COLORS */ | 40 | /* RGB darker COLORS */ |
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h index ced39ef4a1..2cd4394da0 100644 --- a/keyboards/bastardkb/charybdis/config.h +++ b/keyboards/bastardkb/charybdis/config.h | |||
| @@ -41,8 +41,6 @@ | |||
| 41 | # define RGB_MATRIX_KEYPRESSES | 41 | # define RGB_MATRIX_KEYPRESSES |
| 42 | 42 | ||
| 43 | // Startup values. | 43 | // Startup values. |
| 44 | # define RGB_MATRIX_DEFAULT_HUE 0 | ||
| 45 | # define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 46 | # define RGB_MATRIX_DEFAULT_VAL 64 | 44 | # define RGB_MATRIX_DEFAULT_VAL 64 |
| 47 | 45 | ||
| 48 | // Rainbow swirl as startup mode. | 46 | // Rainbow swirl as startup mode. |
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 8604597ff8..d25bb07528 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | # define RGB_MATRIX_LED_COUNT 36 | 47 | # define RGB_MATRIX_LED_COUNT 36 |
| 48 | # define RGB_MATRIX_SPLIT { 18, 18 } | 48 | # define RGB_MATRIX_SPLIT { 18, 18 } |
| 49 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 | 49 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 |
| 50 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 51 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 50 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 52 | # define RGB_MATRIX_KEYPRESSES | 51 | # define RGB_MATRIX_KEYPRESSES |
| 53 | #endif | 52 | #endif |
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h index 33c62549a1..ec538f8a55 100644 --- a/keyboards/bastardkb/scylla/config.h +++ b/keyboards/bastardkb/scylla/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | # define RGB_MATRIX_LED_COUNT 58 | 24 | # define RGB_MATRIX_LED_COUNT 58 |
| 25 | # define RGB_MATRIX_SPLIT { 29, 29 } | 25 | # define RGB_MATRIX_SPLIT { 29, 29 } |
| 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 | 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 |
| 27 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 28 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 27 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 29 | # define RGB_MATRIX_KEYPRESSES | 28 | # define RGB_MATRIX_KEYPRESSES |
| 30 | #endif | 29 | #endif |
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h index a7f9c94387..58dacb5c53 100644 --- a/keyboards/bastardkb/skeletyl/config.h +++ b/keyboards/bastardkb/skeletyl/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | # define RGB_MATRIX_LED_COUNT 36 | 24 | # define RGB_MATRIX_LED_COUNT 36 |
| 25 | # define RGB_MATRIX_SPLIT { 18, 18 } | 25 | # define RGB_MATRIX_SPLIT { 18, 18 } |
| 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 | 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 |
| 27 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 28 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 27 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 29 | # define RGB_MATRIX_KEYPRESSES | 28 | # define RGB_MATRIX_KEYPRESSES |
| 30 | #endif | 29 | #endif |
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h index ea18f4349e..1a1540b280 100644 --- a/keyboards/bastardkb/tbkmini/config.h +++ b/keyboards/bastardkb/tbkmini/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | # define RGB_MATRIX_LED_COUNT 42 | 24 | # define RGB_MATRIX_LED_COUNT 42 |
| 25 | # define RGB_MATRIX_SPLIT { 21, 21 } | 25 | # define RGB_MATRIX_SPLIT { 21, 21 } |
| 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 | 26 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 |
| 27 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 28 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 27 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 29 | # define RGB_MATRIX_KEYPRESSES | 28 | # define RGB_MATRIX_KEYPRESSES |
| 30 | #endif | 29 | #endif |
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h index 7ecadd0076..657c373c7b 100644 --- a/keyboards/bubble75/hotswap/config.h +++ b/keyboards/bubble75/hotswap/config.h | |||
| @@ -35,10 +35,6 @@ | |||
| 35 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 | 35 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 |
| 36 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 | 36 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 |
| 37 | //#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT | 37 | //#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 38 | #define RGB_MATRIX_DEFAULT_HUE 0 | ||
| 39 | #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 40 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 41 | #define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 42 | 38 | ||
| 43 | 39 | ||
| 44 | 40 | ||
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h index 83e6ccfe0e..6643e610c0 100644 --- a/keyboards/chromatonemini/config.h +++ b/keyboards/chromatonemini/config.h | |||
| @@ -27,8 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 27 | // for all fingers used at once. | 27 | // for all fingers used at once. |
| 28 | # define LED_HITS_TO_REMEMBER 10 | 28 | # define LED_HITS_TO_REMEMBER 10 |
| 29 | 29 | ||
| 30 | # define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 31 | |||
| 32 | // the above brighness setting has no effect on rgb_matrix_set_color(). | 30 | // the above brighness setting has no effect on rgb_matrix_set_color(). |
| 33 | // Use darker colors instead. | 31 | // Use darker colors instead. |
| 34 | /* RGB darker COLORS */ | 32 | /* RGB darker COLORS */ |
diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/info.json index 2a91291fcb..845c52e3e0 100644 --- a/keyboards/dcpedit/redherring/info.json +++ b/keyboards/dcpedit/redherring/info.json | |||
| @@ -43,96 +43,101 @@ | |||
| 43 | "layouts": { | 43 | "layouts": { |
| 44 | "LAYOUT": { | 44 | "LAYOUT": { |
| 45 | "layout": [ | 45 | "layout": [ |
| 46 | {"label": "5,14", "matrix": [5, 14], "x": 0.75, "y": 0.25}, | 46 | {"label": "5,14", "matrix": [5, 14], "x": 0.75, "y": 0.12}, |
| 47 | {"label": "0,0", "matrix": [0, 0], "x": 2.25, "y": 0.25}, | 47 | {"label": "0,0", "matrix": [0, 0], "x": 2.25, "y": 0.12}, |
| 48 | {"label": "0,1", "matrix": [0, 1], "x": 3.25, "y": 0.25}, | 48 | {"label": "0,1", "matrix": [0, 1], "x": 3.25, "y": 0.12}, |
| 49 | {"label": "0,2", "matrix": [0, 2], "x": 4.75, "y": 0.25}, | 49 | {"label": "0,2", "matrix": [0, 2], "x": 4.75, "y": 0.12}, |
| 50 | {"label": "0,3", "matrix": [0, 3], "x": 5.75, "y": 0.13}, | 50 | {"label": "0,3", "matrix": [0, 3], "x": 5.75, "y": 0}, |
| 51 | {"label": "0,4", "matrix": [0, 4], "x": 6.75, "y": 0.25}, | 51 | {"label": "0,4", "matrix": [0, 4], "x": 6.75, "y": 0.12}, |
| 52 | {"label": "0,5", "matrix": [0, 5], "x": 7.75, "y": 0.38}, | 52 | {"label": "0,5", "matrix": [0, 5], "x": 7.75, "y": 0.25}, |
| 53 | {"label": "0,6", "matrix": [0, 6], "x": 11.5, "y": 0.38}, | 53 | {"label": "0,6", "matrix": [0, 6], "x": 11.5, "y": 0.25}, |
| 54 | {"label": "0,7", "matrix": [0, 7], "x": 12.5, "y": 0.25}, | 54 | {"label": "0,7", "matrix": [0, 7], "x": 12.5, "y": 0.12}, |
| 55 | {"label": "0,8", "matrix": [0, 8], "x": 13.5, "y": 0.13}, | 55 | {"label": "0,8", "matrix": [0, 8], "x": 13.5, "y": 0}, |
| 56 | {"label": "0,9", "matrix": [0, 9], "x": 14.5, "y": 0.25}, | 56 | {"label": "0,9", "matrix": [0, 9], "x": 14.5, "y": 0.12}, |
| 57 | {"label": "0,10", "matrix": [0, 10], "x": 16, "y": 0.25}, | 57 | {"label": "0,10", "matrix": [0, 10], "x": 16, "y": 0.12}, |
| 58 | {"label": "0,11", "matrix": [0, 11], "x": 17, "y": 0.25}, | 58 | {"label": "0,11", "matrix": [0, 11], "x": 17, "y": 0.12}, |
| 59 | {"label": "0,12", "matrix": [0, 12], "x": 18.13, "y": 0.25}, | 59 | {"label": "0,12", "matrix": [0, 12], "x": 18.13, "y": 0.12}, |
| 60 | {"label": "0,13", "matrix": [0, 13], "x": 19.13, "y": 0.25}, | 60 | {"label": "0,13", "matrix": [0, 13], "x": 19.13, "y": 0.12}, |
| 61 | {"label": "0,14", "matrix": [0, 14], "x": 21, "y": 0.25}, | 61 | {"label": "0,14", "matrix": [0, 14], "x": 21, "y": 0.12}, |
| 62 | {"label": "1,0", "matrix": [1, 0], "x": 2, "y": 1.5}, | 62 | |
| 63 | {"label": "1,1", "matrix": [1, 1], "x": 3, "y": 1.5}, | 63 | {"label": "1,0", "matrix": [1, 0], "x": 2, "y": 1.37}, |
| 64 | {"label": "1,2", "matrix": [1, 2], "x": 4.75, "y": 1.5}, | 64 | {"label": "1,1", "matrix": [1, 1], "x": 3, "y": 1.37}, |
| 65 | {"label": "1,3", "matrix": [1, 3], "x": 5.75, "y": 1.38}, | 65 | {"label": "1,2", "matrix": [1, 2], "x": 4.75, "y": 1.37}, |
| 66 | {"label": "1,4", "matrix": [1, 4], "x": 6.75, "y": 1.5}, | 66 | {"label": "1,3", "matrix": [1, 3], "x": 5.75, "y": 1.25}, |
| 67 | {"label": "1,5", "matrix": [1, 5], "x": 7.75, "y": 1.63}, | 67 | {"label": "1,4", "matrix": [1, 4], "x": 6.75, "y": 1.37}, |
| 68 | {"label": "1,6", "matrix": [1, 6], "x": 11.5, "y": 1.63}, | 68 | {"label": "1,5", "matrix": [1, 5], "x": 7.75, "y": 1.5}, |
| 69 | {"label": "1,7", "matrix": [1, 7], "x": 12.5, "y": 1.5}, | 69 | {"label": "1,6", "matrix": [1, 6], "x": 11.5, "y": 1.5}, |
| 70 | {"label": "1,8", "matrix": [1, 8], "x": 13.5, "y": 1.38}, | 70 | {"label": "1,7", "matrix": [1, 7], "x": 12.5, "y": 1.37}, |
| 71 | {"label": "1,9", "matrix": [1, 9], "x": 14.5, "y": 1.5}, | 71 | {"label": "1,8", "matrix": [1, 8], "x": 13.5, "y": 1.25}, |
| 72 | {"label": "1,10", "matrix": [1, 10], "x": 16.25, "y": 1.5}, | 72 | {"label": "1,9", "matrix": [1, 9], "x": 14.5, "y": 1.37}, |
| 73 | {"label": "1,11", "matrix": [1, 11], "x": 17.25, "y": 1.5}, | 73 | {"label": "1,10", "matrix": [1, 10], "x": 16.25, "y": 1.37}, |
| 74 | {"label": "1,12", "matrix": [1, 12], "x": 18.25, "y": 1.5}, | 74 | {"label": "1,11", "matrix": [1, 11], "x": 17.25, "y": 1.37}, |
| 75 | {"label": "1,13", "matrix": [1, 13], "x": 19.25, "y": 1.5}, | 75 | {"label": "1,12", "matrix": [1, 12], "x": 18.25, "y": 1.37}, |
| 76 | {"label": "1,14", "matrix": [1, 14], "x": 20.25, "y": 1.5}, | 76 | {"label": "1,13", "matrix": [1, 13], "x": 19.25, "y": 1.37}, |
| 77 | {"label": "2,14", "matrix": [2, 14], "x": 21.75, "y": 1.5}, | 77 | {"label": "1,14", "matrix": [1, 14], "x": 20.25, "y": 1.37}, |
| 78 | {"label": "2,0", "matrix": [2, 0], "x": 1.25, "y": 2.5, "w": 1.5}, | 78 | {"label": "2,14", "matrix": [2, 14], "x": 21.75, "y": 1.37}, |
| 79 | {"label": "2,1", "matrix": [2, 1], "x": 2.75, "y": 2.5}, | 79 | |
| 80 | {"label": "2,2", "matrix": [2, 2], "x": 4.75, "y": 2.5}, | 80 | {"label": "2,0", "matrix": [2, 0], "x": 1.25, "y": 2.37, "w": 1.5}, |
| 81 | {"label": "2,3", "matrix": [2, 3], "x": 5.75, "y": 2.38}, | 81 | {"label": "2,1", "matrix": [2, 1], "x": 2.75, "y": 2.37}, |
| 82 | {"label": "2,4", "matrix": [2, 4], "x": 6.75, "y": 2.5}, | 82 | {"label": "2,2", "matrix": [2, 2], "x": 4.75, "y": 2.37}, |
| 83 | {"label": "2,5", "matrix": [2, 5], "x": 7.75, "y": 2.63}, | 83 | {"label": "2,3", "matrix": [2, 3], "x": 5.75, "y": 2.25}, |
| 84 | {"label": "2,6", "matrix": [2, 6], "x": 11.5, "y": 2.63}, | 84 | {"label": "2,4", "matrix": [2, 4], "x": 6.75, "y": 2.37}, |
| 85 | {"label": "2,7", "matrix": [2, 7], "x": 12.5, "y": 2.5}, | 85 | {"label": "2,5", "matrix": [2, 5], "x": 7.75, "y": 2.5}, |
| 86 | {"label": "2,8", "matrix": [2, 8], "x": 13.5, "y": 2.38}, | 86 | {"label": "2,6", "matrix": [2, 6], "x": 11.5, "y": 2.5}, |
| 87 | {"label": "2,9", "matrix": [2, 9], "x": 14.5, "y": 2.5}, | 87 | {"label": "2,7", "matrix": [2, 7], "x": 12.5, "y": 2.37}, |
| 88 | {"label": "2,10", "matrix": [2, 10], "x": 16.5, "y": 2.5}, | 88 | {"label": "2,8", "matrix": [2, 8], "x": 13.5, "y": 2.25}, |
| 89 | {"label": "2,11", "matrix": [2, 11], "x": 17.5, "y": 2.5}, | 89 | {"label": "2,9", "matrix": [2, 9], "x": 14.5, "y": 2.37}, |
| 90 | {"label": "2,12", "matrix": [2, 12], "x": 18.5, "y": 2.5}, | 90 | {"label": "2,10", "matrix": [2, 10], "x": 16.5, "y": 2.37}, |
| 91 | {"label": "2,13", "matrix": [2, 13], "x": 19.5, "y": 2.5, "w": 1.5}, | 91 | {"label": "2,11", "matrix": [2, 11], "x": 17.5, "y": 2.37}, |
| 92 | {"label": "3,13", "matrix": [3, 13], "x": 21.5, "y": 2.5}, | 92 | {"label": "2,12", "matrix": [2, 12], "x": 18.5, "y": 2.37}, |
| 93 | {"label": "3,0", "matrix": [3, 0], "x": 0.75, "y": 3.5, "w": 1.75}, | 93 | {"label": "2,13", "matrix": [2, 13], "x": 19.5, "y": 2.37, "w": 1.5}, |
| 94 | {"label": "3,1", "matrix": [3, 1], "x": 2.5, "y": 3.5}, | 94 | {"label": "3,13", "matrix": [3, 13], "x": 21.5, "y": 2.37}, |
| 95 | {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3.5}, | 95 | |
| 96 | {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3.38}, | 96 | {"label": "3,0", "matrix": [3, 0], "x": 0.75, "y": 3.37, "w": 1.75}, |
| 97 | {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3.5}, | 97 | {"label": "3,1", "matrix": [3, 1], "x": 2.5, "y": 3.37}, |
| 98 | {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3.63}, | 98 | {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3.37}, |
| 99 | {"label": "3,6", "matrix": [3, 6], "x": 11.5, "y": 3.63}, | 99 | {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3.25}, |
| 100 | {"label": "3,7", "matrix": [3, 7], "x": 12.5, "y": 3.5}, | 100 | {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3.37}, |
| 101 | {"label": "3,8", "matrix": [3, 8], "x": 13.5, "y": 3.38}, | 101 | {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3.5}, |
| 102 | {"label": "3,9", "matrix": [3, 9], "x": 14.5, "y": 3.5}, | 102 | {"label": "3,6", "matrix": [3, 6], "x": 11.5, "y": 3.5}, |
| 103 | {"label": "3,10", "matrix": [3, 10], "x": 16.75, "y": 3.5}, | 103 | {"label": "3,7", "matrix": [3, 7], "x": 12.5, "y": 3.37}, |
| 104 | {"label": "3,11", "matrix": [3, 11], "x": 17.75, "y": 3.5}, | 104 | {"label": "3,8", "matrix": [3, 8], "x": 13.5, "y": 3.25}, |
| 105 | {"label": "3,12", "matrix": [3, 12], "x": 18.75, "y": 3.5, "w": 2.25}, | 105 | {"label": "3,9", "matrix": [3, 9], "x": 14.5, "y": 3.37}, |
| 106 | {"label": "3,14", "matrix": [3, 14], "x": 21.25, "y": 3.5}, | 106 | {"label": "3,10", "matrix": [3, 10], "x": 16.75, "y": 3.37}, |
| 107 | {"label": "4,14", "matrix": [4, 14], "x": 0, "y": 4.5, "w": 1.25}, | 107 | {"label": "3,11", "matrix": [3, 11], "x": 17.75, "y": 3.37}, |
| 108 | {"label": "4,0", "matrix": [4, 0], "x": 1.25, "y": 4.5}, | 108 | {"label": "3,12", "matrix": [3, 12], "x": 18.75, "y": 3.37, "w": 2.25}, |
| 109 | {"label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.5}, | 109 | {"label": "3,14", "matrix": [3, 14], "x": 21.25, "y": 3.37}, |
| 110 | {"label": "4,2", "matrix": [4, 2], "x": 4.75, "y": 4.5}, | 110 | |
| 111 | {"label": "4,3", "matrix": [4, 3], "x": 5.75, "y": 4.38}, | 111 | {"label": "4,14", "matrix": [4, 14], "x": 0, "y": 4.37, "w": 1.25}, |
| 112 | {"label": "4,4", "matrix": [4, 4], "x": 6.75, "y": 4.5}, | 112 | {"label": "4,0", "matrix": [4, 0], "x": 1.25, "y": 4.37}, |
| 113 | {"label": "4,5", "matrix": [4, 5], "x": 7.75, "y": 4.63}, | 113 | {"label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.37}, |
| 114 | {"label": "5,5", "matrix": [5, 5], "x": 8.75, "y": 4.63}, | 114 | {"label": "4,2", "matrix": [4, 2], "x": 4.75, "y": 4.37}, |
| 115 | {"label": "5,6", "matrix": [5, 6], "x": 10.5, "y": 4.63}, | 115 | {"label": "4,3", "matrix": [4, 3], "x": 5.75, "y": 4.25}, |
| 116 | {"label": "4,6", "matrix": [4, 6], "x": 11.5, "y": 4.63}, | 116 | {"label": "4,4", "matrix": [4, 4], "x": 6.75, "y": 4.37}, |
| 117 | {"label": "4,7", "matrix": [4, 7], "x": 12.5, "y": 4.5}, | 117 | {"label": "4,5", "matrix": [4, 5], "x": 7.75, "y": 4.5}, |
| 118 | {"label": "4,8", "matrix": [4, 8], "x": 13.5, "y": 4.38}, | 118 | {"label": "5,5", "matrix": [5, 5], "x": 8.75, "y": 4.5}, |
| 119 | {"label": "4,9", "matrix": [4, 9], "x": 14.5, "y": 4.5}, | 119 | {"label": "5,6", "matrix": [5, 6], "x": 10.5, "y": 4.5}, |
| 120 | {"label": "4,10", "matrix": [4, 10], "x": 17, "y": 4.5}, | 120 | {"label": "4,6", "matrix": [4, 6], "x": 11.5, "y": 4.5}, |
| 121 | {"label": "4,11", "matrix": [4, 11], "x": 18, "y": 4.5}, | 121 | {"label": "4,7", "matrix": [4, 7], "x": 12.5, "y": 4.37}, |
| 122 | {"label": "4,12", "matrix": [4, 12], "x": 19, "y": 4.5, "w": 1.25}, | 122 | {"label": "4,8", "matrix": [4, 8], "x": 13.5, "y": 4.25}, |
| 123 | {"label": "4,13", "matrix": [4, 13], "x": 20.5, "y": 4.75}, | 123 | {"label": "4,9", "matrix": [4, 9], "x": 14.5, "y": 4.37}, |
| 124 | {"label": "5,0", "matrix": [5, 0], "x": 0.5, "y": 5.5, "w": 1.25}, | 124 | {"label": "4,10", "matrix": [4, 10], "x": 17, "y": 4.37}, |
| 125 | {"label": "5,1", "matrix": [5, 1], "x": 1.75, "y": 5.5, "w": 1.25}, | 125 | {"label": "4,11", "matrix": [4, 11], "x": 18, "y": 4.37}, |
| 126 | {"label": "5,2", "matrix": [5, 2], "x": 5.25, "y": 5.5, "w": 1.25}, | 126 | {"label": "4,12", "matrix": [4, 12], "x": 19, "y": 4.37, "w": 1.25}, |
| 127 | {"label": "5,3", "matrix": [5, 3], "x": 6.5, "y": 5.5, "w": 1.25}, | 127 | {"label": "4,13", "matrix": [4, 13], "x": 20.5, "y": 4.62}, |
| 128 | {"label": "5,4", "matrix": [5, 4], "x": 7.75, "y": 5.63, "w": 2}, | 128 | |
| 129 | {"label": "5,7", "matrix": [5, 7], "x": 10.5, "y": 5.63, "w": 2.75}, | 129 | {"label": "5,0", "matrix": [5, 0], "x": 0.5, "y": 5.37, "w": 1.25}, |
| 130 | {"label": "5,8", "matrix": [5, 8], "x": 13.25, "y": 5.5, "w": 1.25}, | 130 | {"label": "5,1", "matrix": [5, 1], "x": 1.75, "y": 5.37, "w": 1.25}, |
| 131 | {"label": "5,9", "matrix": [5, 9], "x": 16.75, "y": 5.5, "w": 1.25}, | 131 | {"label": "5,2", "matrix": [5, 2], "x": 5.25, "y": 5.37, "w": 1.25}, |
| 132 | {"label": "5,10", "matrix": [5, 10], "x": 18, "y": 5.5, "w": 1.25}, | 132 | {"label": "5,3", "matrix": [5, 3], "x": 6.5, "y": 5.37, "w": 1.25}, |
| 133 | {"label": "5,11", "matrix": [5, 11], "x": 19.5, "y": 5.75}, | 133 | {"label": "5,4", "matrix": [5, 4], "x": 7.75, "y": 5.5, "w": 2}, |
| 134 | {"label": "5,12", "matrix": [5, 12], "x": 20.5, "y": 5.75}, | 134 | {"label": "5,7", "matrix": [5, 7], "x": 10.5, "y": 5.5, "w": 2.75}, |
| 135 | {"label": "5,13", "matrix": [5, 13], "x": 21.5, "y": 5.75} | 135 | {"label": "5,8", "matrix": [5, 8], "x": 13.25, "y": 5.37, "w": 1.25}, |
| 136 | {"label": "5,9", "matrix": [5, 9], "x": 16.75, "y": 5.37, "w": 1.25}, | ||
| 137 | {"label": "5,10", "matrix": [5, 10], "x": 18, "y": 5.37, "w": 1.25}, | ||
| 138 | {"label": "5,11", "matrix": [5, 11], "x": 19.5, "y": 5.62}, | ||
| 139 | {"label": "5,12", "matrix": [5, 12], "x": 20.5, "y": 5.62}, | ||
| 140 | {"label": "5,13", "matrix": [5, 13], "x": 21.5, "y": 5.62} | ||
| 136 | ] | 141 | ] |
| 137 | } | 142 | } |
| 138 | } | 143 | } |
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index 8ec8f6b0d3..9fcb90742f 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h | |||
| @@ -26,10 +26,6 @@ | |||
| 26 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 26 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 27 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 27 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 28 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL | 28 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL |
| 29 | #define RGB_MATRIX_DEFAULT_HUE 0 | ||
| 30 | #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 31 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 32 | #define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 33 | // Enable Effects | 29 | // Enable Effects |
| 34 | // == Regular Effects == | 30 | // == Regular Effects == |
| 35 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS | 31 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS |
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h index 460fa439f6..6d635d7557 100644 --- a/keyboards/doio/kb16/rev1/config.h +++ b/keyboards/doio/kb16/rev1/config.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | /* RGB Matrix config */ | 24 | /* RGB Matrix config */ |
| 25 | #define RGB_MATRIX_LED_COUNT 16 | 25 | #define RGB_MATRIX_LED_COUNT 16 |
| 26 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 26 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 27 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 28 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN | 27 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN |
| 29 | #define RGB_MATRIX_KEYPRESSES | 28 | #define RGB_MATRIX_KEYPRESSES |
| 30 | 29 | ||
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h index cc8d0a6830..fc58b8518b 100644 --- a/keyboards/doio/kb16/rev2/config.h +++ b/keyboards/doio/kb16/rev2/config.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | /* RGB Matrix config */ | 31 | /* RGB Matrix config */ |
| 32 | #define RGB_MATRIX_LED_COUNT 16 | 32 | #define RGB_MATRIX_LED_COUNT 16 |
| 33 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 33 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 34 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 35 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN | 34 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN |
| 36 | #define RGB_MATRIX_KEYPRESSES | 35 | #define RGB_MATRIX_KEYPRESSES |
| 37 | 36 | ||
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index 2a1a827375..586a61c7a0 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | /* RGB Matrix config */ | 38 | /* RGB Matrix config */ |
| 39 | #define RGB_MATRIX_LED_COUNT 36 | 39 | #define RGB_MATRIX_LED_COUNT 36 |
| 40 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 40 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 41 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 42 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN | 41 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN |
| 43 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 42 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 44 | # define RGB_MATRIX_KEYPRESSES | 43 | # define RGB_MATRIX_KEYPRESSES |
diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h index ff90cbc8a7..106ad4d651 100644 --- a/keyboards/doio/kb38/config.h +++ b/keyboards/doio/kb38/config.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define ENABLE_RGB_MATRIX_BREATHING | 13 | #define ENABLE_RGB_MATRIX_BREATHING |
| 14 | #define ENABLE_RGB_MATRIX_CYCLE_ALL | 14 | #define ENABLE_RGB_MATRIX_CYCLE_ALL |
| 15 | #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 15 | #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
| 16 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 17 | 16 | ||
| 18 | /* | 17 | /* |
| 19 | * Feature disable options | 18 | * Feature disable options |
diff --git a/keyboards/enviousdesign/60f/info.json b/keyboards/enviousdesign/60f/info.json index 20876aa0b8..c163ca5d6d 100644 --- a/keyboards/enviousdesign/60f/info.json +++ b/keyboards/enviousdesign/60f/info.json | |||
| @@ -27,200 +27,212 @@ | |||
| 27 | "layouts": { | 27 | "layouts": { |
| 28 | "LAYOUT_60_ansi": { | 28 | "LAYOUT_60_ansi": { |
| 29 | "layout": [ | 29 | "layout": [ |
| 30 | {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0}, | 30 | {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, |
| 31 | {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0}, | 31 | {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, |
| 32 | {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0}, | 32 | {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, |
| 33 | {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0}, | 33 | {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, |
| 34 | {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0}, | 34 | {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, |
| 35 | {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0}, | 35 | {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, |
| 36 | {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0}, | 36 | {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, |
| 37 | {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0}, | 37 | {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, |
| 38 | {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0}, | 38 | {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, |
| 39 | {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0}, | 39 | {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, |
| 40 | {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0}, | 40 | {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, |
| 41 | {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0}, | 41 | {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, |
| 42 | {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0}, | 42 | {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, |
| 43 | {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2}, | 43 | {"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, |
| 44 | {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5}, | 44 | |
| 45 | {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1}, | 45 | {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, |
| 46 | {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1}, | 46 | {"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1}, |
| 47 | {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1}, | 47 | {"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1}, |
| 48 | {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1}, | 48 | {"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1}, |
| 49 | {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1}, | 49 | {"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1}, |
| 50 | {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1}, | 50 | {"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1}, |
| 51 | {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1}, | 51 | {"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1}, |
| 52 | {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1}, | 52 | {"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1}, |
| 53 | {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1}, | 53 | {"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1}, |
| 54 | {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1}, | 54 | {"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1}, |
| 55 | {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1}, | 55 | {"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1}, |
| 56 | {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1}, | 56 | {"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1}, |
| 57 | {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5}, | 57 | {"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1}, |
| 58 | {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75}, | 58 | {"label": "1,14", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, |
| 59 | {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2}, | 59 | |
| 60 | {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2}, | 60 | {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, |
| 61 | {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2}, | 61 | {"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2}, |
| 62 | {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2}, | 62 | {"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2}, |
| 63 | {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2}, | 63 | {"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2}, |
| 64 | {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2}, | 64 | {"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2}, |
| 65 | {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2}, | 65 | {"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2}, |
| 66 | {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2}, | 66 | {"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2}, |
| 67 | {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2}, | 67 | {"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2}, |
| 68 | {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2}, | 68 | {"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2}, |
| 69 | {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2}, | 69 | {"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2}, |
| 70 | {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, | 70 | {"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2}, |
| 71 | {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25}, | 71 | {"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2}, |
| 72 | {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3}, | 72 | {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, |
| 73 | {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3}, | 73 | |
| 74 | {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3}, | 74 | {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, |
| 75 | {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3}, | 75 | {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, |
| 76 | {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3}, | 76 | {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, |
| 77 | {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3}, | 77 | {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, |
| 78 | {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3}, | 78 | {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, |
| 79 | {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3}, | 79 | {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, |
| 80 | {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3}, | 80 | {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, |
| 81 | {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3}, | 81 | {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, |
| 82 | {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75}, | 82 | {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, |
| 83 | {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25}, | 83 | {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, |
| 84 | {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25}, | 84 | {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, |
| 85 | {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25}, | 85 | {"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, |
| 86 | {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25}, | 86 | |
| 87 | {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, | 87 | {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, |
| 88 | {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}, | 88 | {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, |
| 89 | {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25}, | 89 | {"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, |
| 90 | {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25} | 90 | {"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, |
| 91 | {"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, | ||
| 92 | {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, | ||
| 93 | {"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, | ||
| 94 | {"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} | ||
| 91 | ] | 95 | ] |
| 92 | }, | 96 | }, |
| 93 | "LAYOUT_60_iso": { | 97 | "LAYOUT_60_iso": { |
| 94 | "layout": [ | 98 | "layout": [ |
| 95 | {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0}, | 99 | {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, |
| 96 | {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0}, | 100 | {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, |
| 97 | {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0}, | 101 | {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, |
| 98 | {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0}, | 102 | {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, |
| 99 | {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0}, | 103 | {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, |
| 100 | {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0}, | 104 | {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, |
| 101 | {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0}, | 105 | {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, |
| 102 | {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0}, | 106 | {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, |
| 103 | {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0}, | 107 | {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, |
| 104 | {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0}, | 108 | {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, |
| 105 | {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0}, | 109 | {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, |
| 106 | {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0}, | 110 | {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, |
| 107 | {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0}, | 111 | {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, |
| 108 | {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2}, | 112 | {"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, |
| 109 | {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5}, | 113 | |
| 110 | {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1}, | 114 | {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, |
| 111 | {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1}, | 115 | {"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1}, |
| 112 | {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1}, | 116 | {"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1}, |
| 113 | {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1}, | 117 | {"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1}, |
| 114 | {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1}, | 118 | {"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1}, |
| 115 | {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1}, | 119 | {"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1}, |
| 116 | {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1}, | 120 | {"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1}, |
| 117 | {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1}, | 121 | {"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1}, |
| 118 | {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1}, | 122 | {"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1}, |
| 119 | {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1}, | 123 | {"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1}, |
| 120 | {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1}, | 124 | {"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1}, |
| 121 | {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1}, | 125 | {"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1}, |
| 122 | {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75}, | 126 | {"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1}, |
| 123 | {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2}, | 127 | |
| 124 | {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2}, | 128 | {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, |
| 125 | {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2}, | 129 | {"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2}, |
| 126 | {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2}, | 130 | {"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2}, |
| 127 | {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2}, | 131 | {"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2}, |
| 128 | {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2}, | 132 | {"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2}, |
| 129 | {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2}, | 133 | {"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2}, |
| 130 | {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2}, | 134 | {"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2}, |
| 131 | {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2}, | 135 | {"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2}, |
| 132 | {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2}, | 136 | {"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2}, |
| 133 | {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2}, | 137 | {"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2}, |
| 134 | {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2}, | 138 | {"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2}, |
| 135 | {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2}, | 139 | {"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2}, |
| 136 | {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25}, | 140 | {"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2}, |
| 137 | {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3}, | 141 | {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, |
| 138 | {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3}, | 142 | |
| 139 | {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3}, | 143 | {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, |
| 140 | {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3}, | 144 | {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3}, |
| 141 | {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3}, | 145 | {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, |
| 142 | {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3}, | 146 | {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, |
| 143 | {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3}, | 147 | {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, |
| 144 | {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3}, | 148 | {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, |
| 145 | {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3}, | 149 | {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, |
| 146 | {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3}, | 150 | {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, |
| 147 | {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3}, | 151 | {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, |
| 148 | {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75}, | 152 | {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, |
| 149 | {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25}, | 153 | {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, |
| 150 | {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25}, | 154 | {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, |
| 151 | {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25}, | 155 | {"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, |
| 152 | {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25}, | 156 | |
| 153 | {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, | 157 | {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, |
| 154 | {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}, | 158 | {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, |
| 155 | {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25}, | 159 | {"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, |
| 156 | {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25} | 160 | {"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, |
| 161 | {"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, | ||
| 162 | {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, | ||
| 163 | {"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, | ||
| 164 | {"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} | ||
| 157 | ] | 165 | ] |
| 158 | }, | 166 | }, |
| 159 | "LAYOUT_all": { | 167 | "LAYOUT_all": { |
| 160 | "layout": [ | 168 | "layout": [ |
| 161 | {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0}, | 169 | {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, |
| 162 | {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0}, | 170 | {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, |
| 163 | {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0}, | 171 | {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, |
| 164 | {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0}, | 172 | {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, |
| 165 | {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0}, | 173 | {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, |
| 166 | {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0}, | 174 | {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, |
| 167 | {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0}, | 175 | {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, |
| 168 | {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0}, | 176 | {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, |
| 169 | {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0}, | 177 | {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, |
| 170 | {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0}, | 178 | {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, |
| 171 | {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0}, | 179 | {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, |
| 172 | {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0}, | 180 | {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, |
| 173 | {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0}, | 181 | {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, |
| 174 | {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2}, | 182 | {"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, |
| 175 | {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5}, | 183 | |
| 176 | {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1}, | 184 | {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, |
| 177 | {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1}, | 185 | {"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1}, |
| 178 | {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1}, | 186 | {"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1}, |
| 179 | {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1}, | 187 | {"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1}, |
| 180 | {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1}, | 188 | {"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1}, |
| 181 | {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1}, | 189 | {"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1}, |
| 182 | {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1}, | 190 | {"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1}, |
| 183 | {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1}, | 191 | {"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1}, |
| 184 | {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1}, | 192 | {"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1}, |
| 185 | {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1}, | 193 | {"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1}, |
| 186 | {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1}, | 194 | {"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1}, |
| 187 | {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1}, | 195 | {"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1}, |
| 188 | {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5}, | 196 | {"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1}, |
| 189 | {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75}, | 197 | {"label": "1,14", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, |
| 190 | {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2}, | 198 | |
| 191 | {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2}, | 199 | {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, |
| 192 | {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2}, | 200 | {"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2}, |
| 193 | {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2}, | 201 | {"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2}, |
| 194 | {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2}, | 202 | {"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2}, |
| 195 | {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2}, | 203 | {"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2}, |
| 196 | {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2}, | 204 | {"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2}, |
| 197 | {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2}, | 205 | {"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2}, |
| 198 | {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2}, | 206 | {"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2}, |
| 199 | {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2}, | 207 | {"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2}, |
| 200 | {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2}, | 208 | {"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2}, |
| 201 | {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2}, | 209 | {"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2}, |
| 202 | {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 2, "w": 1.25}, | 210 | {"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2}, |
| 203 | {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25}, | 211 | {"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2}, |
| 204 | {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3}, | 212 | {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, |
| 205 | {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3}, | 213 | |
| 206 | {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3}, | 214 | {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, |
| 207 | {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3}, | 215 | {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3}, |
| 208 | {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3}, | 216 | {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, |
| 209 | {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3}, | 217 | {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, |
| 210 | {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3}, | 218 | {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, |
| 211 | {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3}, | 219 | {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, |
| 212 | {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3}, | 220 | {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, |
| 213 | {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3}, | 221 | {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, |
| 214 | {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3}, | 222 | {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, |
| 215 | {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75}, | 223 | {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, |
| 216 | {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25}, | 224 | {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, |
| 217 | {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25}, | 225 | {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, |
| 218 | {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25}, | 226 | {"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, |
| 219 | {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25}, | 227 | |
| 220 | {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, | 228 | {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, |
| 221 | {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}, | 229 | {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, |
| 222 | {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25}, | 230 | {"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, |
| 223 | {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25} | 231 | {"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, |
| 232 | {"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, | ||
| 233 | {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, | ||
| 234 | {"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, | ||
| 235 | {"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} | ||
| 224 | ] | 236 | ] |
| 225 | } | 237 | } |
| 226 | } | 238 | } |
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h index aed1907803..b49621bda0 100644 --- a/keyboards/feker/ik75/config.h +++ b/keyboards/feker/ik75/config.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifdef RGB_MATRIX_ENABLE | 20 | #ifdef RGB_MATRIX_ENABLE |
| 21 | #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) | 21 | #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) |
| 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 23 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 24 | #define RGB_MATRIX_KEYPRESSES | 23 | #define RGB_MATRIX_KEYPRESSES |
| 25 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 24 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 26 | 25 | ||
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h index 0f163f1e3d..710cd19342 100644 --- a/keyboards/frooastboard/walnut/config.h +++ b/keyboards/frooastboard/walnut/config.h | |||
| @@ -40,8 +40,5 @@ | |||
| 40 | #define ENABLE_RGB_MATRIX_PIXEL_FLOW | 40 | #define ENABLE_RGB_MATRIX_PIXEL_FLOW |
| 41 | 41 | ||
| 42 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 | 42 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 |
| 43 | #define RGB_MATRIX_DEFAULT_HUE 0 | ||
| 44 | #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 45 | #define RGB_MATRIX_DEFAULT_SPD 191 | 43 | #define RGB_MATRIX_DEFAULT_SPD 191 |
| 46 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 47 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 44 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h index c405eeaf0a..5204496e66 100755 --- a/keyboards/gizmo_engineering/gk6/config.h +++ b/keyboards/gizmo_engineering/gk6/config.h | |||
| @@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 30 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 30 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 31 | #define RGB_MATRIX_KEYPRESSES | 31 | #define RGB_MATRIX_KEYPRESSES |
| 32 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT | 32 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 33 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 34 | #define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 35 | 33 | ||
| 36 | // RGB Matrix Animation modes. Explicitly enabled | 34 | // RGB Matrix Animation modes. Explicitly enabled |
| 37 | // For full list of effects, see: | 35 | // For full list of effects, see: |
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index e925b2b384..633ca727de 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/keyboards/gopolar/gg86/config.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | /* RGB Matrix config */ | 23 | /* RGB Matrix config */ |
| 24 | #define RGB_MATRIX_LED_COUNT 100 | 24 | #define RGB_MATRIX_LED_COUNT 100 |
| 25 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 | 25 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 |
| 26 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 27 | #define RGB_MATRIX_KEYPRESSES | 26 | #define RGB_MATRIX_KEYPRESSES |
| 28 | 27 | ||
| 29 | /* RGB Matrix effect */ | 28 | /* RGB Matrix effect */ |
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h index adba031af5..04f132f4a4 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | #define RGB_MATRIX_LED_COUNT 86 | 20 | #define RGB_MATRIX_LED_COUNT 86 |
| 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 22 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 23 | #define RGB_MATRIX_KEYPRESSES | 22 | #define RGB_MATRIX_KEYPRESSES |
| 24 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 23 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 25 | 24 | ||
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h index 11461a9418..f957465cd0 100644 --- a/keyboards/horrortroll/handwired_k552/config.h +++ b/keyboards/horrortroll/handwired_k552/config.h | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #ifdef RGB_MATRIX_ENABLE | 43 | #ifdef RGB_MATRIX_ENABLE |
| 44 | #define RGB_MATRIX_LED_COUNT 24 | 44 | #define RGB_MATRIX_LED_COUNT 24 |
| 45 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 45 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 46 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 47 | 46 | ||
| 48 | /* RGB Matrix effect */ | 47 | /* RGB Matrix effect */ |
| 49 | #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 48 | #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
diff --git a/keyboards/horrortroll/nyx/rev1/config.h b/keyboards/horrortroll/nyx/rev1/config.h index 9d891b2ff4..9126bfe085 100644 --- a/keyboards/horrortroll/nyx/rev1/config.h +++ b/keyboards/horrortroll/nyx/rev1/config.h | |||
| @@ -18,6 +18,5 @@ | |||
| 18 | 18 | ||
| 19 | /* RGB Matrix config */ | 19 | /* RGB Matrix config */ |
| 20 | #define RGB_MATRIX_LED_COUNT 67 | 20 | #define RGB_MATRIX_LED_COUNT 67 |
| 21 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 22 | #define RGB_MATRIX_KEYPRESSES | 21 | #define RGB_MATRIX_KEYPRESSES |
| 23 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 22 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h index aac4d9d9d6..eddc52e8aa 100644 --- a/keyboards/keebio/bamfk4/config.h +++ b/keyboards/keebio/bamfk4/config.h | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH | 45 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH |
| 46 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 46 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 47 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 | 47 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 |
| 48 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 49 | # define RGB_MATRIX_LED_COUNT 32 | 48 | # define RGB_MATRIX_LED_COUNT 32 |
| 50 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 49 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 51 | # define RGB_MATRIX_KEYPRESSES | 50 | # define RGB_MATRIX_KEYPRESSES |
diff --git a/keyboards/keebio/cepstrum/rev1/config.h b/keyboards/keebio/cepstrum/rev1/config.h index 3ca3bef344..72f182b156 100644 --- a/keyboards/keebio/cepstrum/rev1/config.h +++ b/keyboards/keebio/cepstrum/rev1/config.h | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 55 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 56 | 56 | ||
| 57 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | 57 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 |
| 58 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 59 | #define RGB_MATRIX_LED_COUNT 96 | 58 | #define RGB_MATRIX_LED_COUNT 96 |
| 60 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 59 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 61 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 60 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index 01cef3c923..80e85052de 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/keyboards/keebio/iris/rev6/config.h | |||
| @@ -61,7 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 61 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH | 61 | # define ENABLE_RGB_MATRIX_SOLID_SPLASH |
| 62 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 62 | # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 63 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 | 63 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 |
| 64 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 65 | # define RGB_MATRIX_LED_COUNT 68 | 64 | # define RGB_MATRIX_LED_COUNT 68 |
| 66 | # define RGB_MATRIX_SPLIT { 34, 34 } | 65 | # define RGB_MATRIX_SPLIT { 34, 34 } |
| 67 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 66 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h index 73398bcaf6..37769d67e7 100644 --- a/keyboards/keebio/iris/rev7/config.h +++ b/keyboards/keebio/iris/rev7/config.h | |||
| @@ -61,7 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 61 | //# define ENABLE_RGB_MATRIX_SOLID_SPLASH | 61 | //# define ENABLE_RGB_MATRIX_SOLID_SPLASH |
| 62 | //# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 62 | //# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 63 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | 63 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 |
| 64 | # define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 65 | # define RGB_MATRIX_LED_COUNT 68 | 64 | # define RGB_MATRIX_LED_COUNT 68 |
| 66 | # define RGB_MATRIX_SPLIT { 34, 34 } | 65 | # define RGB_MATRIX_SPLIT { 34, 34 } |
| 67 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | 66 | # define RGB_DISABLE_WHEN_USB_SUSPENDED |
diff --git a/keyboards/keebio/iris/rev8/config.h b/keyboards/keebio/iris/rev8/config.h index a49b48d14b..96eb75c97a 100644 --- a/keyboards/keebio/iris/rev8/config.h +++ b/keyboards/keebio/iris/rev8/config.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define I2C1_SCL_PIN GP11 | 16 | #define I2C1_SCL_PIN GP11 |
| 17 | 17 | ||
| 18 | // RGB Matrix | 18 | // RGB Matrix |
| 19 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 20 | #define RGB_MATRIX_LED_COUNT 68 | 19 | #define RGB_MATRIX_LED_COUNT 68 |
| 21 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 20 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 22 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 21 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/keebio/nyquist/rev4/config.h b/keyboards/keebio/nyquist/rev4/config.h index a1dc02997f..501e4edaf7 100644 --- a/keyboards/keebio/nyquist/rev4/config.h +++ b/keyboards/keebio/nyquist/rev4/config.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define I2C0_SCL_PIN GP5 | 16 | #define I2C0_SCL_PIN GP5 |
| 17 | 17 | ||
| 18 | // RGB Matrix | 18 | // RGB Matrix |
| 19 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 20 | #define RGB_MATRIX_LED_COUNT 72 | 19 | #define RGB_MATRIX_LED_COUNT 72 |
| 21 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 20 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 22 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 21 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h index fda33076c9..66cfe454c4 100644 --- a/keyboards/keebio/sinc/rev3/config.h +++ b/keyboards/keebio/sinc/rev3/config.h | |||
| @@ -67,7 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 67 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 67 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 68 | 68 | ||
| 69 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | 69 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 |
| 70 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 71 | #define RGB_MATRIX_LED_COUNT 113 | 70 | #define RGB_MATRIX_LED_COUNT 113 |
| 72 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 71 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 73 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 72 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/keebio/sinc/rev4/config.h b/keyboards/keebio/sinc/rev4/config.h index b6c5785f4c..bed0f11243 100644 --- a/keyboards/keebio/sinc/rev4/config.h +++ b/keyboards/keebio/sinc/rev4/config.h | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 64 | #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 65 | 65 | ||
| 66 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | 66 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 |
| 67 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 68 | #define RGB_MATRIX_LED_COUNT 117 | 67 | #define RGB_MATRIX_LED_COUNT 117 |
| 69 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 68 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 70 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 69 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h index c55999846e..e0a7f47a4d 100644 --- a/keyboards/kprepublic/bm80hsrgb/config.h +++ b/keyboards/kprepublic/bm80hsrgb/config.h | |||
| @@ -27,10 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 27 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) | 27 | #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) |
| 28 | // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 | 28 | // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 |
| 29 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set | 29 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set |
| 30 | #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set | ||
| 31 | #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set | ||
| 32 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set | ||
| 33 | #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set | ||
| 34 | // #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature) | 30 | // #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature) |
| 35 | 31 | ||
| 36 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS | 32 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS |
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h index 564819588f..f4a2ec49cd 100644 --- a/keyboards/ml/gas75/config.h +++ b/keyboards/ml/gas75/config.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | #define RGB_MATRIX_LED_COUNT 3 | 20 | #define RGB_MATRIX_LED_COUNT 3 |
| 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 22 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 23 | #define RGB_MATRIX_KEYPRESSES | 22 | #define RGB_MATRIX_KEYPRESSES |
| 24 | 23 | ||
| 25 | /* RGB Matrix effect */ | 24 | /* RGB Matrix effect */ |
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h index 5fa148d748..357f61e77c 100644 --- a/keyboards/mss_studio/m63_rgb/config.h +++ b/keyboards/mss_studio/m63_rgb/config.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifdef RGB_MATRIX_ENABLE | 20 | #ifdef RGB_MATRIX_ENABLE |
| 21 | #define RGB_MATRIX_LED_COUNT 75 | 21 | #define RGB_MATRIX_LED_COUNT 75 |
| 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 23 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 24 | #define RGB_MATRIX_KEYPRESSES | 23 | #define RGB_MATRIX_KEYPRESSES |
| 25 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 24 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 26 | 25 | ||
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h index 4c6549ec3a..dc228f8c62 100644 --- a/keyboards/mss_studio/m64_rgb/config.h +++ b/keyboards/mss_studio/m64_rgb/config.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifdef RGB_MATRIX_ENABLE | 20 | #ifdef RGB_MATRIX_ENABLE |
| 21 | #define RGB_MATRIX_LED_COUNT 76 | 21 | #define RGB_MATRIX_LED_COUNT 76 |
| 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 23 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 24 | #define RGB_MATRIX_KEYPRESSES | 23 | #define RGB_MATRIX_KEYPRESSES |
| 25 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 24 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 26 | 25 | ||
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index eff38f91cc..2f69547df9 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifdef RGB_MATRIX_ENABLE | 18 | #ifdef RGB_MATRIX_ENABLE |
| 19 | #define RGB_MATRIX_KEYPRESSES | 19 | #define RGB_MATRIX_KEYPRESSES |
| 20 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 20 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 21 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 | 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 |
| 23 | #define RGB_MATRIX_LED_PROCESS_LIMIT 20 | 22 | #define RGB_MATRIX_LED_PROCESS_LIMIT 20 |
| 24 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | 23 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 |
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 654ec7e363..26ff90fa59 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h | |||
| @@ -17,4 +17,3 @@ | |||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 20 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h index ebde358b49..0459b58d36 100644 --- a/keyboards/mwstudio/mw65_rgb/config.h +++ b/keyboards/mwstudio/mw65_rgb/config.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | #define RGB_MATRIX_LED_COUNT 83 | 20 | #define RGB_MATRIX_LED_COUNT 83 |
| 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 21 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 22 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 23 | #define RGB_MATRIX_KEYPRESSES | 22 | #define RGB_MATRIX_KEYPRESSES |
| 24 | 23 | ||
| 25 | /* RGB Matrix effect */ | 24 | /* RGB Matrix effect */ |
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h index e5dd4fd03c..b28f3547a7 100644 --- a/keyboards/mwstudio/mw75/config.h +++ b/keyboards/mwstudio/mw75/config.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 | 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 |
| 20 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 21 | #define RGB_MATRIX_LED_COUNT 97 | 20 | #define RGB_MATRIX_LED_COUNT 97 |
| 22 | #define RGB_MATRIX_KEYPRESSES | 21 | #define RGB_MATRIX_KEYPRESSES |
| 23 | 22 | ||
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h index 863a090d47..c2019d6cd3 100644 --- a/keyboards/mwstudio/mw75r2/config.h +++ b/keyboards/mwstudio/mw75r2/config.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 | 19 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 |
| 20 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 21 | #define RGB_MATRIX_LED_COUNT 21 | 20 | #define RGB_MATRIX_LED_COUNT 21 |
| 22 | 21 | ||
| 23 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS | 22 | #define ENABLE_RGB_MATRIX_ALPHAS_MODS |
diff --git a/keyboards/ning/tiny_board/tb16_rgb/config.h b/keyboards/ning/tiny_board/tb16_rgb/config.h index a44da94f82..849035d1c3 100644 --- a/keyboards/ning/tiny_board/tb16_rgb/config.h +++ b/keyboards/ning/tiny_board/tb16_rgb/config.h | |||
| @@ -22,6 +22,3 @@ | |||
| 22 | #define ENABLE_RGB_MATRIX_TYPING_HEATMAP | 22 | #define ENABLE_RGB_MATRIX_TYPING_HEATMAP |
| 23 | 23 | ||
| 24 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP | 24 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP |
| 25 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 26 | |||
| 27 | |||
diff --git a/keyboards/pangorin/tan67/config.h b/keyboards/pangorin/tan67/config.h index 62ccc4f273..9583631647 100644 --- a/keyboards/pangorin/tan67/config.h +++ b/keyboards/pangorin/tan67/config.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifdef RGB_MATRIX_ENABLE | 18 | #ifdef RGB_MATRIX_ENABLE |
| 19 | /* RGB Matrix config */ | 19 | /* RGB Matrix config */ |
| 20 | #define RGB_MATRIX_LED_COUNT 84 | 20 | #define RGB_MATRIX_LED_COUNT 84 |
| 21 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 22 | #define RGB_MATRIX_KEYPRESSES | 21 | #define RGB_MATRIX_KEYPRESSES |
| 23 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 22 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 24 | #endif | 23 | #endif |
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h index d34e923ac5..062ba8102e 100644 --- a/keyboards/percent/canoe_gen2/config.h +++ b/keyboards/percent/canoe_gen2/config.h | |||
| @@ -28,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 28 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 | 28 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 |
| 29 | 29 | ||
| 30 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT | 30 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 31 | #define RGB_MATRIX_DEFAULT_HUE 0 | ||
| 32 | #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 33 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 34 | #define RGB_MATRIX_DEFAULT_SPD 127 | ||
| 35 | #define RGB_DISABLE_WHEN_USB_SUSPENDED | 31 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 36 | // RGB Matrix Animation modes. Explicitly enabled | 32 | // RGB Matrix Animation modes. Explicitly enabled |
| 37 | // For full list of effects, see: | 33 | // For full list of effects, see: |
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index 67e42e44a9..6e30ee857a 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | #define RGB_MATRIX_KEYPRESSES | 20 | #define RGB_MATRIX_KEYPRESSES |
| 21 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 21 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 22 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 23 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 | 22 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 |
| 24 | #define RGB_MATRIX_LED_PROCESS_LIMIT 20 | 23 | #define RGB_MATRIX_LED_PROCESS_LIMIT 20 |
| 25 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | 24 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 |
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h index 30127708e0..f6839b9006 100644 --- a/keyboards/wekey/we27/config.h +++ b/keyboards/wekey/we27/config.h | |||
| @@ -24,10 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define RGB_MATRIX_KEYPRESSES // reacts to keypresses | 24 | #define RGB_MATRIX_KEYPRESSES // reacts to keypresses |
| 25 | #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) | 25 | #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) |
| 26 | #define RGB_MATRIX_DEFAULT_HUE 108 // Sets the default hue value, if none has been set | 26 | #define RGB_MATRIX_DEFAULT_HUE 108 // Sets the default hue value, if none has been set |
| 27 | #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set | ||
| 28 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set | ||
| 29 | #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set | ||
| 30 | #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set | ||
| 31 | 27 | ||
| 32 | // RGB Matrix Animation modes. Explicitly enabled | 28 | // RGB Matrix Animation modes. Explicitly enabled |
| 33 | // For full list of effects, see: | 29 | // For full list of effects, see: |
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 8fb9e393ee..1d3b4dd3ee 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h | |||
| @@ -27,9 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 27 | // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) | 27 | // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) |
| 28 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. | 28 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. |
| 29 | // HSV_TEAL | 29 | // HSV_TEAL |
| 30 | // #define RGB_MATRIX_DEFAULT_HUE 128 | ||
| 31 | // #define RGB_MATRIX_DEFAULT_SAT 255 | ||
| 32 | #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
| 33 | #endif | 30 | #endif |
| 34 | 31 | ||
| 35 | #define RGBLIGHT_LAYERS | 32 | #define RGBLIGHT_LAYERS |
