summaryrefslogtreecommitdiff
path: root/keyboards/planck
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-10-13 04:35:36 -0700
committerGitHub <noreply@github.com>2020-10-13 04:35:36 -0700
commit2a65709db6b6154b6780b70b26de57d8d9a63749 (patch)
treefb79b2928adcde4b41df8062060982bb03e4d806 /keyboards/planck
parent451e600476d72b6f595044844b8a6767246de5ce (diff)
downloadqmk_firmware-2a65709db6b6154b6780b70b26de57d8d9a63749.tar.gz
qmk_firmware-2a65709db6b6154b6780b70b26de57d8d9a63749.zip
[Keyboard] Update to ZSA Boards (#10119)
* Add VID/PIDs to ErgoDox EZ * Add VID/PIDs for Planck EZ and Glow revision * Make names consistent * fix typo in docs * Move LED config back, for maximum compatibility * Add revisions for ErgoDox EZ boards * Fix embarassing typo * Typooooo Co-authored-by: Nick Brassel <nick@tzarc.org> * Update Licensing info * Update Moonlander default keymap to match Oryx's default * Fix formatting based on suggestions Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Make indicator LEDs more configurable * Update default keymap * Handle older eeprom settings Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/planck')
-rw-r--r--keyboards/planck/ez/config.h8
-rw-r--r--keyboards/planck/ez/ez.c1
-rw-r--r--keyboards/planck/ez/ez.h4
-rw-r--r--keyboards/planck/ez/glow/config.h24
-rw-r--r--keyboards/planck/ez/glow/glow.c1
-rw-r--r--keyboards/planck/ez/glow/glow.h3
-rw-r--r--keyboards/planck/ez/glow/rules.mk1
-rw-r--r--keyboards/planck/ez/readme.md6
-rw-r--r--keyboards/planck/ez/rules.mk2
9 files changed, 47 insertions, 3 deletions
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 0cb428dd85..91723e185c 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -17,6 +17,14 @@
#pragma once
+#undef VENDOR_ID
+#define VENDOR_ID 0x3297
+#undef PRODUCT_ID
+#define PRODUCT_ID 0xC6CE
+#undef MANUFACTURER
+#define MANUFACTURER ZSA Technology Labs
+#undef PRODUCT
+#define PRODUCT Planck EZ
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0000
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 8369ce50c1..5371c78535 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -18,7 +18,6 @@
#include "hal.h"
keyboard_config_t keyboard_config;
-
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h
index 352deb6476..f989cd9386 100644
--- a/keyboards/planck/ez/ez.h
+++ b/keyboards/planck/ez/ez.h
@@ -17,6 +17,10 @@
#include "planck.h"
+#ifdef KEYBOARD_planck_ez_glow
+# include "glow.h"
+#endif
+
#define LAYOUT_planck_1x2uC( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
diff --git a/keyboards/planck/ez/glow/config.h b/keyboards/planck/ez/glow/config.h
new file mode 100644
index 0000000000..21a339da28
--- /dev/null
+++ b/keyboards/planck/ez/glow/config.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018 Jack Humbert <jack.humb@gmail.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#undef PRODUCT_ID
+#define PRODUCT_ID 0xC6CF
+
+#undef PRODUCT
+#define PRODUCT Planck EZ Glow
diff --git a/keyboards/planck/ez/glow/glow.c b/keyboards/planck/ez/glow/glow.c
new file mode 100644
index 0000000000..1813ccae09
--- /dev/null
+++ b/keyboards/planck/ez/glow/glow.c
@@ -0,0 +1 @@
+#include "glow.h"
diff --git a/keyboards/planck/ez/glow/glow.h b/keyboards/planck/ez/glow/glow.h
new file mode 100644
index 0000000000..d8a01f4359
--- /dev/null
+++ b/keyboards/planck/ez/glow/glow.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ez.h"
diff --git a/keyboards/planck/ez/glow/rules.mk b/keyboards/planck/ez/glow/rules.mk
new file mode 100644
index 0000000000..575a9c8fa4
--- /dev/null
+++ b/keyboards/planck/ez/glow/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_ENABLE = IS31FL3737
diff --git a/keyboards/planck/ez/readme.md b/keyboards/planck/ez/readme.md
index df8d1b46bb..247bf7448a 100644
--- a/keyboards/planck/ez/readme.md
+++ b/keyboards/planck/ez/readme.md
@@ -14,6 +14,12 @@ Make example for this keyboard (after setting up your build environment):
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+# Planck EZ Glow
+
+For the per key RGB version of this keyboard, you want to use the "glow" subdirectory. For example:
+
+ make planck/ez/glow:default
+
## Planck EZ Configuration (from Oryx)
### Indicator LEDs
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index ff4d8daedc..cd8354b262 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -24,10 +24,8 @@ API_SYSEX_ENABLE = no
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-CUSTOM_MATRIX = no # Custom matrix file
# SERIAL_LINK_ENABLE = yes
ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = IS31FL3737
LAYOUTS = ortho_4x12 planck_mit
LAYOUTS_HAS_RGB = no