From 36e950a13fb0368a89c644fdfb28263326018cdd Mon Sep 17 00:00:00 2001
From: Priyadi Iman Nurcahyo <priyadi@users.noreply.github.com>
Date: Mon, 29 Apr 2019 23:33:13 +0700
Subject: [PATCH] [Keymap] Added compatibility for Planck rev6 (#5706)

* Update code for compatibility with latest QMK

* Added compatibility with Planck rev6

* use wait_ms instead of _delay_ms

* removed unnecessary rules

* disable audio on rev4 only
---
 .../promethium/keymaps/default/keymap.c       |  2 +-
 .../promethium/keymaps/priyadi/keymap.c       |  4 +++-
 keyboards/planck/keymaps/priyadi/config.h     | 22 ++++++++++++++++++-
 keyboards/planck/keymaps/priyadi/rules.mk     | 11 ++++++++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 179b411ee8..b09e30457c 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -1277,7 +1277,7 @@ void set_output_user(uint8_t output) {
 }
 
 void matrix_init_user() {
-  _delay_ms(500); // give time for usb to initialize
+  wait_ms(500); // give time for usb to initialize
 
   set_unicode_input_mode(UC_LNX);
 
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 179b411ee8..fbb1ae1d69 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -53,7 +53,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 } while (0)
 #endif
 #endif
+#ifdef __AVR__
 #include "outputselect.h"
+#endif
 #include "led.h"
 #define COUNT(x) (sizeof (x) / sizeof (*(x)))
 
@@ -1277,7 +1279,7 @@ void set_output_user(uint8_t output) {
 }
 
 void matrix_init_user() {
-  _delay_ms(500); // give time for usb to initialize
+  wait_ms(500); // give time for usb to initialize
 
   set_unicode_input_mode(UC_LNX);
 
diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h
index 876d057bf2..c85e8656e6 100644
--- a/keyboards/planck/keymaps/priyadi/config.h
+++ b/keyboards/planck/keymaps/priyadi/config.h
@@ -21,7 +21,8 @@
 #define DOUBLESPACE_LAYER_ENABLE
     // #define TOLELOT_ENABLE
 
-#define KEYMAP_CUSTOM( \
+#ifdef __AVR__
+#define LAYOUT( \
     k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
     k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
     k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
@@ -34,5 +35,24 @@
     {k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c}, \
     {k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c} \
 }
+#elif KEYBOARD_planck_rev6
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    tp1, tp2, tp3 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k39, k3a, k3b }, \
+    { k06, k07, k08, k09, k0a, k0b }, \
+    { k16, k17, k18, k19, k1a, k1b }, \
+    { k26, k27, k28, k29, k2a, k2b }, \
+    { k36, k37, k38, k33, k34, k35 } \
+}
+#endif
 
 #endif
diff --git a/keyboards/planck/keymaps/priyadi/rules.mk b/keyboards/planck/keymaps/priyadi/rules.mk
index a999eb00f6..17617b0b7c 100644
--- a/keyboards/planck/keymaps/priyadi/rules.mk
+++ b/keyboards/planck/keymaps/priyadi/rules.mk
@@ -8,15 +8,22 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes     # Unicode map
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 API_SYSEX_ENABLE = no
+
+ifeq ($(strip $(KEYBOARD)), planck/rev4)
 FAUXCLICKY_ENABLE = yes
+BACKLIGHT_ENABLE = yes
+AUDIO_ENABLE = no
+endif
+
+ifeq ($(strip $(KEYBOARD)), planck/rev6)
+DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
+endif
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend