summaryrefslogtreecommitdiff
path: root/keyboards/40percentclub/mf68
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/40percentclub/mf68')
-rw-r--r--keyboards/40percentclub/mf68/config.h17
-rw-r--r--keyboards/40percentclub/mf68/info.json84
-rw-r--r--keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c2
-rw-r--r--keyboards/40percentclub/mf68/mf68.c1
-rw-r--r--keyboards/40percentclub/mf68/mf68.h20
5 files changed, 84 insertions, 40 deletions
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 0a07934e75..b9449c4714 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
index 2c8a4c92d6..7218573856 100644
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -8,6 +8,11 @@
"pid": "0x4D68",
"device_version": "1.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+ "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"breathing": true
@@ -17,7 +22,84 @@
"community_layouts": ["68_ansi"],
"layouts": {
"LAYOUT_68_ansi": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [1, 0], "x": 9, "y": 0},
+ {"matrix": [1, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 8], "x": 1.5, "y": 1},
+ {"matrix": [2, 0], "x": 2.5, "y": 1},
+ {"matrix": [2, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [2, 4], "x": 6.5, "y": 1},
+ {"matrix": [2, 5], "x": 7.5, "y": 1},
+ {"matrix": [2, 6], "x": 8.5, "y": 1},
+ {"matrix": [2, 7], "x": 9.5, "y": 1},
+ {"matrix": [2, 8], "x": 10.5, "y": 1},
+ {"matrix": [3, 0], "x": 11.5, "y": 1},
+ {"matrix": [3, 1], "x": 12.5, "y": 1},
+ {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 1},
+ {"matrix": [3, 4], "x": 16.25, "y": 1},
+
+ {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 2},
+ {"matrix": [3, 7], "x": 2.75, "y": 2},
+ {"matrix": [3, 8], "x": 3.75, "y": 2},
+ {"matrix": [4, 0], "x": 4.75, "y": 2},
+ {"matrix": [4, 1], "x": 5.75, "y": 2},
+ {"matrix": [4, 2], "x": 6.75, "y": 2},
+ {"matrix": [4, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [4, 6], "x": 10.75, "y": 2},
+ {"matrix": [4, 7], "x": 11.75, "y": 2},
+ {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [5, 1], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [5, 3], "x": 4.25, "y": 3},
+ {"matrix": [5, 4], "x": 5.25, "y": 3},
+ {"matrix": [5, 5], "x": 6.25, "y": 3},
+ {"matrix": [5, 6], "x": 7.25, "y": 3},
+ {"matrix": [5, 7], "x": 8.25, "y": 3},
+ {"matrix": [5, 8], "x": 9.25, "y": 3},
+ {"matrix": [6, 0], "x": 10.25, "y": 3},
+ {"matrix": [6, 1], "x": 11.25, "y": 3},
+ {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [6, 3], "x": 15.25, "y": 3},
+
+ {"matrix": [6, 4], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [6, 5], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [6, 6], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [6, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [6, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [7, 0], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 1], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [7, 2], "x": 14.25, "y": 4},
+ {"matrix": [7, 3], "x": 15.25, "y": 4},
+ {"matrix": [7, 4], "x": 16.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 8d69a5a8af..c3e359e24e 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -138,7 +138,7 @@ void led_blink(void) {
backlight_toggle();
}
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
led_blink();
}
diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
deleted file mode 100644
index 4abee8e0c3..0000000000
--- a/keyboards/40percentclub/mf68/mf68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "mf68.h"
diff --git a/keyboards/40percentclub/mf68/mf68.h b/keyboards/40percentclub/mf68/mf68.h
deleted file mode 100644
index 71ee4229de..0000000000
--- a/keyboards/40percentclub/mf68/mf68.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \
- K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \
- K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \
- K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:14:00 +0000