summaryrefslogtreecommitdiff
path: root/keyboards/lfkeyboards/lfk78
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lfkeyboards/lfk78')
-rw-r--r--keyboards/lfkeyboards/lfk78/config.h8
-rw-r--r--keyboards/lfkeyboards/lfk78/lfk78.h2
-rw-r--r--keyboards/lfkeyboards/lfk78/revb/config.h13
-rw-r--r--keyboards/lfkeyboards/lfk78/revb/info.json173
-rw-r--r--keyboards/lfkeyboards/lfk78/revb/revb.h39
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/config.h13
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/info.json8
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/revc.h2
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/config.h13
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/info.json8
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/revj.h2
11 files changed, 107 insertions, 174 deletions
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index 3e88fe3d37..5748d29987 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_MAP { 8, 16, 40, 55, 70, 128, 200, 255 }
#define TAPPING_TERM 200
@@ -28,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_PIN C6
#define AUDIO_VOICES
-#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile
-#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
@@ -44,8 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* 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/lfkeyboards/lfk78/lfk78.h b/keyboards/lfkeyboards/lfk78/lfk78.h
index d5e1c7b3c7..e8dad4028c 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.h
+++ b/keyboards/lfkeyboards/lfk78/lfk78.h
@@ -3,7 +3,7 @@
#include "quantum.h"
#if defined(KEYBOARD_lfkeyboards_lfk78_revb)
-# include "revb.h"
+# include QMK_KEYBOARD_H
#elif defined(KEYBOARD_lfkeyboards_lfk78_revc)
# include "revc.h"
#elif defined(KEYBOARD_lfkeyboards_lfk78_revj)
diff --git a/keyboards/lfkeyboards/lfk78/revb/config.h b/keyboards/lfkeyboards/lfk78/revb/config.h
index 8437f8efc0..377ea21123 100644
--- a/keyboards/lfkeyboards/lfk78/revb/config.h
+++ b/keyboards/lfkeyboards/lfk78/revb/config.h
@@ -1,16 +1,3 @@
#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 { B0, B1, B2, B3, B4, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { E6, F7, D2, D3, D4, D5, D6, D7 }
-
#define RGBLED_NUM 31
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json
index 026ec0d0c5..92662bacc7 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/info.json
@@ -8,106 +8,105 @@
"pid": "0x3738",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F7", "D2", "D3", "D4", "D5", "D6", "D7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "F0", "F1", "F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"driver": "custom",
"levels": 8
},
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":5.25, "y":0},
- {"x":6.25, "y":0},
- {"x":7.25, "y":0},
- {"x":8.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [5, 0], "x": 8.25, "y": 0},
+ {"matrix": [5, 1], "x": 9.25, "y": 0},
+ {"matrix": [5, 2], "x": 10.25, "y": 0},
+ {"matrix": [5, 3], "x": 11.25, "y": 0},
+ {"matrix": [5, 4], "x": 12.25, "y": 0},
+ {"matrix": [5, 5], "x": 13.25, "y": 0},
+ {"matrix": [5, 6], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [9, 4], "x": 17.5, "y": 0},
+ {"matrix": [9, 5], "x": 18.5, "y": 0},
- {"x":17.5, "y":3},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [9, 6], "x": 17.5, "y": 1},
+ {"matrix": [9, 7], "x": 18.5, "y": 1},
- {"x":0, "y":4},
- {"x":1, "y":4},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+ {"matrix": [3, 7], "x": 8.5, "y": 3},
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 2.75},
+ {"matrix": [8, 6], "x": 17.5, "y": 3},
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 6], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 16.5, "y": 4},
+ {"matrix": [9, 2], "x": 17.5, "y": 4},
+ {"matrix": [9, 3], "x": 18.5, "y": 4}
]
}
}
diff --git a/keyboards/lfkeyboards/lfk78/revb/revb.h b/keyboards/lfkeyboards/lfk78/revb/revb.h
deleted file mode 100644
index aa48c26ed4..0000000000
--- a/keyboards/lfkeyboards/lfk78/revb/revb.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-// readability
-#define XXX KC_NO
-
-// This is a shortcut to help you visually see your layout.
-/*
- * ,---------. ,-----------------------------------------------------------------------. ,---------.
- * | 0 | 1 | | 2 | 3 | 4 | 5 | 6 | 7 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | | 94 | 95 |
- * |---------| |-----------------------------------------------------------------------| |---------|
- * | 10 | 11 | | 12 | 13 | 14 | 15 | 16 | 17 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | | 96 | 97 |
- * |---------| |-----------------------------------------------------------------------| `---------'
- * | 20 | 21 | | 22 | 23 | 24 | 25 | 26 | 27 | 70 | 71 | 72 | 73 | 74 | 75 | 76 |
- * |---------| |-----------------------------------------------------------------------| ,----.
- * | 30 | 31 | | 32 | 33 | 34 | 35 | 36 | 37 | 80 | 81 | 82 | 83 | 84 | 85 | | 86 |
- * |---------| |-------------------------------------------------------------------------------------.
- * | 40 | 41 | | 42 | 43 | 44 | 45 | 46 | 47 | 90 | | 91 | 92 | 93 |
- * `---------' `--------------------------------------------------------------------' `--------------'
- */
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54, k55, k56, k57, k94, k95, \
- k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, k96, k97, \
- k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73, k74, k75, k76, \
- k30, k31, k32, k33, k34, k35, k36, k37, k80, k81, k82, k83, k84, k85, k86, \
- k40, k41, k42, k43, k44, k45, k46, k47, k90, k91, k92, k93 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, XXX }, \
- { k90, k91, k92, k93, k94, k95, k96, k97 } \
-}
diff --git a/keyboards/lfkeyboards/lfk78/revc/config.h b/keyboards/lfkeyboards/lfk78/revc/config.h
index 46db66470b..78343dc888 100644
--- a/keyboards/lfkeyboards/lfk78/revc/config.h
+++ b/keyboards/lfkeyboards/lfk78/revc/config.h
@@ -1,16 +1,3 @@
#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 { D2, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-
#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json
index 8867f107e8..d1062dee05 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -8,10 +8,18 @@
"pid": "0x3738",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
+ "rows": ["D2", "D3", "D4", "D5", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"driver": "custom",
"levels": 8
},
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/lfkeyboards/lfk78/revc/revc.h b/keyboards/lfkeyboards/lfk78/revc/revc.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revc/revc.h
+++ b/keyboards/lfkeyboards/lfk78/revc/revc.h
@@ -1,5 +1,7 @@
#pragma once
+#include "lfk78.h"
+
// readability
#define XXX KC_NO
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h
index 46db66470b..78343dc888 100644
--- a/keyboards/lfkeyboards/lfk78/revj/config.h
+++ b/keyboards/lfkeyboards/lfk78/revj/config.h
@@ -1,16 +1,3 @@
#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 { D2, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-
#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 320e5f89ec..34c703f6a6 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -8,10 +8,18 @@
"pid": "0x3738",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
+ "rows": ["D2", "D3", "D4", "D5", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"driver": "custom",
"levels": 8
},
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "at90usb646",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/lfkeyboards/lfk78/revj/revj.h b/keyboards/lfkeyboards/lfk78/revj/revj.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revj/revj.h
+++ b/keyboards/lfkeyboards/lfk78/revj/revj.h
@@ -1,5 +1,7 @@
#pragma once
+#include "lfk78.h"
+
// readability
#define XXX KC_NO
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 17:48:00 +0000