summaryrefslogtreecommitdiff
path: root/keyboards/massdrop/ctrl
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/massdrop/ctrl')
-rw-r--r--keyboards/massdrop/ctrl/config.h6
-rw-r--r--keyboards/massdrop/ctrl/ctrl.h22
-rw-r--r--keyboards/massdrop/ctrl/info.json195
-rw-r--r--keyboards/massdrop/ctrl/keymaps/endgame/config.h1
-rw-r--r--keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h1
-rw-r--r--keyboards/massdrop/ctrl/keymaps/xanimos/config.h1
-rw-r--r--keyboards/massdrop/ctrl/rules.mk1
7 files changed, 108 insertions, 119 deletions
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index aadc0a915b..33991d4c8f 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -21,12 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define SERIAL_NUM "Unavailable"
-#define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 }
-#define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Temporary solution for matrix delay */
#define IGNORE_ATOMIC_BLOCK
diff --git a/keyboards/massdrop/ctrl/ctrl.h b/keyboards/massdrop/ctrl/ctrl.h
index a3d66ba775..9fc6eac15e 100644
--- a/keyboards/massdrop/ctrl/ctrl.h
+++ b/keyboards/massdrop/ctrl/ctrl.h
@@ -9,28 +9,6 @@
#include "usb/udi_cdc.h"
#include "usb/usb_hub.h"
-#define LAYOUT( \
- K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
- K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, \
- K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, \
- K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71, K72, K73, K74, K75, \
- K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87 \
- \
-) { \
- { K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K17, K18, K19, K20, K21, K22, K23, K24 }, \
- { K34, K35, K36, K37, K38, K39, K40, K41 }, \
- { K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K64, K65, K66, K67, K68, K69, K70, K71 }, \
- { K77, K78, K79, K80, K81, K82, K83, K84 }, \
- { K09, K10, K11, K12, K13, K14, K15, K16 }, \
- { K25, K26, K27, K28, K29, K30, K31, K32 }, \
- { K42, K43, K44, K45, K46, K47, K48, K49 }, \
- { K59, K60, K61, K62, K63, K76, K50, K33 }, \
- { K72, K73, K74, K75, K85, K86, K87, }, \
-}
-
#define TOGGLE_FLAG_AND_PRINT(var, name) { \
if (var) { \
dprintf(name " disabled\r\n"); \
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 34c60ca088..e030881ca8 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -8,96 +8,117 @@
"pid": "0xEED2",
"device_version": "1.0.1"
},
+ "rgb_matrix": {
+ "driver": "custom"
+ },
+ "matrix_pins": {
+ "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
+ "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESCAPE", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"PRINT SCREEN", "x":15.5, "y":0},
- {"label":"SCROLL LOCK", "x":16.5, "y":0},
- {"label":"PAUSE BREAK", "x":17.5, "y":0},
- {"label":"BACKTICK", "x":0, "y":1.5},
- {"label":"1", "x":1, "y":1.5},
- {"label":"2", "x":2, "y":1.5},
- {"label":"3", "x":3, "y":1.5},
- {"label":"4", "x":4, "y":1.5},
- {"label":"5", "x":5, "y":1.5},
- {"label":"6", "x":6, "y":1.5},
- {"label":"7", "x":7, "y":1.5},
- {"label":"8", "x":8, "y":1.5},
- {"label":"9", "x":9, "y":1.5},
- {"label":"0", "x":10, "y":1.5},
- {"label":"MINUS", "x":11, "y":1.5},
- {"label":"EQUALS", "x":12, "y":1.5},
- {"label":"BACKSPACE", "x":13, "y":1.5, "w":2},
- {"label":"INSERT", "x":15.5, "y":1.5},
- {"label":"HOME", "x":16.5, "y":1.5},
- {"label":"PAGE UP", "x":17.5, "y":1.5},
- {"label":"TAB", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"LEFT BRACKET", "x":11.5, "y":2.5},
- {"label":"RIGHT BRACKET", "x":12.5, "y":2.5},
- {"label":"BACK SLASH", "x":13.5, "y":2.5, "w":1.5},
- {"label":"DELETE", "x":15.5, "y":2.5},
- {"label":"END", "x":16.5, "y":2.5},
- {"label":"PAGE DOWN", "x":17.5, "y":2.5},
- {"label":"CAPS LOCK", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":"SEMICOLON", "x":10.75, "y":3.5},
- {"label":"SINGLE TICK", "x":11.75, "y":3.5},
- {"label":"ENTER", "x":12.75, "y":3.5, "w":2.25},
- {"label":"LEFT SHIFT", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"COMMA", "x":9.25, "y":4.5},
- {"label":"PERIOD", "x":10.25, "y":4.5},
- {"label":"FORWARD SLASH", "x":11.25, "y":4.5},
- {"label":"RIGHT SHIFT", "x":12.25, "y":4.5, "w":2.75},
- {"label":"UP ARROW", "x":16.5, "y":4.5},
- {"label":"LEFT CTRL", "x":0.005, "y":5.5, "w":1.25},
- {"label":"LEFT WIN", "x":1.255, "y":5.5, "w":1.25},
- {"label":"LEFT ALT", "x":2.505, "y":5.5, "w":1.25},
- {"label":"SPACEBAR", "x":3.75, "y":5.5, "w":6.25},
- {"label":"RIGHT ALT", "x":10, "y":5.5, "w":1.25},
- {"label":"FN", "x":11.25, "y":5.5, "w":1.25},
- {"label":"MENU", "x":12.5, "y":5.5, "w":1.25},
- {"label":"RIGHT CTRL", "x":13.75, "y":5.5, "w":1.25},
- {"label":"LEFT ARROW", "x":15.5, "y":5.5},
- {"label":"DOWN ARROW", "x":16.5, "y":5.5},
- {"label":"RIGHT ARROW", "x":17.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [6, 0], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 1], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0},
+
+ {"matrix": [6, 5], "x": 15.5, "y": 0},
+ {"matrix": [6, 6], "x": 16.5, "y": 0},
+ {"matrix": [6, 7], "x": 17.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [7, 0], "x": 8, "y": 1.5},
+ {"matrix": [7, 1], "x": 9, "y": 1.5},
+ {"matrix": [7, 2], "x": 10, "y": 1.5},
+ {"matrix": [7, 3], "x": 11, "y": 1.5},
+ {"matrix": [7, 4], "x": 12, "y": 1.5},
+ {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 6], "x": 15.5, "y": 1.5},
+ {"matrix": [7, 7], "x": 16.5, "y": 1.5},
+ {"matrix": [9, 7], "x": 17.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [8, 0], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 1], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 2], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 16.5, "y": 2.5},
+ {"matrix": [9, 6], "x": 17.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [9, 0], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 1], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 2], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 0], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [9, 5], "x": 16.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 4], "x": 15.5, "y": 5.5},
+ {"matrix": [10, 5], "x": 16.5, "y": 5.5},
+ {"matrix": [10, 6], "x": 17.5, "y": 5.5}
]
}
}
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 8584c07a5d..c8fa629552 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -28,7 +28,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
#define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index b975b7895b..a17ad45c4c 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index 87db7fe8ea..2166f67e8c 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -44,7 +44,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
#define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index a302c82d86..e176fa733d 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -26,4 +26,3 @@ AUTO_SHIFT_ENABLE = no # Auto Shift
# Custom RGB matrix handling
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 02:34:25 +0000