From 133c69361c34e28140d3cd765c2fc29c2f49ab16 Mon Sep 17 00:00:00 2001 From: Hugh Rawlinson Date: Sun, 30 Jul 2023 23:06:29 +0200 Subject: [PATCH 1/3] Add VIA layout for dactyl manuform 5x6 --- .../dactyl_manuform/5x6/keymaps/via/config.h | 23 ++++++++++ .../dactyl_manuform/5x6/keymaps/via/keymap.c | 44 +++++++++++++++++++ .../dactyl_manuform/5x6/keymaps/via/rules.mk | 1 + 3 files changed, 68 insertions(+) create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h new file mode 100644 index 000000000000..4d83c191f3c1 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h @@ -0,0 +1,23 @@ +/* +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 + +#define MASTER_LEFT +//#define MASTER_RIGHT + +//#define EE_HANDS diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c new file mode 100644 index 000000000000..9c220be47f01 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +#include QMK_KEYBOARD_H + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_5x6( + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE,KC_SPC, KC_ENT, LOWER, + KC_TAB,KC_HOME, KC_END, KC_DEL, + KC_BSPC, KC_GRV, KC_LGUI, KC_LALT + ), + + [_LOWER] = LAYOUT_5x6( + KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, + _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, + _______,KC_PSCR, _______, KC_P0, + _______,_______, _______,_______, + _______,_______, _______,_______, + _______,_______, _______,_______ + + ), + + [_RAISE] = LAYOUT_5x6( + KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______, KC_EQL ,_______, + _______,_______, _______,_______, + _______,_______, _______,_______, + _______,_______, _______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From c21a88e2054f730335e3f822f6702686f99f9f8b Mon Sep 17 00:00:00 2001 From: Hugh Rawlinson Date: Mon, 31 Jul 2023 01:23:06 +0200 Subject: [PATCH 2/3] Update keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- .../handwired/dactyl_manuform/5x6/keymaps/via/keymap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c index 9c220be47f01..7bdd7add980f 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c @@ -1,8 +1,10 @@ #include QMK_KEYBOARD_H -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 +enum layers { + _QWERTY, + _LOWER, + _RAISE, +}; #define RAISE MO(_RAISE) #define LOWER MO(_LOWER) From 964a6b6dfff6f9867b54618379f13adcacaccd30 Mon Sep 17 00:00:00 2001 From: Hugh Rawlinson Date: Wed, 2 Aug 2023 23:55:43 +0200 Subject: [PATCH 3/3] Address PR comments --- .../dactyl_manuform/5x6/keymaps/via/config.h | 23 ------------------- .../dactyl_manuform/5x6/keymaps/via/keymap.c | 3 +++ 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h deleted file mode 100644 index 4d83c191f3c1..000000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -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 - -#define MASTER_LEFT -//#define MASTER_RIGHT - -//#define EE_HANDS diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c index 7bdd7add980f..337f332c5d97 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 QMK Community +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers {