~ruther/qmk_firmware

867f2fb2800c44aaac4bda6de48a573150e533cb — QMK Bot 2 years ago a306a31 + 0de7cce
Merge remote-tracking branch 'origin/master' into develop
A keyboards/handwired/acacia/acacia.c => keyboards/handwired/acacia/acacia.c +17 -0
@@ 0,0 1,17 @@
/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
 *
 * 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/>.
 */

#include "acacia.h"

A keyboards/handwired/acacia/acacia.h => keyboards/handwired/acacia/acacia.h +49 -0
@@ 0,0 1,49 @@
/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
 *
 * 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

#include "quantum.h"

/*
 *             ┌───┐                                  ┌───┐
 *         ┌───┤02 ├───┐                          ┌───┤07 ├───┐
 *     ┌───┤01 ├───┤03 ├───┐                  ┌───┤06 ├───┤08 ├───┐
 * ┌───┤00 ├───┤12 ├───┤33 │                  │36 ├───┤17 ├───┤09 ├───┐
 * │30 ├───┤11 ├───┤13 ├───┤                  ├───┤16 ├───┤18 ├───┤39 │
 * ├───┤10 ├───┤22 ├───┤43 │                  │46 ├───┤27 ├───┤19 ├───┤
 * │40 ├───┤21 ├───┤23 ├───┘                  └───┤26 ├───┤28 ├───┤49 │
 * └───┤20 ├───┘   └───┘                          └───┘   └───┤29 ├───┘
 *     └───┘ ┌───┐ ┌───┬───┐                  ┌───┬───┐ ┌───┐ └───┘
 *           │04 │ │14 │24 ├───┐          ┌───┤25 │15 │ │05 │
 *           └───┘ └───┤   │34 ├───┐  ┌───┤35 │   ├───┘ └───┘ ┌───┐
 *                     └───┤   │44 │  │45 │   ├───┘           │38+│
 *                         └───┤   │  │   ├───┘               └───┘
 *                             └───┘  └───┘
 * + K38 is hidden.
 */
#define LAYOUT( \
  K30, K00, K01, K02, K03, K33,           K36, K06, K07, K08, K09, K39, \
  K40, K10, K11, K12, K13, K43,           K46, K16, K17, K18, K19, K49, \
       K20, K21, K22, K23,                     K26, K27, K28, K29, \
       K04, K14, K24, K34, K44,           K45, K35, K25, K15, K05, K38 \
) { \
    { K00, K01,   K02,   K03, K04, K05, K06, K07,   K08,   K09 }, \
    { K10, K11,   K12,   K13, K14, K15, K16, K17,   K18,   K19 }, \
    { K20, K21,   K22,   K23, K24, K25, K26, K27,   K28,   K29 }, \
    { K30, KC_NO, KC_NO, K33, K34, K35, K36, KC_NO, K38,   K39 }, \
    { K40, KC_NO, KC_NO, K43, K44, K45, K46, KC_NO, KC_NO, K49 }, \
}

A keyboards/handwired/acacia/config.h => keyboards/handwired/acacia/config.h +23 -0
@@ 0,0 1,23 @@
/*
Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>

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

#include "config_common.h"

//#define TAPPING_TERM 200
//#define PERMISSIVE_HOLD

A keyboards/handwired/acacia/info.json => keyboards/handwired/acacia/info.json +78 -0
@@ 0,0 1,78 @@
{
    "keyboard_name": "Acacia",
    "manufacturer": "jpsecher",
    "maintainer": "jpsecher",
    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/acacia",
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "bootloader_instructions": "Enter the bootloader by using the small buttons on the PCB: press the RESET button while connected to QMK Toolbox.",
    "diode_direction": "COL2ROW",
    "debounce": 5,
    "matrix_pins": {
        "cols": ["B4", "B3", "B2", "B1", "B0", "D2", "B6", "B7", "C7", "C6"],
        "rows": ["B5", "D3", "D4", "D5", "D6"]
    },
    "usb": {
        "vid": "0x6A70",
        "pid": "0x0001",
        "device_version": "1.0.0",
        "max_power": 20
    },
    "layouts": {
        "LAYOUT": {
            "layout": [
                {"label":"B", "x":0, "y":0.5},
                {"label":"Q", "x":1, "y":0},
                {"label":"W", "x":2, "y":0},
                {"label":"E", "x":3, "y":0},
                {"label":"R", "x":4, "y":0},
                {"label":"T", "x":5, "y":0.5},

                {"label":"H", "x":10.5, "y":0.5},
                {"label":"U", "x":11.5, "y":0},
                {"label":"I", "x":12.5, "y":0},
                {"label":"O", "x":13.5, "y":0},
                {"label":"P", "x":14.5, "y":0},
                {"label":"Y", "x":15.5, "y":0.5},

                {"label":"Tab", "x":0, "y":1.5},
                {"label":"A", "x":1, "y":1},
                {"label":"S", "x":2, "y":1},
                {"label":"D", "x":3, "y":1},
                {"label":"F", "x":4, "y":1},
                {"label":"G", "x":5, "y":1.5},

                {"label":"N", "x":10.5, "y":1.5},
                {"label":"J", "x":11.5, "y":1},
                {"label":"K", "x":12.5, "y":1},
                {"label":"L", "x":13.5, "y":1},
                {"label":":", "x":14.5, "y":1},
                {"label":"Enter", "x":15.5, "y":1.5},

                {"label":"Z", "x":1, "y":2},
                {"label":"X", "x":2, "y":2},
                {"label":"C", "x":3, "y":2},
                {"label":"V", "x":4, "y":2},

                {"label":"M", "x":11.5, "y":2},
                {"label":"<", "x":12.5, "y":2},
                {"label":">", "x":13.5, "y":2},
                {"label":"'", "x":14.5, "y":2},

                {"label":"Next", "x":2.25, "y":3},
                {"label":"Alt", "x":3.5, "y":3},
                {"label":"BS", "x":4.5, "y":3},
                {"label":"Esc", "x":5.5, "y":3},
                {"label":"Shift", "x":6.5, "y":3},

                {"label":"RAlt", "x":9.25, "y":3},
                {"label":"Space", "x":10.25, "y":3},
                {"label":"Del", "x":11.25, "y":3},
                {"label":"Alt", "x":12.25, "y":3},
                {"label":"Play", "x":13.5, "y":3},

                {"label":"Debug", "x":8, "y":1}
            ]
        }
    }
}

A keyboards/handwired/acacia/keymaps/default/keymap.c => keyboards/handwired/acacia/keymaps/default/keymap.c +54 -0
@@ 0,0 1,54 @@
/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
 *
 * 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/>.
 */
#include QMK_KEYBOARD_H

#define SPC_CTL LCTL_T(KC_SPC)
#define DEL_GUI LGUI_T(KC_DEL)
#define DEL_CTL LCTL_T(KC_SPC)
#define OSM_SFT OSM(MOD_LSFT)
#define OSM_ALT OSM(MOD_LALT)
#define ESC_CTL LCTL_T(KC_ESC)
#define BS_GUI LGUI_T(KC_BSPC)
#define BS_SYM LT(_SYM_NUM, KC_BSPC)
#define SPC_NAV LT(_NAVI_FN, KC_SPC)
#define OSM_AGR OSM(MOD_RALT)

enum layer_names {
    _QWERTY,
    _NAVI_FN,
    _SYM_NUM
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
    KC_B,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_H,    KC_U,    KC_I,    KC_O,    KC_P,    KC_Y,
    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_N,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
             KC_Z,    KC_X,    KC_C,    KC_V,                         KC_M,    KC_COMM, KC_DOT,  KC_QUOT,
             KC_MNXT, OSM_ALT, BS_SYM,  ESC_CTL, OSM_SFT,    OSM_AGR, DEL_GUI, SPC_NAV, OSM_ALT, KC_MPLY, DB_TOGG
  ),
  [_NAVI_FN] = LAYOUT(
    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_TAB,  KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_TILD,    KC_GRV,  KC_LEFT, KC_UP,   KC_RGHT, KC_WREF, KC_ENT,
             KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE,                      KC_BTN1, KC_DOWN, KC_BTN2, KC_WBAK,
             KC_MPRV, _______, BS_GUI, _______, _______,     _______, _______, _______, _______, KC_PWR,  _______
  ),
  [_SYM_NUM] = LAYOUT(
    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC,    KC_AMPR, KC_7,    KC_8,    KC_9,    KC_ASTR, KC_PLUS,
    KC_QUES, KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN, KC_PIPE,    KC_0,    KC_4,    KC_5,    KC_6,    KC_MINS, KC_EQL,
             KC_BSLS, KC_RBRC, KC_RCBR, KC_RPRN,                      KC_1,    KC_2,    KC_3,    KC_UNDS,
             KC_VOLD, _______, _______, _______, _______,    _______, _______, SPC_CTL, _______, KC_VOLU, _______
  )
};

A keyboards/handwired/acacia/readme.md => keyboards/handwired/acacia/readme.md +22 -0
@@ 0,0 1,22 @@
# Acacia

A pseudo-split keyboard with 2+4x3+2 vertically staggered keys and 4+1 thumb keys for each hand.

* Keyboard Maintainer: [jpsecher](https://github.com/jpsecher)
* Hardware Supported: https://github.com/jpsecher/keyboards/acacia

Make example for this keyboard (after setting up your build environment):

    make handwired/acacia:default

Flashing example for this keyboard:

    make handwired/acacia:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

## Bootloader

Enter the bootloader by using the small buttons on the PCB: press the RESET button while connected to QMK Toolbox.

Then you can flash the HEX file you built above.

A keyboards/handwired/acacia/rules.mk => keyboards/handwired/acacia/rules.mk +7 -0
@@ 0,0 1,7 @@
BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes       # Audio control and System control
CONSOLE_ENABLE = no         # Console for debug
COMMAND_ENABLE = no         # Commands for debug and configuration
NKRO_ENABLE = no            # N-Key Rollover
LTO_ENABLE = yes            # Link-time optimisation for smaller code