forked from forks/qmk_firmware
[Keyboard] Code updates for macro3 (#15280)
Co-authored-by: filterpaper <filterpaper@localhost>
This commit is contained in:
parent
690a879d77
commit
35a18a8bcd
|
@ -1,18 +1,6 @@
|
|||
/* Copyright 2020 David Philip Barr <@davidphilipbarr>
|
||||
* Copyright 2021 @filterpaper
|
||||
*
|
||||
* 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/>.
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
@ -49,7 +37,3 @@
|
|||
/* Locking resynchronize hack */
|
||||
#define LOCKING_RESYNC_ENABLE
|
||||
|
||||
/* Top right key */
|
||||
#define BOOTMAGIC_LITE_ROW 0
|
||||
#define BOOTMAGIC_LITE_COLUMN 3
|
||||
|
||||
|
|
|
@ -1,26 +1,14 @@
|
|||
/* Copyright 2020 David Philip Barr <@davidphilipbarr>
|
||||
* Copyright 2021 @filterpaper
|
||||
*
|
||||
* 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/>.
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(
|
||||
KC_HOME, KC_MUTE, KC_MPLY, KC_MSEL,
|
||||
KC_UNDO, KC_CUT, KC_COPY, LT(1,KC_PSTE)
|
||||
KC_MUTE, KC_MPLY, KC_MRWD, LT(1,KC_MFFD),
|
||||
C(KC_Z), C(KC_X), C(KC_C), C(KC_V)
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
_______, _______, _______, _______,
|
||||
|
|
|
@ -1,18 +1,6 @@
|
|||
/* Copyright 2020 David Philip Barr <@davidphilipbarr>
|
||||
* Copyright 2021 @filterpaper
|
||||
*
|
||||
* 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/>.
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include "macro3.h"
|
||||
|
@ -20,17 +8,17 @@
|
|||
#ifdef ENCODER_ENABLE
|
||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||
if (index == 1) {
|
||||
if (index == 0) {
|
||||
if (clockwise) {
|
||||
tap_code(KC_VOLD);
|
||||
} else {
|
||||
tap_code(KC_VOLU);
|
||||
}
|
||||
} else if (index == 0) {
|
||||
if (clockwise) {
|
||||
tap_code(KC_WH_D);
|
||||
} else {
|
||||
tap_code(KC_WH_U);
|
||||
tap_code(KC_VOLD);
|
||||
}
|
||||
} else if (index == 1) {
|
||||
if (clockwise) {
|
||||
tap_code(KC_MNXT);
|
||||
} else {
|
||||
tap_code(KC_MPRV);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -1,18 +1,6 @@
|
|||
/* Copyright 2020 David Philip Barr <@davidphilipbarr>
|
||||
* Copyright 2021 @filterpaper
|
||||
*
|
||||
* 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/>.
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include "quantum.h"
|
||||
|
|
17
keyboards/macro3/post_config.h
Normal file
17
keyboards/macro3/post_config.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
/* Copyright 2020 David Philip Barr <@davidphilipbarr>
|
||||
* Copyright 2021 @filterpaper
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
/* Top right key */
|
||||
#ifndef BOOTMAGIC_LITE_ROW
|
||||
# define BOOTMAGIC_LITE_ROW 0
|
||||
#endif
|
||||
#ifndef BOOTMAGIC_LITE_COLUMN
|
||||
# define BOOTMAGIC_LITE_COLUMN 3
|
||||
#endif
|
||||
|
||||
#ifndef ENCODER_RESOLUTION
|
||||
# define ENCODER_RESOLUTION 2
|
||||
#endif
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Macro3
|
||||
|
||||
![Macro3](https://github.com/davidphilipbarr/Macropads/raw/main/macro3/IMG_20200703_170424.jpg)
|
||||
![Macro3](https://github.com/filterpaper/filterpaper.github.io/raw/main/images/macro3.png)
|
||||
|
||||
Macro3 is a low-profile macro pad with encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr) using direct micro-controller pin wiring.
|
||||
Macro3 is a low-profile macro pad with dual encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr).
|
||||
|
||||
## Keyboard Info
|
||||
|
||||
|
@ -21,6 +21,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
|
|||
Enter the bootloader in 3 ways:
|
||||
|
||||
* **Bootmagic reset**: Hold down the top right key and plug in the controller.
|
||||
* **Physical reset button**: Briefly press the reset button soldered on the PCB.
|
||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
|
||||
* **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
|
||||
|
||||
|
|
Loading…
Reference in a new issue