aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-01-20 10:00:28 +1100
committerNick Brassel <nick@tzarc.org>2021-01-20 10:00:28 +1100
commit9e18f41fcf46a268e01754a2743e67fb50deaa1d (patch)
tree1b11d31dd37bb4c1e48c3d4295a2ff20c318f5ce /keyboards/mechlovin
parent78fe155b7241900988f26479b8e417623b137320 (diff)
parent1e1b469fa2f9aa7480b4c1f1d1f8eb5b0c0c8ce5 (diff)
downloadqmk_firmware-9e18f41fcf46a268e01754a2743e67fb50deaa1d.tar.gz
qmk_firmware-9e18f41fcf46a268e01754a2743e67fb50deaa1d.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/adelais/standard_led/config.h1
-rw-r--r--keyboards/mechlovin/hannah910/config.h1
-rw-r--r--keyboards/mechlovin/infinity87/config.h1
-rw-r--r--keyboards/mechlovin/infinityce/config.h1
-rw-r--r--keyboards/mechlovin/pisces/config.h1
5 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/mechlovin/adelais/standard_led/config.h b/keyboards/mechlovin/adelais/standard_led/config.h
index 139026d07..064cf3d2c 100644
--- a/keyboards/mechlovin/adelais/standard_led/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/config.h
@@ -1,7 +1,6 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT Adelais 3#define PRODUCT Adelais
4#define DESCRIPTION Team.Mechlovin Adelais
5 4
6#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} 5#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
7#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } 6#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index ad1b7c2ed..3c8ca1701 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23#define VENDOR_ID 0x4D4C // ML-MechLovin' 23#define VENDOR_ID 0x4D4C // ML-MechLovin'
24#define MANUFACTURER Mechlovin 24#define MANUFACTURER Mechlovin
25#define PRODUCT Mechlovin Hannah910 25#define PRODUCT Mechlovin Hannah910
26#define DESCRIPTION Mechlovin Hannah910
27 26
28/* key matrix size */ 27/* key matrix size */
29#define MATRIX_ROWS 5 28#define MATRIX_ROWS 5
diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h
index 6c1545024..703a06f8d 100644
--- a/keyboards/mechlovin/infinity87/config.h
+++ b/keyboards/mechlovin/infinity87/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Team.Mechlovin 26#define MANUFACTURER Team.Mechlovin
27#define PRODUCT Infinity 87 27#define PRODUCT Infinity 87
28#define DESCRIPTION Team.Mechlovin Infinity 87
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 6 30#define MATRIX_ROWS 6
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index ff10e183d..838fc1da7 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Team.Mechlovin 26#define MANUFACTURER Team.Mechlovin
27#define PRODUCT Infinity CE 27#define PRODUCT Infinity CE
28#define DESCRIPTION Team.Mechlovin Infinity CE
29/* key matrix size */ 28/* key matrix size */
30#define MATRIX_ROWS 6 29#define MATRIX_ROWS 6
31#define MATRIX_COLS 17 30#define MATRIX_COLS 17
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 37acff2c1..14f6404a7 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Team.Mechlovin 26#define MANUFACTURER Team.Mechlovin
27#define PRODUCT Pisces65 27#define PRODUCT Pisces65
28#define DESCRIPTION Team.Mechlovin Pisces65
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 5 30#define MATRIX_ROWS 5