Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added compatibility for Planck rev6 #5706

Merged
merged 5 commits into from
Apr 29, 2019
Merged

Added compatibility for Planck rev6 #5706

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
887dfe6
Update code for compatibility with latest QMK
priyadi Apr 25, 2019
1cb1195
Added compatibility with Planck rev6
priyadi Apr 25, 2019
8629e29
use wait_ms instead of _delay_ms
priyadi Apr 26, 2019
be8b28f
removed unnecessary rules
priyadi Apr 26, 2019
e7300c9
disable audio on rev4 only
priyadi Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions keyboards/handwired/promethium/keymaps/priyadi/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand Down Expand Up @@ -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
drashna marked this conversation as resolved.
Show resolved Hide resolved
#endif

set_unicode_input_mode(UC_LNX);

Expand Down
22 changes: 21 additions & 1 deletion keyboards/planck/keymaps/priyadi/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand All @@ -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
11 changes: 10 additions & 1 deletion keyboards/planck/keymaps/priyadi/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,24 @@ 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
endif

ifeq ($(strip $(KEYBOARD)), planck/rev6)
FAUXCLICKY_ENABLE = no
BACKLIGHT_ENABLE = no
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
drashna marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down