From 188c0bacb05335067bf79c2380eb0dca189a5c55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 23 Jan 2021 03:48:27 +1100 Subject: Woodpad refactor (#11651) --- .../handwired/woodpad/keymaps/default/config.h | 19 --- .../handwired/woodpad/keymaps/default/keymap.c | 179 +++++++++------------ .../handwired/woodpad/keymaps/default/readme.md | 2 +- .../handwired/woodpad/keymaps/default/rules.mk | 19 +-- 4 files changed, 79 insertions(+), 140 deletions(-) delete mode 100644 keyboards/handwired/woodpad/keymaps/default/config.h (limited to 'keyboards/handwired/woodpad/keymaps/default') diff --git a/keyboards/handwired/woodpad/keymaps/default/config.h b/keyboards/handwired/woodpad/keymaps/default/config.h deleted file mode 100644 index a72596783d..0000000000 --- a/keyboards/handwired/woodpad/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 - -// place overrides here diff --git a/keyboards/handwired/woodpad/keymaps/default/keymap.c b/keyboards/handwired/woodpad/keymaps/default/keymap.c index 838c14ead5..059d460876 100644 --- a/keyboards/handwired/woodpad/keymaps/default/keymap.c +++ b/keyboards/handwired/woodpad/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME +/* Copyright 2017 WoodKeys * * 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 @@ -13,115 +13,88 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include QMK_KEYBOARD_H -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -#define _NUMLOCK 0 -#define _NAV 1 -#define _ALT 2 -#define _ADJUST 3 +enum layer_names { + _NUMLOCK, + _NAV, + _ALT, + _ADJUST +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_NUMLOCK] = KEYMAP( /* Base */ - KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,\ - KC_P7, KC_P8, KC_P9, KC_PPLS, \ - KC_P4, KC_P5, KC_P6, KC_PEQL, \ - KC_P1, KC_P2, KC_P3, KC_COMM, \ - KC_LALT, KC_P0, KC_PDOT, KC_PENT \ -), -[_NAV] = KEYMAP( /* Base */ - _______, _______, _______, _______,\ - KC_HOME, KC_UP, KC_PGUP, _______, \ - KC_LEFT, XXXXXXX, KC_RIGHT, _______, \ - KC_END, KC_DOWN, KC_PGDN, _______, \ - _______, KC_INS, KC_DEL, _______ \ -), -[_ALT] = KEYMAP( /* Base */ - _______, KC_MUTE, KC_VOLD, KC_VOLU,\ - _______, _______, _______, _______, \ - _______, _______, _______, _______, \ - _______, _______, _______, _______, \ - _______, _______, _______, _______ \ -), -[_ADJUST] = KEYMAP( /* Base */ - _______, KC_A, _______, RESET,\ - _______, _______, _______, _______, \ - _______, _______, _______, _______, \ - _______, _______, _______, _______, \ - _______, _______, _______, _______ \ -), + [_NUMLOCK] = LAYOUT_ortho_5x4( /* Base */ + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, KC_PEQL, + KC_P1, KC_P2, KC_P3, KC_COMM, + KC_LALT, KC_P0, KC_PDOT, KC_PENT + ), + [_NAV] = LAYOUT_ortho_5x4( /* Base */ + _______, _______, _______, _______, + KC_HOME, KC_UP, KC_PGUP, _______, + KC_LEFT, XXXXXXX, KC_RGHT, _______, + KC_END, KC_DOWN, KC_PGDN, _______, + _______, KC_INS, KC_DEL, _______ + ), + [_ALT] = LAYOUT_ortho_5x4( /* Base */ + _______, KC_MUTE, KC_VOLD, KC_VOLU, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [_ADJUST] = LAYOUT_ortho_5x4( /* Base */ + _______, KC_A, _______, RESET, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) }; -void numlock_led_on(void) { - PORTF |= (1<<7); -} - -void numlock_led_off(void) { - PORTF &= ~(1<<7); -} - static bool numlock_down = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_NLCK: - if (record->event.pressed) { - numlock_down = true; - if (IS_LAYER_ON(_ALT)) { - layer_on(_ADJUST); - } - } else{ - if(!IS_LAYER_ON(_ADJUST)) { - if (!IS_LAYER_ON(_NAV)){ - numlock_led_off(); - layer_on(_NAV); - } else { - numlock_led_on(); - layer_off(_NAV); - } - } else { - layer_off(_ADJUST); - } - numlock_down = false; - } - return false; - break; - case KC_LALT: - if (record->event.pressed) { - if (numlock_down) { - layer_on(_ADJUST); - } else { - layer_on(_ALT); - } - } else { - if(IS_LAYER_ON(_ADJUST)) { - layer_off(_ADJUST); - } else { - layer_off(_ALT); - } - } - // Allow normal processing of ALT? - return false; - break; - } - return true; -} - -void matrix_init_user(void) { - // set Numlock LED to output and low - DDRF |= (1<<7); - PORTF &= ~(1<<7); - -} - -void matrix_scan_user(void) { - -} - - -void led_set_user(uint8_t usb_led) { - + switch (keycode) { + case KC_NLCK: + if (record->event.pressed) { + numlock_down = true; + if (IS_LAYER_ON(_ALT)) { + layer_on(_ADJUST); + } + } else { + if(!IS_LAYER_ON(_ADJUST)) { + if (!IS_LAYER_ON(_NAV)) { + numlock_led_off(); + layer_on(_NAV); + } else { + numlock_led_on(); + layer_off(_NAV); + } + } else { + layer_off(_ADJUST); + } + numlock_down = false; + } + return false; + case KC_LALT: + if (record->event.pressed) { + if (numlock_down) { + layer_on(_ADJUST); + } else { + layer_on(_ALT); + } + } else { + if(IS_LAYER_ON(_ADJUST)) { + layer_off(_ADJUST); + } else { + layer_off(_ALT); + } + } + // Allow normal processing of ALT + return false; + } + return true; } diff --git a/keyboards/handwired/woodpad/keymaps/default/readme.md b/keyboards/handwired/woodpad/keymaps/default/readme.md index 5f17409787..1f9e924689 100644 --- a/keyboards/handwired/woodpad/keymaps/default/readme.md +++ b/keyboards/handwired/woodpad/keymaps/default/readme.md @@ -1 +1 @@ -# The default keymap for woodpad +# The default keymap for Woodpad diff --git a/keyboards/handwired/woodpad/keymaps/default/rules.mk b/keyboards/handwired/woodpad/keymaps/default/rules.mk index 394bc0271f..88dc644500 100644 --- a/keyboards/handwired/woodpad/keymaps/default/rules.mk +++ b/keyboards/handwired/woodpad/keymaps/default/rules.mk @@ -1,17 +1,2 @@ -# QMK Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # 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 = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +CONSOLE_ENABLE = no +NKRO_ENABLE = yes -- cgit v1.2.3