diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /keyboards/macro3 | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'keyboards/macro3')
| -rw-r--r-- | keyboards/macro3/info.json | 29 | ||||
| -rw-r--r-- | keyboards/macro3/keymaps/default/keymap.c | 25 | ||||
| -rw-r--r-- | keyboards/macro3/macro3.h | 16 |
3 files changed, 70 insertions, 0 deletions
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json new file mode 100644 index 0000000000..b95ab110f3 --- /dev/null +++ b/keyboards/macro3/info.json @@ -0,0 +1,29 @@ +{ + "keyboard_name": "Macro3", + "manufacturer": "DPB", + "url": "https://github.com/davidphilipbarr/Macropads/tree/main/macro3", + "maintainer": "@davidphilipbarr", + "usb": { + "vid": "0xC88B", + "pid": "0x3388", + "device_version": "0.0.3" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_2x4" + }, + "layouts": { + "LAYOUT_ortho_2x4": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1} + ] + } + } +} diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c new file mode 100644 index 0000000000..50cafe9d0f --- /dev/null +++ b/keyboards/macro3/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +/* Copyright 2020 David Philip Barr <@davidphilipbarr> + * Copyright 2021 @filterpaper + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_2x4( + KC_MUTE, KC_MPLY, KC_MRWD, LT(1,KC_MFFD), + C(KC_Z), C(KC_X), C(KC_C), C(KC_V) + ), + [1] = LAYOUT_ortho_2x4( + _______, _______, _______, _______, + QK_BOOT, _______, _______, _______ + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, +}; +#endif + diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h new file mode 100644 index 0000000000..4a5071cbfe --- /dev/null +++ b/keyboards/macro3/macro3.h @@ -0,0 +1,16 @@ +/* Copyright 2020 David Philip Barr <@davidphilipbarr> + * Copyright 2021 @filterpaper + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "quantum.h" + +#define LAYOUT_ortho_2x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13 \ +) \ +{ \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 } \ +} + |