~ruther/qmk_firmware

cf6c92426d17b1e74f616e6be07a92c5c6a5c074 — Duncan Sutherland 2 years ago 3444e96
[Keyboard] correct and modernise `dactyl_manuform/6x7` variant (#21176)

D keyboards/handwired/dactyl_manuform/6x7/config.h => keyboards/handwired/dactyl_manuform/6x7/config.h +0 -22
@@ 1,22 0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert

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 <http://www.gnu.org/licenses/>.
*/

#pragma once

// WS2812 RGB LED strip input and number of LEDs
#define RGBLED_NUM 12

M keyboards/handwired/dactyl_manuform/6x7/info.json => keyboards/handwired/dactyl_manuform/6x7/info.json +17 -3
@@ 8,6 8,17 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
    "features": {
        "bootmagic": true,
        "command": true,
        "console": false,
        "extrakey": true,
        "mousekey": true,
        "nkro": false,
        "audio": false,
        "backlight": false,
        "rgblight": false
    },
    "ws2812": {
        "pin": "D3"
    },


@@ 17,12 28,15 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "rgblight": {
        "led_count": 12
    },
    "development_board": "promicro",
    "layouts": {
        "LAYOUT_6x7": {
        "LAYOUT": {
            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0},
                {"matrix": [0, 1], "x": 1, "y": 0},

M keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c => keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c +3 -3
@@ 12,7 12,7 @@ enum custom_layer {
#define LOWER MO(_LOWER)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_QWERTY] = LAYOUT_6x7(
    [_QWERTY] = LAYOUT(
        KC_ESC , KC_F1   , KC_F2  , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8  , KC_F9  , KC_F10, KC_F11, KC_F12   , _______,
        _______, KC_GRV  , KC_1   , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7   , KC_8   , KC_9  , KC_0  , KC_LBRC  , KC_RBRC,
        _______, KC_TAB  , KC_Q   , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U   , KC_I   , KC_O  , KC_P  , KC_QUOT  , KC_BSLS,


@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                    KC_BSPC,KC_GRV,                         KC_LGUI, KC_LALT
    ),

    [_LOWER] = LAYOUT_6x7(
    [_LOWER] = LAYOUT(
        KC_ESC , KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                       KC_F7 , KC_F8  , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 , _______,
        _______, 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, _______,


@@ 36,7 36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                _______,_______,                         _______,_______
    ),

    [_RAISE] = LAYOUT_6x7(
    [_RAISE] = LAYOUT(
        _______,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, _______,

M keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c => keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c +2 -4
@@ 10,7 10,7 @@ enum custom_layer {
#define RAISE MO(_RAISE)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
	[_QWERTZ] = LAYOUT_6x7(
	[_QWERTZ] = LAYOUT(
		KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,              KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_HOME,
		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_END ,
		XXXXXXX, 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,


@@ 18,12 18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		KC_LCTL, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,              KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_MPLY,
		                           KC_LEFT, KC_RGHT,                                                  KC_UP  , KC_DOWN,
		                                             KC_SPC , KC_LSFT,              KC_RALT, KC_ENT ,

		                                             KC_LGUI, KC_LALT,              KC_BSPC, KC_DEL ,
		                                             KC_PGDN, KC_PGUP,              KC_TAB , KC_INS
		),

	[_RAISE] = LAYOUT_6x7(
	[_RAISE] = LAYOUT(
		QK_BOOT, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,


@@ 31,7 30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
		                           KC_MPRV, KC_MNXT,                                                  KC_VOLU, KC_VOLD,
	                                                 _______, _______,              _______, _______,

													 _______, _______,              _______, _______,
													 _______, _______,              _______, _______
		)

M keyboards/handwired/dactyl_manuform/6x7/rules.mk => keyboards/handwired/dactyl_manuform/6x7/rules.mk +0 -13
@@ 1,13 0,0 @@
# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes       # Mouse keys
EXTRAKEY_ENABLE = yes       # Audio control and System control
CONSOLE_ENABLE = no         # Console for debug
COMMAND_ENABLE = yes        # Commands for debug and configuration
NKRO_ENABLE = no            # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
SPLIT_KEYBOARD = yes