aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-22 19:28:03 +0000
committerQMK Bot <hello@qmk.fm>2020-12-22 19:28:03 +0000
commit286ab6d53f81f7f0862e445d332570f0b5fd9033 (patch)
tree926c1efb9288f17c544a89f93c4f0ba4de8a53b5
parent3b06ab51e558695a040b59e1277709c67573e602 (diff)
parent4eebefada7618c07e881b45f79570a5f807a760c (diff)
downloadqmk_firmware-286ab6d53f81f7f0862e445d332570f0b5fd9033.tar.gz
qmk_firmware-286ab6d53f81f7f0862e445d332570f0b5fd9033.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/ymd75/config.h1
-rw-r--r--keyboards/ymd75/rev1/config.h1
-rw-r--r--keyboards/ymd75/rev2/config.h1
-rw-r--r--keyboards/ymd75/rev3/config.h1
4 files changed, 3 insertions, 1 deletions
diff --git a/keyboards/ymd75/config.h b/keyboards/ymd75/config.h
index 69102014f..cf3d3fd8d 100644
--- a/keyboards/ymd75/config.h
+++ b/keyboards/ymd75/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define MANUFACTURER YMDK 27#define MANUFACTURER YMDK
28#define PRODUCT YMD75 / MT84 28#define PRODUCT YMD75 / MT84
29 29
30#define BACKLIGHT_PIN D4
31#define BACKLIGHT_LEVELS 12 30#define BACKLIGHT_LEVELS 12
32 31
33#define RGB_DI_PIN E2 32#define RGB_DI_PIN E2
diff --git a/keyboards/ymd75/rev1/config.h b/keyboards/ymd75/rev1/config.h
index d9796d9d7..bd169471a 100644
--- a/keyboards/ymd75/rev1/config.h
+++ b/keyboards/ymd75/rev1/config.h
@@ -24,5 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24#define MATRIX_COLS 15 24#define MATRIX_COLS 15
25#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } 25#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
26#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } 26#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
27#define BACKLIGHT_PIN D4
27#define DIODE_DIRECTION COL2ROW 28#define DIODE_DIRECTION COL2ROW
28#define DEVICE_VER 0x0100 29#define DEVICE_VER 0x0100
diff --git a/keyboards/ymd75/rev2/config.h b/keyboards/ymd75/rev2/config.h
index a9578d720..41a75e627 100644
--- a/keyboards/ymd75/rev2/config.h
+++ b/keyboards/ymd75/rev2/config.h
@@ -5,5 +5,6 @@
5#define MATRIX_COLS 15 5#define MATRIX_COLS 15
6#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 } 6#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 }
7#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } 7#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
8#define BACKLIGHT_PIN D4
8#define DIODE_DIRECTION COL2ROW 9#define DIODE_DIRECTION COL2ROW
9#define DEVICE_VER 0x0200 10#define DEVICE_VER 0x0200
diff --git a/keyboards/ymd75/rev3/config.h b/keyboards/ymd75/rev3/config.h
index 6118b96b8..cbed2e00e 100644
--- a/keyboards/ymd75/rev3/config.h
+++ b/keyboards/ymd75/rev3/config.h
@@ -4,6 +4,7 @@
4#define MATRIX_COLS 9 4#define MATRIX_COLS 9
5#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } 5#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
6#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } 6#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
7#define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3
7#define DIODE_DIRECTION ROW2COL 8#define DIODE_DIRECTION ROW2COL
8#define DEVICE_VER 0x0300 9#define DEVICE_VER 0x0300
9#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 10#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4