summaryrefslogtreecommitdiff
path: root/keyboards/linworks
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/linworks')
-rw-r--r--keyboards/linworks/dolice/config.h6
-rw-r--r--keyboards/linworks/dolice/dolice.c16
-rw-r--r--keyboards/linworks/dolice/info.json5
-rw-r--r--keyboards/linworks/em8/info.json16
-rw-r--r--keyboards/linworks/fave104/config.h7
-rw-r--r--keyboards/linworks/fave104/fave104.c17
-rw-r--r--keyboards/linworks/fave104/info.json5
-rw-r--r--keyboards/linworks/fave65h/config.h8
-rw-r--r--keyboards/linworks/fave65h/info.json5
-rw-r--r--keyboards/linworks/fave87/config.h6
-rw-r--r--keyboards/linworks/fave87/fave87.c16
-rw-r--r--keyboards/linworks/fave87/fave87.h8
-rw-r--r--keyboards/linworks/fave87/info.json5
-rw-r--r--keyboards/linworks/fave87h/config.h8
-rw-r--r--keyboards/linworks/fave87h/info.json5
-rw-r--r--keyboards/linworks/whale75/config.h6
-rw-r--r--keyboards/linworks/whale75/info.json8
-rw-r--r--keyboards/linworks/whale75/rules.mk1
18 files changed, 45 insertions, 103 deletions
diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
index 394b953afb..446ade0fcc 100644
--- a/keyboards/linworks/dolice/config.h
+++ b/keyboards/linworks/dolice/config.h
@@ -17,9 +17,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Force USB NKRO */
#define FORCE_NKRO
-
-#define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 }
-#define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/dolice/dolice.c b/keyboards/linworks/dolice/dolice.c
deleted file mode 100644
index febac2099f..0000000000
--- a/keyboards/linworks/dolice/dolice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dolice.h"
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
index 1db5f48470..32d0b3aabd 100644
--- a/keyboards/linworks/dolice/info.json
+++ b/keyboards/linworks/dolice/info.json
@@ -7,6 +7,11 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "B4", "D5", "D3", "D2", "B2"],
+ "rows": ["F5", "F4", "F6", "F7", "B0", "B7", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"breathing": true
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json
index 4abcb323a4..f501b5e52c 100644
--- a/keyboards/linworks/em8/info.json
+++ b/keyboards/linworks/em8/info.json
@@ -107,12 +107,12 @@
{"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
{"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
{"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
- {"x":8, "y":4, "w":1, "matrix":[4,6] },
+ {"x":8, "y":4, "matrix":[4,6] },
{"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
{"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
- {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
- {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
- {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+ {"x":16.5, "y":4.25, "matrix":[4,12] },
+ {"x":17.5, "y":4.25, "matrix":[4,13] },
+ {"x":18.5, "y":4.25, "matrix":[4,14] }
]
},
@@ -186,12 +186,12 @@
{"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
{"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
{"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
- {"x":8, "y":4, "w":1, "matrix":[4,6] },
+ {"x":8, "y":4, "matrix":[4,6] },
{"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
{"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
- {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
- {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
- {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+ {"x":16.5, "y":4.25, "matrix":[4,12] },
+ {"x":17.5, "y":4.25, "matrix":[4,13] },
+ {"x":18.5, "y":4.25, "matrix":[4,14] }
]
}
}
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 5d3830ef6c..73e72a129f 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A0 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD2
#define BACKLIGHT_PWM_CHANNEL 2
#define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/linworks/fave104/fave104.c b/keyboards/linworks/fave104/fave104.c
deleted file mode 100644
index f6b1e8d11b..0000000000
--- a/keyboards/linworks/fave104/fave104.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fave104.h"
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index 03beb2ad89..5421e4d623 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -8,6 +8,11 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A13", "A14", "A15", "B3"],
+ "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A1",
"levels": 5,
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 22e23f1a71..580504616a 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D1, D0, D2, D3, D5 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Define RGB */
#define RGBLED_NUM 67
#define RGB_MATRIX_LED_COUNT 67
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index c04eb5644b..d74f078d4e 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -8,6 +8,11 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["D1", "D0", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index 37aa1a68fc..b0d41d41df 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Force USB NKRO */
#define FORCE_NKRO
-#define MATRIX_ROW_PINS { D3, D5, D1, D2, D4, D0, F5, F4, F7, F6, B5, B4 }
-#define MATRIX_COL_PINS { F1, F0, E6, B0, B1, B2, B3, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Underglow */
#define RGB_DI_PIN E2
#define RGBLED_NUM 40
diff --git a/keyboards/linworks/fave87/fave87.c b/keyboards/linworks/fave87/fave87.c
deleted file mode 100644
index 49272baf5a..0000000000
--- a/keyboards/linworks/fave87/fave87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fave87.h"
diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
index 7c3490f457..fa86337081 100644
--- a/keyboards/linworks/fave87/fave87.h
+++ b/keyboards/linworks/fave87/fave87.h
@@ -72,14 +72,14 @@
) { \
{ K000, K001, K002, K003, K004, K005, K006, KC_NO, K008 }, \
{ KC_NO, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO, K028 }, \
+ { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
{ K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \
{ K040, K041, K042, K043, K044, K045, K046, KC_NO, K048 }, \
{ K050, K051, K052, K053, K054, K055, K056, K057, K058 }, \
{ K060, K061, K062, K063, K064, K065, KC_NO, KC_NO, KC_NO }, \
{ K070, K071, K072, K073, K074, K075, K076, KC_NO, KC_NO }, \
{ K080, K081, K082, K083, K084, K085, K086, KC_NO, K088 }, \
- { KC_NO, K091, K092, K093, K094, K095, KC_NO, KC_NO, KC_NO }, \
+ { KC_NO, K091, K092, K093, K094, K095, K096, KC_NO, KC_NO }, \
{ K100, K101, KC_NO, K103, KC_NO, K105, K106, KC_NO, K108 }, \
{ K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117, K118 } \
}
@@ -116,14 +116,14 @@
) { \
{ K000, K001, K002, K003, K004, K005, K006, KC_NO, K008 }, \
{ KC_NO, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO, K028 }, \
+ { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
{ K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \
{ K040, K041, K042, K043, K044, K045, K046, KC_NO, K048 }, \
{ K050, K051, K052, K053, K054, K055, KC_NO, K057, K058 }, \
{ K060, K061, K062, K063, K064, K065, K066, KC_NO, KC_NO }, \
{ K070, K071, K072, K073, K074, K075, K076, KC_NO, KC_NO }, \
{ K080, K081, K082, K083, K084, K085, K086, KC_NO, K088 }, \
- { K090, K091, K092, K093, K094, K095, KC_NO, KC_NO, KC_NO }, \
+ { K090, K091, K092, K093, K094, K095, K096, KC_NO, KC_NO }, \
{ K100, K101, KC_NO, K103, KC_NO, K105, K106, KC_NO, K108 }, \
{ K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117, K118 } \
}
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index b6ac9b78c1..31465eca2e 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -7,6 +7,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D7"],
+ "rows": ["D3", "D5", "D1", "D2", "D4", "D0", "F5", "F4", "F7", "F6", "B5", "B4"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B7",
"breathing": true
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 29d57ab51e..8c842171fb 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Define RGB */
#define RGBLED_NUM 87
#define RGB_MATRIX_LED_COUNT 87
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index 1746353c26..2b40834e8e 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -8,6 +8,11 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
+ "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 19580b9464..f6ba28fd80 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Force USB NKRO */
#define FORCE_NKRO
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7, A0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 3
#define BACKLIGHT_PAL_MODE 6
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index b84425f6f6..eae4cbea5d 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -7,6 +7,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+ "rows": ["B3", "B4", "B5", "B6", "B7", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A15", "pin_b": "A14", "resolution": 2}
diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk
index bd6499b239..2fd78a13f1 100644
--- a/keyboards/linworks/whale75/rules.mk
+++ b/keyboards/linworks/whale75/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
-WS2812_DRIVER = pwm
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 01:24:25 +0000