Skip to content

Commit

Permalink
Merge branch 'qmk:master' into apple
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisGVE
ChrisGVE authored Dec 2, 2024
2 parents 3ca8651 + 39c40f5 commit 4c4669a
Show file tree
Hide file tree
Showing 7 changed files with 380 additions and 2 deletions.
6 changes: 4 additions & 2 deletions builddefs/build_keyboard.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h

# Load the keymap-level rules.mk if exists
-include $(KEYMAP_PATH)/rules.mk
ifeq ($(OTHER_KEYMAP_C),)
# Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
-include $(KEYMAP_PATH)/rules.mk
endif

# Load any rules.mk content from keymap.json
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
Expand Down
178 changes: 178 additions & 0 deletions keyboards/rpiguy9907/fistbnmp/keyboard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
{
"manufacturer": "rpiguy9907",
"keyboard_name": "fistbnmp",
"maintainer": "lesshonor",
"bootloader": "atmel-dfu",
"bootloader_instructions": "Press the button labeled SW1 on the back of the PCB.",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["C6", "C7", "B4", "F7", "D0", "D6", "D3", "D4", "D5"],
"rows": ["F0", "B6", "D7", "B5"]
},
"processor": "atmega32u4",
"url": "https://github.com/rpiguy9907",
"usb": {
"device_version": "1.0.0",
"pid": "0x0000",
"vid": "0xFEED"
},
"layouts": {
"LAYOUT_3u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 4], "x": 3, "y": 3, "w": 3},
{"matrix": [3, 6], "x": 6, "y": 3},
{"matrix": [3, 7], "x": 7, "y": 3},
{"matrix": [3, 8], "x": 8, "y": 3}
]
},
"LAYOUT_7u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 4], "x": 1, "y": 3, "w": 7},
{"matrix": [3, 8], "x": 8, "y": 3}
]
},
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3},
{"matrix": [3, 6], "x": 6, "y": 3},
{"matrix": [3, 7], "x": 7, "y": 3},
{"matrix": [3, 8], "x": 8, "y": 3}
]
},
"LAYOUT_split_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3, "w": 1.5},
{"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.5},
{"matrix": [3, 6], "x": 6, "y": 3},
{"matrix": [3, 7], "x": 7, "y": 3},
{"matrix": [3, 8], "x": 8, "y": 3}
]
}
}
}
14 changes: 14 additions & 0 deletions keyboards/rpiguy9907/fistbnmp/keymaps/default/keymap.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"keyboard": "rpiguy9907/fistbnmp",
"keymap": "default",
"version": 1,
"layout": "LAYOUT_all",
"layers": [
[
"KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O",
"KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L",
"KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_P", "KC_DOT",
"KC_LCTL", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_SPC", "KC_RIGHT", "KC_LEFT", "KC_DOWN", "KC_UP"
]
]
}
27 changes: 27 additions & 0 deletions keyboards/rpiguy9907/fistbnmp/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# FistBNMP

![FistBNMP assembled proto and bare PCB](https://i.redd.it/uv34770qmc371.jpg)

A compact 9u layout with support for standard Cherry MX and Low Profile MX switches.

* Keyboard Maintainer: [rpiguy9907](https://github.com/rpiguy9907), [lesshonor](https://github.com/lesshonor)
* Hardware Supported: FistBNMP PCB (atmega32u4, atmel-dfu)
* Hardware Availability: Files available on request; ask in the 40% Discord

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

make rpiguy9907/fistbnmp:default

Flashing example for this keyboard:

make rpiguy9907/fistbnmp: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. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
* **Physical reset button**: Briefly press the button labeled `SW1` on the back of the PCB.
* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
89 changes: 89 additions & 0 deletions keyboards/zlant_xl/keyboard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"manufacturer": "Ziptyze",
"keyboard_name": "ZlantXL",
"maintainer": "chrisgve",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["D6", "D5", "C7", "C5", "D3", "D4"],
"rows": ["C4", "C6", "B1", "B0", "B3", "B2", "B5", "B4", "B7", "B6"]
},
"processor": "atmega32u2",
"usb": {
"device_version": "0.0.1",
"pid": "0x6800",
"vid": "0xFEED"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
{"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
{"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
{"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
{"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
{"label": "Del", "matrix": [1, 5], "x": 11, "y": 0},
{"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1},
{"label": "Q", "matrix": [3, 0], "x": 1, "y": 1},
{"label": "W", "matrix": [2, 1], "x": 2, "y": 1},
{"label": "E", "matrix": [3, 1], "x": 3, "y": 1},
{"label": "R", "matrix": [2, 2], "x": 4, "y": 1},
{"label": "T", "matrix": [3, 2], "x": 5, "y": 1},
{"label": "Y", "matrix": [2, 3], "x": 6, "y": 1},
{"label": "U", "matrix": [3, 3], "x": 7, "y": 1},
{"label": "I", "matrix": [2, 4], "x": 8, "y": 1},
{"label": "O", "matrix": [3, 4], "x": 9, "y": 1},
{"label": "P", "matrix": [2, 5], "x": 10, "y": 1},
{"label": "Backspace", "matrix": [3, 5], "x": 11, "y": 1},
{"label": "Keycaps", "matrix": [4, 0], "x": 0, "y": 2},
{"label": "A", "matrix": [5, 0], "x": 1, "y": 2},
{"label": "S", "matrix": [4, 1], "x": 2, "y": 2},
{"label": "D", "matrix": [5, 1], "x": 3, "y": 2},
{"label": "F", "matrix": [4, 2], "x": 4, "y": 2},
{"label": "G", "matrix": [5, 2], "x": 5, "y": 2},
{"label": "H", "matrix": [4, 3], "x": 6, "y": 2},
{"label": "J", "matrix": [5, 3], "x": 7, "y": 2},
{"label": "K", "matrix": [4, 4], "x": 8, "y": 2},
{"label": "L", "matrix": [5, 4], "x": 9, "y": 2},
{"label": ";", "matrix": [4, 5], "x": 10, "y": 2},
{"label": "'", "matrix": [5, 5], "x": 11, "y": 2},
{"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3},
{"label": "Z", "matrix": [7, 0], "x": 1, "y": 3},
{"label": "X", "matrix": [6, 1], "x": 2, "y": 3},
{"label": "C", "matrix": [7, 1], "x": 3, "y": 3},
{"label": "V", "matrix": [6, 2], "x": 4, "y": 3},
{"label": "B", "matrix": [7, 2], "x": 5, "y": 3},
{"label": "N", "matrix": [6, 3], "x": 6, "y": 3},
{"label": "M", "matrix": [7, 3], "x": 7, "y": 3},
{"label": ",", "matrix": [6, 4], "x": 8, "y": 3},
{"label": ".", "matrix": [7, 4], "x": 9, "y": 3},
{"label": "/", "matrix": [6, 5], "x": 10, "y": 3},
{"label": "Enter", "matrix": [7, 5], "x": 11, "y": 3},
{"label": "", "matrix": [8, 0], "x": 0, "y": 4},
{"label": "Ctrl", "matrix": [9, 0], "x": 1, "y": 4},
{"label": "Alt", "matrix": [8, 1], "x": 2, "y": 4},
{"label": "GUI", "matrix": [9, 1], "x": 3, "y": 4},
{"label": "MO(2)", "matrix": [8, 2], "x": 4, "y": 4},
{"label": " ", "matrix": [9, 2], "x": 5, "y": 4},
{"label": " ", "matrix": [8, 3], "x": 6, "y": 4},
{"label": "MO(1)", "matrix": [9, 3], "x": 7, "y": 4},
{"label": "Left", "matrix": [8, 4], "x": 8, "y": 4},
{"label": "Down", "matrix": [9, 4], "x": 9, "y": 4},
{"label": "Up", "matrix": [8, 5], "x": 10, "y": 4},
{"label": "Right", "matrix": [9, 5], "x": 11, "y": 4}
]
}
}
}
42 changes: 42 additions & 0 deletions keyboards/zlant_xl/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/* Copyright 2024 Christian C. Berclaz
*
* 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

enum layers {
BASE,
FN
};

// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[BASE] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
_______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[FN] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
)
};
// clang-format on
26 changes: 26 additions & 0 deletions keyboards/zlant_xl/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# ZLANT XL

![ZLANT XL](https://imgur.com/Vcmjwro.jpg)
_A unique 50% mechanical keyboard that uses a slanted ortholinear layout_

- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve)
- Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/)
- Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/)

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

make zlant_xl:default

Flashing example for this keyboard:

make zlant_xl: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. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

## Bootloader

Enter the bootloader in 3 ways:

- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
- **Physical reset button**: Briefly press the button on the back of the board (button on The Rune)
- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

0 comments on commit 4c4669a

Please sign in to comment.