From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/contra/keymaps/enigma/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/contra') diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h index 87f0199876..da3e8250b6 100644 --- a/keyboards/contra/keymaps/enigma/config.h +++ b/keyboards/contra/keymaps/enigma/config.h @@ -17,11 +17,9 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_SNAKE #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif \ No newline at end of file -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/contra/keymaps/enigma/config.h | 2 +- keyboards/contra/keymaps/maxr1998/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/contra') diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h index da3e8250b6..4fc612e3ea 100644 --- a/keyboards/contra/keymaps/enigma/config.h +++ b/keyboards/contra/keymaps/enigma/config.h @@ -16,7 +16,7 @@ #pragma once -#define RGB_DI_PIN F7 +#define WS2812_DI_PIN F7 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_SNAKE #define RGBLED_NUM 12 diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h index 6475cc20a6..5580ffeae8 100644 --- a/keyboards/contra/keymaps/maxr1998/config.h +++ b/keyboards/contra/keymaps/maxr1998/config.h @@ -4,7 +4,7 @@ #define TAPPING_TOGGLE 2 -#define RGB_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to +#define WS2812_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -- cgit v1.2.3 From 54634e92634f73a6d9111833adf58214cb4278c3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Apr 2023 19:42:50 +1000 Subject: Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) --- keyboards/contra/keymaps/maxr1998/keymap.c | 2 +- keyboards/contra/keymaps/ryanm101/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/contra') diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c index b169ce3238..8a56c60746 100644 --- a/keyboards/contra/keymaps/maxr1998/keymap.c +++ b/keyboards/contra/keymaps/maxr1998/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "contra.h" +#include QMK_KEYBOARD_H #include "keymap_german.h" enum contra_layers { diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c index ff33043632..76cbdc7ff8 100644 --- a/keyboards/contra/keymaps/ryanm101/keymap.c +++ b/keyboards/contra/keymaps/ryanm101/keymap.c @@ -1,4 +1,4 @@ -#include "contra.h" +#include QMK_KEYBOARD_H #include "action_layer.h" extern keymap_config_t keymap_config; -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/contra/info.json | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/contra') diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json index 78aefb1dbf..512d9063ce 100644 --- a/keyboards/contra/info.json +++ b/keyboards/contra/info.json @@ -78,7 +78,6 @@ {"label":"→", "matrix": [3, 11], "x":11, "y":3} ] }, - "LAYOUT_planck_mit": { "layout": [ {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, -- cgit v1.2.3 From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 May 2023 12:19:34 +1000 Subject: More `info.json` whitespace cleanups (#20665) --- keyboards/contra/info.json | 190 ++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 95 deletions(-) (limited to 'keyboards/contra') diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json index 512d9063ce..ffa32d6555 100644 --- a/keyboards/contra/info.json +++ b/keyboards/contra/info.json @@ -25,111 +25,111 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, - {"label":"Q", "matrix": [0, 1], "x":1, "y":0}, - {"label":"W", "matrix": [0, 2], "x":2, "y":0}, - {"label":"E", "matrix": [0, 3], "x":3, "y":0}, - {"label":"R", "matrix": [0, 4], "x":4, "y":0}, - {"label":"T", "matrix": [0, 5], "x":5, "y":0}, - {"label":"Y", "matrix": [0, 6], "x":6, "y":0}, - {"label":"U", "matrix": [0, 7], "x":7, "y":0}, - {"label":"I", "matrix": [0, 8], "x":8, "y":0}, - {"label":"O", "matrix": [0, 9], "x":9, "y":0}, - {"label":"P", "matrix": [0, 10], "x":10, "y":0}, - {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0}, + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0}, - {"label":"Esc", "matrix": [1, 0], "x":0, "y":1}, - {"label":"A", "matrix": [1, 1], "x":1, "y":1}, - {"label":"S", "matrix": [1, 2], "x":2, "y":1}, - {"label":"D", "matrix": [1, 3], "x":3, "y":1}, - {"label":"F", "matrix": [1, 4], "x":4, "y":1}, - {"label":"G", "matrix": [1, 5], "x":5, "y":1}, - {"label":"H", "matrix": [1, 6], "x":6, "y":1}, - {"label":"J", "matrix": [1, 7], "x":7, "y":1}, - {"label":"K", "matrix": [1, 8], "x":8, "y":1}, - {"label":"L", "matrix": [1, 9], "x":9, "y":1}, - {"label":";", "matrix": [1, 10], "x":10, "y":1}, - {"label":"'", "matrix": [1, 11], "x":11, "y":1}, + {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ";", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "'", "matrix": [1, 11], "x": 11, "y": 1}, - {"label":"Shift", "matrix": [2, 0], "x":0, "y":2}, - {"label":"Z", "matrix": [2, 1], "x":1, "y":2}, - {"label":"X", "matrix": [2, 2], "x":2, "y":2}, - {"label":"C", "matrix": [2, 3], "x":3, "y":2}, - {"label":"V", "matrix": [2, 4], "x":4, "y":2}, - {"label":"B", "matrix": [2, 5], "x":5, "y":2}, - {"label":"N", "matrix": [2, 6], "x":6, "y":2}, - {"label":"M", "matrix": [2, 7], "x":7, "y":2}, - {"label":",", "matrix": [2, 8], "x":8, "y":2}, - {"label":".", "matrix": [2, 9], "x":9, "y":2}, - {"label":"/", "matrix": [2, 10], "x":10, "y":2}, - {"label":"Return", "matrix": [2, 11], "x":11, "y":2}, + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2}, - {"matrix": [3, 0], "x":0, "y":3}, - {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3}, - {"label":"Alt", "matrix": [3, 2], "x":2, "y":3}, - {"label":"Super", "matrix": [3, 3], "x":3, "y":3}, - {"label":"⇓", "matrix": [3, 4], "x":4, "y":3}, - {"matrix": [3, 5], "x":5, "y":3}, - {"matrix": [3, 6], "x":6, "y":3}, - {"label":"⇑", "matrix": [3, 7], "x":7, "y":3}, - {"label":"←", "matrix": [3, 8], "x":8, "y":3}, - {"label":"↓", "matrix": [3, 9], "x":9, "y":3}, - {"label":"↑", "matrix": [3, 10], "x":10, "y":3}, - {"label":"→", "matrix": [3, 11], "x":11, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "⇓", "matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"label": "⇑", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": "←", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "↓", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "↑", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "→", "matrix": [3, 11], "x": 11, "y": 3} ] }, "LAYOUT_planck_mit": { "layout": [ - {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, - {"label":"Q", "matrix": [0, 1], "x":1, "y":0}, - {"label":"W", "matrix": [0, 2], "x":2, "y":0}, - {"label":"E", "matrix": [0, 3], "x":3, "y":0}, - {"label":"R", "matrix": [0, 4], "x":4, "y":0}, - {"label":"T", "matrix": [0, 5], "x":5, "y":0}, - {"label":"Y", "matrix": [0, 6], "x":6, "y":0}, - {"label":"U", "matrix": [0, 7], "x":7, "y":0}, - {"label":"I", "matrix": [0, 8], "x":8, "y":0}, - {"label":"O", "matrix": [0, 9], "x":9, "y":0}, - {"label":"P", "matrix": [0, 10], "x":10, "y":0}, - {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0}, + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0}, - {"label":"Esc", "matrix": [1, 0], "x":0, "y":1}, - {"label":"A", "matrix": [1, 1], "x":1, "y":1}, - {"label":"S", "matrix": [1, 2], "x":2, "y":1}, - {"label":"D", "matrix": [1, 3], "x":3, "y":1}, - {"label":"F", "matrix": [1, 4], "x":4, "y":1}, - {"label":"G", "matrix": [1, 5], "x":5, "y":1}, - {"label":"H", "matrix": [1, 6], "x":6, "y":1}, - {"label":"J", "matrix": [1, 7], "x":7, "y":1}, - {"label":"K", "matrix": [1, 8], "x":8, "y":1}, - {"label":"L", "matrix": [1, 9], "x":9, "y":1}, - {"label":";", "matrix": [1, 10], "x":10, "y":1}, - {"label":"'", "matrix": [1, 11], "x":11, "y":1}, + {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ";", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "'", "matrix": [1, 11], "x": 11, "y": 1}, - {"label":"Shift", "matrix": [2, 0], "x":0, "y":2}, - {"label":"Z", "matrix": [2, 1], "x":1, "y":2}, - {"label":"X", "matrix": [2, 2], "x":2, "y":2}, - {"label":"C", "matrix": [2, 3], "x":3, "y":2}, - {"label":"V", "matrix": [2, 4], "x":4, "y":2}, - {"label":"B", "matrix": [2, 5], "x":5, "y":2}, - {"label":"N", "matrix": [2, 6], "x":6, "y":2}, - {"label":"M", "matrix": [2, 7], "x":7, "y":2}, - {"label":",", "matrix": [2, 8], "x":8, "y":2}, - {"label":".", "matrix": [2, 9], "x":9, "y":2}, - {"label":"/", "matrix": [2, 10], "x":10, "y":2}, - {"label":"Return", "matrix": [2, 11], "x":11, "y":2}, + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2}, - {"matrix": [3, 0], "x":0, "y":3}, - {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3}, - {"label":"Alt", "matrix": [3, 2], "x":2, "y":3}, - {"label":"Super", "matrix": [3, 3], "x":3, "y":3}, - {"label":"⇓", "matrix": [3, 4], "x":4, "y":3}, - {"matrix": [3, 5], "x":5, "y":3}, - {"label":"⇑", "matrix": [3, 7], "x":7, "y":3}, - {"label":"←", "matrix": [3, 8], "x":8, "y":3}, - {"label":"↓", "matrix": [3, 9], "x":9, "y":3}, - {"label":"↑", "matrix": [3, 10], "x":10, "y":3}, - {"label":"→", "matrix": [3, 11], "x":11, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "⇓", "matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"label": "⇑", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": "←", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "↓", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "↑", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "→", "matrix": [3, 11], "x": 11, "y": 3} ] } } -- cgit v1.2.3