From 887dfe6164f41dbe4d3c52d966bfe6e3e973fa85 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Fri, 26 Apr 2019 01:12:40 +0700 Subject: [PATCH 1/5] Update code for compatibility with latest QMK --- keyboards/planck/keymaps/priyadi/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h index 876d057bf2a3..a4f9238ef574 100644 --- a/keyboards/planck/keymaps/priyadi/config.h +++ b/keyboards/planck/keymaps/priyadi/config.h @@ -21,7 +21,7 @@ #define DOUBLESPACE_LAYER_ENABLE // #define TOLELOT_ENABLE -#define KEYMAP_CUSTOM( \ +#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, \ From 1cb1195f8a51ee27de0f934d62a5255eebc3a3a8 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Fri, 26 Apr 2019 03:56:55 +0700 Subject: [PATCH 2/5] Added compatibility with Planck rev6 --- .../promethium/keymaps/priyadi/keymap.c | 4 ++++ keyboards/planck/keymaps/priyadi/config.h | 20 +++++++++++++++++++ keyboards/planck/keymaps/priyadi/rules.mk | 11 +++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c index 179b411ee8f1..f3bae7d4f6cf 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 . } while (0) #endif #endif +#ifdef __AVR__ #include "outputselect.h" +#endif #include "led.h" #define COUNT(x) (sizeof (x) / sizeof (*(x))) @@ -1277,7 +1279,9 @@ void set_output_user(uint8_t output) { } void matrix_init_user() { +#ifdef __AVR__ _delay_ms(500); // give time for usb to initialize +#endif set_unicode_input_mode(UC_LNX); diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h index a4f9238ef574..c85e8656e6ff 100644 --- a/keyboards/planck/keymaps/priyadi/config.h +++ b/keyboards/planck/keymaps/priyadi/config.h @@ -21,6 +21,7 @@ #define DOUBLESPACE_LAYER_ENABLE // #define TOLELOT_ENABLE +#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, \ @@ -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 a999eb00f639..efb0378fb83d 100644 --- a/keyboards/planck/keymaps/priyadi/rules.mk +++ b/keyboards/planck/keymaps/priyadi/rules.mk @@ -8,7 +8,6 @@ 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 @@ -16,7 +15,17 @@ 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 +endif + +ifeq ($(strip $(KEYBOARD)), planck/rev6) +FAUXCLICKY_ENABLE = no +BACKLIGHT_ENABLE = no +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 From 8629e296b19dee1e69425ebcc2008c64185997a3 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Fri, 26 Apr 2019 15:24:05 +0700 Subject: [PATCH 3/5] use wait_ms instead of _delay_ms --- keyboards/handwired/promethium/keymaps/default/keymap.c | 2 +- keyboards/handwired/promethium/keymaps/priyadi/keymap.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 179b411ee8f1..b09e30457cce 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 f3bae7d4f6cf..fbb1ae1d69f8 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c +++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c @@ -1279,9 +1279,7 @@ void set_output_user(uint8_t output) { } void matrix_init_user() { -#ifdef __AVR__ - _delay_ms(500); // give time for usb to initialize -#endif + wait_ms(500); // give time for usb to initialize set_unicode_input_mode(UC_LNX); From be8b28f6fe7e47550d431edbcee521dde50bda72 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Fri, 26 Apr 2019 15:29:23 +0700 Subject: [PATCH 4/5] removed unnecessary rules --- keyboards/planck/keymaps/priyadi/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/planck/keymaps/priyadi/rules.mk b/keyboards/planck/keymaps/priyadi/rules.mk index efb0378fb83d..a54cf696af71 100644 --- a/keyboards/planck/keymaps/priyadi/rules.mk +++ b/keyboards/planck/keymaps/priyadi/rules.mk @@ -22,8 +22,6 @@ BACKLIGHT_ENABLE = yes endif ifeq ($(strip $(KEYBOARD)), planck/rev6) -FAUXCLICKY_ENABLE = no -BACKLIGHT_ENABLE = no DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave endif From e7300c9c7d83bbdeb7217bcac023e40e6255416b Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Fri, 26 Apr 2019 15:53:32 +0700 Subject: [PATCH 5/5] disable audio on rev4 only --- keyboards/planck/keymaps/priyadi/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/planck/keymaps/priyadi/rules.mk b/keyboards/planck/keymaps/priyadi/rules.mk index a54cf696af71..17617b0b7cbc 100644 --- a/keyboards/planck/keymaps/priyadi/rules.mk +++ b/keyboards/planck/keymaps/priyadi/rules.mk @@ -9,7 +9,6 @@ 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 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 @@ -19,6 +18,7 @@ API_SYSEX_ENABLE = no ifeq ($(strip $(KEYBOARD)), planck/rev4) FAUXCLICKY_ENABLE = yes BACKLIGHT_ENABLE = yes +AUDIO_ENABLE = no endif ifeq ($(strip $(KEYBOARD)), planck/rev6)