From 53802dc18654c4055ed9ce1a0b935351a9b1b11a Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 31 Jul 2019 16:57:39 -0700 Subject: [PATCH 01/14] Initial Commit --- keyboards/wonderland/config.h | 55 ++++++++++++++++++ keyboards/wonderland/keymaps/default/keymap.c | 25 ++++++++ keyboards/wonderland/rules.mk | 58 +++++++++++++++++++ keyboards/wonderland/wonderland.c | 40 +++++++++++++ keyboards/wonderland/wonderland.h | 22 +++++++ 5 files changed, 200 insertions(+) create mode 100755 keyboards/wonderland/config.h create mode 100755 keyboards/wonderland/keymaps/default/keymap.c create mode 100755 keyboards/wonderland/rules.mk create mode 100755 keyboards/wonderland/wonderland.c create mode 100755 keyboards/wonderland/wonderland.h diff --git a/keyboards/wonderland/config.h b/keyboards/wonderland/config.h new file mode 100755 index 000000000000..37150a499c5f --- /dev/null +++ b/keyboards/wonderland/config.h @@ -0,0 +1,55 @@ +/* +Copyright 2012 Jun Wako + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0xA11C +#define DEVICE_VER 0x0003 +#define MANUFACTURER Mrten.dk +#define PRODUCT Wonderland +#define DESCRIPTION "QMK Firmware for the Wonderland, a TGR Alice compatible PCB" + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS {B0,D1,D2,D3,D5} +#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,C7,C6,B6,B5,B4,D7,D6,D4} +#define UNUSED_PINS + + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING 5 + +/* Backlight configuration + */ +#define RGB_DI_PIN B7 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 8 + +#define QMK_ESC_OUTPUT F0 // usually COL +#define QMK_ESC_INPUT B0 // usually ROW +#define QMK_LED B1 diff --git a/keyboards/wonderland/keymaps/default/keymap.c b/keyboards/wonderland/keymaps/default/keymap.c new file mode 100755 index 000000000000..27881a65fd2c --- /dev/null +++ b/keyboards/wonderland/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _FUNC +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_BASE] = LAYOUT( + KC_ESC, KC_1, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ + KC_F10, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + RGB_TOG, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_LCTL, KC_LAPO, KC_LGUI, RGUI(KC_SPC), KC_SPC, KC_RAPC, KC_RCTRL \ + ), +[_FUNC] = LAYOUT( + VLK_TOG, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, RESET, \ + RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, \ + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, \ + KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) +}; diff --git a/keyboards/wonderland/rules.mk b/keyboards/wonderland/rules.mk new file mode 100755 index 000000000000..487a1de9fc60 --- /dev/null +++ b/keyboards/wonderland/rules.mk @@ -0,0 +1,58 @@ +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +BOOTLOADER = qmk-dfu + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality (+1150) +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUTO_SHIFT_ENABLE = no +VELOCIKEY_ENABLE = no diff --git a/keyboards/wonderland/wonderland.c b/keyboards/wonderland/wonderland.c new file mode 100755 index 000000000000..291c76b7ce4c --- /dev/null +++ b/keyboards/wonderland/wonderland.c @@ -0,0 +1,40 @@ +#include "wonderland.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + matrix_init_user(); + led_init_ports(); +}; + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + matrix_scan_user(); +}; + +void led_init_ports(void) { + // * Set our LED pins as output + DDRB |= (1 << 1) | (1 << 2) | (1 << 3); +} + +void led_set_kb(uint8_t usb_led) { + if (usb_led & (1 << USB_LED_NUM_LOCK)) { + DDRB |= (1 << 1); + } else { + DDRB &= ~(1 << 1); + } + + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + DDRB |= (1 << 2); + } else { + DDRB &= ~(1 << 2); + } + + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + DDRB |= (1 << 3); + } else { + DDRB &= ~(1 << 3); + } + led_set_user(usb_led); +} diff --git a/keyboards/wonderland/wonderland.h b/keyboards/wonderland/wonderland.h new file mode 100755 index 000000000000..075e3f64b413 --- /dev/null +++ b/keyboards/wonderland/wonderland.h @@ -0,0 +1,22 @@ +#pragma once +#include "quantum.h" + +// readability +#define XXX KC_NO +#define LAYOUT( \ + k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ + k41, k43, k45, k46, k48, k4a, k4e \ +) \ +{ \ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ + {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \ +} + +void matrix_init_user(void); +void matrix_scan_user(void); From 0f0d593d1d7b7644f2bafc7b94d9aefab1c0bd76 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 31 Jul 2019 17:05:29 -0700 Subject: [PATCH 02/14] ID --- keyboards/wonderland/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/config.h b/keyboards/wonderland/config.h index 37150a499c5f..d9158fe16262 100755 --- a/keyboards/wonderland/config.h +++ b/keyboards/wonderland/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xA11C +#define PRODUCT_ID 0xA71C #define DEVICE_VER 0x0003 #define MANUFACTURER Mrten.dk #define PRODUCT Wonderland From 5b3ba47f57cec8c36602886bb72ac3bc4c30f03e Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Thu, 1 Aug 2019 09:25:21 -0700 Subject: [PATCH 03/14] Use current manu name --- keyboards/wonderland/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/config.h b/keyboards/wonderland/config.h index d9158fe16262..8e658ef8b288 100755 --- a/keyboards/wonderland/config.h +++ b/keyboards/wonderland/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define VENDOR_ID 0xFEED #define PRODUCT_ID 0xA71C #define DEVICE_VER 0x0003 -#define MANUFACTURER Mrten.dk +#define MANUFACTURER Maartenwut #define PRODUCT Wonderland #define DESCRIPTION "QMK Firmware for the Wonderland, a TGR Alice compatible PCB" From 9e2a3459fdf415fc6fd731849576d9caae7b63fa Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 5 Aug 2019 16:45:58 -0700 Subject: [PATCH 04/14] Fix define DEBOUNCE Co-Authored-By: fauxpark --- keyboards/wonderland/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/config.h b/keyboards/wonderland/config.h index 8e658ef8b288..d315732cf204 100755 --- a/keyboards/wonderland/config.h +++ b/keyboards/wonderland/config.h @@ -42,7 +42,7 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING 5 +#define DEBOUNCE 5 /* Backlight configuration */ From 55a049b78d7701830d53b7fe6478595329a5bd5e Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 5 Aug 2019 16:46:21 -0700 Subject: [PATCH 05/14] Fix NUM Lock LED detection Co-Authored-By: fauxpark --- keyboards/wonderland/wonderland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/wonderland.c b/keyboards/wonderland/wonderland.c index 291c76b7ce4c..7f39a8edcac4 100755 --- a/keyboards/wonderland/wonderland.c +++ b/keyboards/wonderland/wonderland.c @@ -19,7 +19,7 @@ void led_init_ports(void) { } void led_set_kb(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_NUM_LOCK)) { + if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { DDRB |= (1 << 1); } else { DDRB &= ~(1 << 1); From f9a7aaaaa04209d95a489c9a0a3983ef737f5a4e Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 5 Aug 2019 16:46:49 -0700 Subject: [PATCH 06/14] Fix CAPs LED detection Co-Authored-By: fauxpark --- keyboards/wonderland/wonderland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/wonderland.c b/keyboards/wonderland/wonderland.c index 7f39a8edcac4..03dbb3ff693b 100755 --- a/keyboards/wonderland/wonderland.c +++ b/keyboards/wonderland/wonderland.c @@ -25,7 +25,7 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 1); } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { DDRB |= (1 << 2); } else { DDRB &= ~(1 << 2); From 96193f1c605fda2aac79a6c612f775f48af16ae2 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 5 Aug 2019 16:47:05 -0700 Subject: [PATCH 07/14] Fix Scroll Lock LED detection Co-Authored-By: fauxpark --- keyboards/wonderland/wonderland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wonderland/wonderland.c b/keyboards/wonderland/wonderland.c index 03dbb3ff693b..dd50d4d29056 100755 --- a/keyboards/wonderland/wonderland.c +++ b/keyboards/wonderland/wonderland.c @@ -31,7 +31,7 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 2); } - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { DDRB |= (1 << 3); } else { DDRB &= ~(1 << 3); From 5c07688615b1e44d258423813e5c3b1151a88e57 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Mon, 5 Aug 2019 17:03:50 -0700 Subject: [PATCH 08/14] Use correct convention for setting pins --- keyboards/wonderland/wonderland.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/keyboards/wonderland/wonderland.c b/keyboards/wonderland/wonderland.c index dd50d4d29056..9f3233e0f153 100755 --- a/keyboards/wonderland/wonderland.c +++ b/keyboards/wonderland/wonderland.c @@ -15,26 +15,28 @@ void matrix_scan_kb(void) { void led_init_ports(void) { // * Set our LED pins as output - DDRB |= (1 << 1) | (1 << 2) | (1 << 3); + setPinOutput(B1); + setPinOutput(B2); + setPinOutput(B3); } void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { - DDRB |= (1 << 1); + writePinLow(B1); } else { - DDRB &= ~(1 << 1); + writePinHigh(B1); } if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - DDRB |= (1 << 2); + writePinLow(B2); } else { - DDRB &= ~(1 << 2); + writePinHigh(B2); } if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { - DDRB |= (1 << 3); + writePinLow(B3); } else { - DDRB &= ~(1 << 3); + writePinHigh(B3); } led_set_user(usb_led); } From 72f7229baf5ef55bf2e8e1aa4c514ec644d451e8 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 7 Aug 2019 09:51:28 -0700 Subject: [PATCH 09/14] Move folder to maartenwut - enable velocikey --- keyboards/{ => maartenwut}/wonderland/config.h | 0 keyboards/{ => maartenwut}/wonderland/keymaps/default/keymap.c | 0 keyboards/{ => maartenwut}/wonderland/rules.mk | 2 +- keyboards/{ => maartenwut}/wonderland/wonderland.c | 0 keyboards/{ => maartenwut}/wonderland/wonderland.h | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename keyboards/{ => maartenwut}/wonderland/config.h (100%) rename keyboards/{ => maartenwut}/wonderland/keymaps/default/keymap.c (100%) rename keyboards/{ => maartenwut}/wonderland/rules.mk (99%) rename keyboards/{ => maartenwut}/wonderland/wonderland.c (100%) rename keyboards/{ => maartenwut}/wonderland/wonderland.h (100%) diff --git a/keyboards/wonderland/config.h b/keyboards/maartenwut/wonderland/config.h similarity index 100% rename from keyboards/wonderland/config.h rename to keyboards/maartenwut/wonderland/config.h diff --git a/keyboards/wonderland/keymaps/default/keymap.c b/keyboards/maartenwut/wonderland/keymaps/default/keymap.c similarity index 100% rename from keyboards/wonderland/keymaps/default/keymap.c rename to keyboards/maartenwut/wonderland/keymaps/default/keymap.c diff --git a/keyboards/wonderland/rules.mk b/keyboards/maartenwut/wonderland/rules.mk similarity index 99% rename from keyboards/wonderland/rules.mk rename to keyboards/maartenwut/wonderland/rules.mk index 487a1de9fc60..498076d4ea0d 100755 --- a/keyboards/wonderland/rules.mk +++ b/keyboards/maartenwut/wonderland/rules.mk @@ -55,4 +55,4 @@ AUDIO_ENABLE = no UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUTO_SHIFT_ENABLE = no -VELOCIKEY_ENABLE = no +VELOCIKEY_ENABLE = yes diff --git a/keyboards/wonderland/wonderland.c b/keyboards/maartenwut/wonderland/wonderland.c similarity index 100% rename from keyboards/wonderland/wonderland.c rename to keyboards/maartenwut/wonderland/wonderland.c diff --git a/keyboards/wonderland/wonderland.h b/keyboards/maartenwut/wonderland/wonderland.h similarity index 100% rename from keyboards/wonderland/wonderland.h rename to keyboards/maartenwut/wonderland/wonderland.h From 88bd68b5fe5afecad4a6c7b00fd94862b1f472d4 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 7 Aug 2019 09:53:29 -0700 Subject: [PATCH 10/14] Fix columns size --- keyboards/maartenwut/wonderland/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/maartenwut/wonderland/config.h b/keyboards/maartenwut/wonderland/config.h index d315732cf204..54e9f25502b9 100755 --- a/keyboards/maartenwut/wonderland/config.h +++ b/keyboards/maartenwut/wonderland/config.h @@ -29,7 +29,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 5 -#define MATRIX_COLS 16 +#define MATRIX_COLS 15 // ROWS: Top to bottom, COLS: Left to right From 264aec95e8ab0d50fdb13ee0f9ae53d596e19572 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 7 Aug 2019 09:58:11 -0700 Subject: [PATCH 11/14] Sync with homerowco --- keyboards/maartenwut/wonderland/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/maartenwut/wonderland/config.h b/keyboards/maartenwut/wonderland/config.h index 54e9f25502b9..4da601257a85 100755 --- a/keyboards/maartenwut/wonderland/config.h +++ b/keyboards/maartenwut/wonderland/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define DEVICE_VER 0x0003 #define MANUFACTURER Maartenwut #define PRODUCT Wonderland -#define DESCRIPTION "QMK Firmware for the Wonderland, a TGR Alice compatible PCB" +#define DESCRIPTION "QMK Firmware for the Wonderland" /* key matrix size */ #define MATRIX_ROWS 5 @@ -48,7 +48,7 @@ along with this program. If not, see . */ #define RGB_DI_PIN B7 #define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 8 +#define RGBLED_NUM 12 #define QMK_ESC_OUTPUT F0 // usually COL #define QMK_ESC_INPUT B0 // usually ROW From f6ed119e6e9b55a1d2fa697a4d18a34ff1c32548 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Wed, 7 Aug 2019 09:59:54 -0700 Subject: [PATCH 12/14] Add Keebs keymap --- .../wonderland/keymaps/keebs/keymap.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c diff --git a/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c b/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c new file mode 100755 index 000000000000..d3fde3b51d99 --- /dev/null +++ b/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c @@ -0,0 +1,23 @@ +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT( + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ + KC_F10, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + RGB_HUI, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_LCTL, KC_LAPO, KC_LGUI, RGUI(KC_SPC), KC_SPC, KC_RAPC, KC_RCTRL \ + ), +[1] = LAYOUT( + RGB_TOG, VLK_TOG, KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9, KC_F10, KC_F11, KC_F12, ___, RESET, \ +RGB_MODE_FORWARD, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, \ +RGB_MODE_REVERSE, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, KC_UP, ___, \ + KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ___, ___, ___,KC_LEFT,KC_DOWN,KC_RIGHT,___, \ + KC_LCTL, KC_LALT, KC_BSPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTRL \ + ) +}; + + From e422cea58b3744101d00dad2c22bf758cf998e7c Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Thu, 8 Aug 2019 17:09:27 -0700 Subject: [PATCH 13/14] Best practices --- .../wonderland/keymaps/keebs/keymap.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c b/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c index d3fde3b51d99..437370bb731e 100755 --- a/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c +++ b/keyboards/maartenwut/wonderland/keymaps/keebs/keymap.c @@ -1,21 +1,24 @@ #include QMK_KEYBOARD_H -#define ___ KC_NO +enum layers { + _BASE, + _FUNC +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( +[_BASE] = LAYOUT( KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ KC_F10, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ RGB_HUI, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ KC_LCTL, KC_LAPO, KC_LGUI, RGUI(KC_SPC), KC_SPC, KC_RAPC, KC_RCTRL \ ), -[1] = LAYOUT( - RGB_TOG, VLK_TOG, KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9, KC_F10, KC_F11, KC_F12, ___, RESET, \ -RGB_MODE_FORWARD, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, \ -RGB_MODE_REVERSE, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, KC_UP, ___, \ - KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ___, ___, ___,KC_LEFT,KC_DOWN,KC_RIGHT,___, \ +[_FUNC] = LAYOUT( + RGB_TOG, VLK_TOG, KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, RESET, \ +RGB_MODE_FORWARD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ +RGB_MODE_REVERSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, \ + KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX, \ KC_LCTL, KC_LALT, KC_BSPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTRL \ ) }; From 03d2d3029b24cdc3ff1c13c28ec2d86e6771b1f5 Mon Sep 17 00:00:00 2001 From: Yan-Fa Li Date: Thu, 8 Aug 2019 17:21:35 -0700 Subject: [PATCH 14/14] Latest keymap changes from homerowco --- .../wonderland/keymaps/default/keymap.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/maartenwut/wonderland/keymaps/default/keymap.c b/keyboards/maartenwut/wonderland/keymaps/default/keymap.c index 27881a65fd2c..fb876443b38d 100755 --- a/keyboards/maartenwut/wonderland/keymaps/default/keymap.c +++ b/keyboards/maartenwut/wonderland/keymaps/default/keymap.c @@ -9,17 +9,17 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( - KC_ESC, KC_1, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ - KC_F10, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ - RGB_TOG, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ - KC_LCTL, KC_LAPO, KC_LGUI, RGUI(KC_SPC), KC_SPC, KC_RAPC, KC_RCTRL \ + KC_ESC, KC_1, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ + KC_F10, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + RGB_TOG, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ + KC_LCTL, KC_LAPO, KC_BSPC, KC_LGUI, KC_SPC, KC_RAPC, KC_RCTRL \ ), [_FUNC] = LAYOUT( - VLK_TOG, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, RESET, \ - RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, \ - KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + RGB_TOG, VLK_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, RESET, \ + RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, \ + KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, \ + _______, KC_LALT, _______, _______, _______, KC_RALT, _______ \ ) };