Browse Source

Merge remote-tracking branch 'origin/master' into develop

pull/23324/head
QMK Bot 1 month ago
parent
commit
f497c5ee8e
11 changed files with 219 additions and 0 deletions
  1. +38
    -0
      keyboards/handwired/technicpad/info.json
  2. +8
    -0
      keyboards/handwired/technicpad/keymaps/default/keymap.json
  3. +13
    -0
      keyboards/handwired/technicpad/keymaps/via/keymap.json
  4. +27
    -0
      keyboards/handwired/technicpad/readme.md
  5. +1
    -0
      keyboards/handwired/technicpad/rules.mk
  6. +37
    -0
      keyboards/marshkeys/flowerpad/info.json
  7. +35
    -0
      keyboards/marshkeys/flowerpad/keymaps/default/keymap.c
  8. +35
    -0
      keyboards/marshkeys/flowerpad/keymaps/via/keymap.c
  9. +1
    -0
      keyboards/marshkeys/flowerpad/keymaps/via/rules.mk
  10. +23
    -0
      keyboards/marshkeys/flowerpad/readme.md
  11. +1
    -0
      keyboards/marshkeys/flowerpad/rules.mk

+ 38
- 0
keyboards/handwired/technicpad/info.json View File

@ -0,0 +1,38 @@
{
"manufacturer": "nwhirschfeld",
"keyboard_name": "TechnicPad",
"maintainer": "nwhirschfeld",
"build": {
"lto": true
},
"development_board": "promicro",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true
},
"matrix_pins": {
"direct": [
["D1"],
["D0"],
["D4"],
["C6"]
]
},
"url": "https://github.com/nwhirschfeld/TechnicPad",
"usb": {
"device_version": "0.0.1",
"pid": "0x5450",
"vid": "0x4E57"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "D1", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},
{"label": "D4", "matrix": [2, 0], "x": 1, "y": 0},
{"label": "C6", "matrix": [3, 0], "x": 1, "y": 1}
]
}
}
}

+ 8
- 0
keyboards/handwired/technicpad/keymaps/default/keymap.json View File

@ -0,0 +1,8 @@
{
"keyboard": "technicpad",
"keymap": "default",
"layers": [
["KC_A", "KC_B", "KC_C", "KC_D"]
],
"layout": "LAYOUT"
}

+ 13
- 0
keyboards/handwired/technicpad/keymaps/via/keymap.json View File

@ -0,0 +1,13 @@
{
"keyboard": "technicpad",
"keymap": "via",
"config": {
"features": {
"via": true
}
},
"layers": [
["KC_A", "KC_B", "KC_C", "KC_D"]
],
"layout": "LAYOUT"
}

+ 27
- 0
keyboards/handwired/technicpad/readme.md View File

@ -0,0 +1,27 @@
# TechnicPad
![TechnicPad](https://i.imgur.com/LPD0KSL.jpg)
A 4% (2x2) macropad, that is compatible to technic building blocks.
* Keyboard Maintainer: [Niclas Hirschfeld](https://github.com/nwhirschfeld)
* Hardware Supported: Pro Micro boards
* Hardware Availability: for now TechnicPad is handwired and uses an Arduino pro micro. [TechnicPad repository](https://github.com/nwhirschfeld/TechnicPad)
Make example for this keyboard (after setting up your build environment):
make handwired/technicpad:default
Flashing example for this keyboard:
make handwired/technicpad: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 upper left key and plug in the keyboard
* **Physical reset**: Short the _RST_ and _GND_ pins of the PCB
* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available

+ 1
- 0
keyboards/handwired/technicpad/rules.mk View File

@ -0,0 +1 @@
# This file intentionally left blank

+ 37
- 0
keyboards/marshkeys/flowerpad/info.json View File

@ -0,0 +1,37 @@
{
"manufacturer": "marshkeys.com",
"keyboard_name": "Flowerpad",
"maintainer": "Ethirallan",
"bootmagic": {
"matrix": [0, 1]
},
"development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true
},
"matrix_pins": {
"cols": ["F7", "F6", "F5"],
"rows": ["C6", "D4", "D0"]
},
"url": "marshkeys.com",
"usb": {
"device_version": "1.0.0",
"pid": "0x466C",
"vid": "0x4D61"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 1], "x": 0, "y": 1},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 1, "y": 2},
{"matrix": [2, 0], "x": 2, "y": 0},
{"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
}

+ 35
- 0
keyboards/marshkeys/flowerpad/keymaps/default/keymap.c View File

@ -0,0 +1,35 @@
/*
Copyright 2024 Benjamin Božič
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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* --------
* | MUTE |
* |------+------+------|
* | PREV | PLAY | NEXT |
* |------+------+------|
* | VOL- | | VOL+ |
* -------- --------
*/
LAYOUT(
KC_MUTE,
KC_MPRV, KC_MPLY, KC_MNXT,
KC_VOLD, KC_VOLU
),
};

+ 35
- 0
keyboards/marshkeys/flowerpad/keymaps/via/keymap.c View File

@ -0,0 +1,35 @@
/*
Copyright 2024 Benjamin Božič
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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* --------
* | MUTE |
* |------+------+------|
* | PREV | PLAY | NEXT |
* |------+------+------|
* | VOL- | | VOL+ |
* -------- --------
*/
LAYOUT(
KC_MUTE,
KC_MPRV, KC_MPLY, KC_MNXT,
KC_VOLD, KC_VOLU
),
};

+ 1
- 0
keyboards/marshkeys/flowerpad/keymaps/via/rules.mk View File

@ -0,0 +1 @@
VIA_ENABLE = yes

+ 23
- 0
keyboards/marshkeys/flowerpad/readme.md View File

@ -0,0 +1,23 @@
# Flowerpad
![flowerpad](https://i.imgur.com/SRo0iWLh.jpeg)
A flourishing 6-key macropad that will catch your eye.
* Keyboard Maintainer: [Benjamin Božič](https://github.com/Ethirallan)
* Hardware Supported: Onboard ATmega32u4, Flowerpad PCB v1, hotswap v1
* Hardware Availability: marshkeys.com
Make example for this keyboard (after setting up your build environment):
make marshkeys/flowerpad:default
Flashing example for this keyboard:
make marshkeys/flowerpad: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 by holding down the top key (where the usb connects) and plug in the keyboard

+ 1
- 0
keyboards/marshkeys/flowerpad/rules.mk View File

@ -0,0 +1 @@
# This file intentionally left blank

Loading…
Cancel
Save