diff options
author | Albert Y <76888457+filterpaper@users.noreply.github.com> | 2021-11-29 16:18:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-29 00:18:33 -0800 |
commit | 35a18a8bcd393bf17f4be326d8ef067ce6bfaf50 (patch) | |
tree | a017712e1d9e14e927670adfbf8d6b60fd722336 | |
parent | 690a879d77485a32a33c34d85a6563f96899fc64 (diff) | |
download | qmk_firmware-35a18a8bcd393bf17f4be326d8ef067ce6bfaf50.tar.gz qmk_firmware-35a18a8bcd393bf17f4be326d8ef067ce6bfaf50.zip |
[Keyboard] Code updates for macro3 (#15280)
Co-authored-by: filterpaper <filterpaper@localhost>
-rw-r--r-- | keyboards/macro3/config.h | 18 | ||||
-rw-r--r-- | keyboards/macro3/keymaps/default/keymap.c | 18 | ||||
-rw-r--r-- | keyboards/macro3/macro3.c | 26 | ||||
-rw-r--r-- | keyboards/macro3/macro3.h | 14 | ||||
-rw-r--r-- | keyboards/macro3/post_config.h | 17 | ||||
-rw-r--r-- | keyboards/macro3/readme.md | 6 |
6 files changed, 32 insertions, 67 deletions
diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h index 59f7a151c..84f8c8fd9 100644 --- a/keyboards/macro3/config.h +++ b/keyboards/macro3/config.h | |||
@@ -1,18 +1,6 @@ | |||
1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> | 1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> |
2 | * Copyright 2021 @filterpaper | 2 | * Copyright 2021 @filterpaper |
3 | * | 3 | * SPDX-License-Identifier: GPL-2.0+ |
4 | * This program is free software: you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation, either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | 4 | */ |
17 | 5 | ||
18 | #pragma once | 6 | #pragma once |
@@ -49,7 +37,3 @@ | |||
49 | /* Locking resynchronize hack */ | 37 | /* Locking resynchronize hack */ |
50 | #define LOCKING_RESYNC_ENABLE | 38 | #define LOCKING_RESYNC_ENABLE |
51 | 39 | ||
52 | /* Top right key */ | ||
53 | #define BOOTMAGIC_LITE_ROW 0 | ||
54 | #define BOOTMAGIC_LITE_COLUMN 3 | ||
55 | |||
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c index ca4db51f3..11ebeff02 100644 --- a/keyboards/macro3/keymaps/default/keymap.c +++ b/keyboards/macro3/keymaps/default/keymap.c | |||
@@ -1,26 +1,14 @@ | |||
1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> | 1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> |
2 | * Copyright 2021 @filterpaper | 2 | * Copyright 2021 @filterpaper |
3 | * | 3 | * SPDX-License-Identifier: GPL-2.0+ |
4 | * This program is free software: you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation, either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | 4 | */ |
17 | 5 | ||
18 | #include QMK_KEYBOARD_H | 6 | #include QMK_KEYBOARD_H |
19 | 7 | ||
20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
21 | [0] = LAYOUT( | 9 | [0] = LAYOUT( |
22 | KC_HOME, KC_MUTE, KC_MPLY, KC_MSEL, | 10 | KC_MUTE, KC_MPLY, KC_MRWD, LT(1,KC_MFFD), |
23 | KC_UNDO, KC_CUT, KC_COPY, LT(1,KC_PSTE) | 11 | C(KC_Z), C(KC_X), C(KC_C), C(KC_V) |
24 | ), | 12 | ), |
25 | [1] = LAYOUT( | 13 | [1] = LAYOUT( |
26 | _______, _______, _______, _______, | 14 | _______, _______, _______, _______, |
diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c index cc12c0268..90bb98250 100644 --- a/keyboards/macro3/macro3.c +++ b/keyboards/macro3/macro3.c | |||
@@ -1,18 +1,6 @@ | |||
1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> | 1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> |
2 | * Copyright 2021 @filterpaper | 2 | * Copyright 2021 @filterpaper |
3 | * | 3 | * SPDX-License-Identifier: GPL-2.0+ |
4 | * This program is free software: you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation, either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | 4 | */ |
17 | 5 | ||
18 | #include "macro3.h" | 6 | #include "macro3.h" |
@@ -20,17 +8,17 @@ | |||
20 | #ifdef ENCODER_ENABLE | 8 | #ifdef ENCODER_ENABLE |
21 | bool encoder_update_kb(uint8_t index, bool clockwise) { | 9 | bool encoder_update_kb(uint8_t index, bool clockwise) { |
22 | if (!encoder_update_user(index, clockwise)) { return false; } | 10 | if (!encoder_update_user(index, clockwise)) { return false; } |
23 | if (index == 1) { | 11 | if (index == 0) { |
24 | if (clockwise) { | 12 | if (clockwise) { |
25 | tap_code(KC_VOLD); | ||
26 | } else { | ||
27 | tap_code(KC_VOLU); | 13 | tap_code(KC_VOLU); |
14 | } else { | ||
15 | tap_code(KC_VOLD); | ||
28 | } | 16 | } |
29 | } else if (index == 0) { | 17 | } else if (index == 1) { |
30 | if (clockwise) { | 18 | if (clockwise) { |
31 | tap_code(KC_WH_D); | 19 | tap_code(KC_MNXT); |
32 | } else { | 20 | } else { |
33 | tap_code(KC_WH_U); | 21 | tap_code(KC_MPRV); |
34 | } | 22 | } |
35 | } | 23 | } |
36 | return true; | 24 | return true; |
diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h index 12621d2c0..d95f50408 100644 --- a/keyboards/macro3/macro3.h +++ b/keyboards/macro3/macro3.h | |||
@@ -1,18 +1,6 @@ | |||
1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> | 1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> |
2 | * Copyright 2021 @filterpaper | 2 | * Copyright 2021 @filterpaper |
3 | * | 3 | * SPDX-License-Identifier: GPL-2.0+ |
4 | * This program is free software: you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation, either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | 4 | */ |
17 | 5 | ||
18 | #include "quantum.h" | 6 | #include "quantum.h" |
diff --git a/keyboards/macro3/post_config.h b/keyboards/macro3/post_config.h new file mode 100644 index 000000000..0f94fe19e --- /dev/null +++ b/keyboards/macro3/post_config.h | |||
@@ -0,0 +1,17 @@ | |||
1 | /* Copyright 2020 David Philip Barr <@davidphilipbarr> | ||
2 | * Copyright 2021 @filterpaper | ||
3 | * SPDX-License-Identifier: GPL-2.0+ | ||
4 | */ | ||
5 | |||
6 | /* Top right key */ | ||
7 | #ifndef BOOTMAGIC_LITE_ROW | ||
8 | # define BOOTMAGIC_LITE_ROW 0 | ||
9 | #endif | ||
10 | #ifndef BOOTMAGIC_LITE_COLUMN | ||
11 | # define BOOTMAGIC_LITE_COLUMN 3 | ||
12 | #endif | ||
13 | |||
14 | #ifndef ENCODER_RESOLUTION | ||
15 | # define ENCODER_RESOLUTION 2 | ||
16 | #endif | ||
17 | |||
diff --git a/keyboards/macro3/readme.md b/keyboards/macro3/readme.md index 66a142ecd..023474117 100644 --- a/keyboards/macro3/readme.md +++ b/keyboards/macro3/readme.md | |||
@@ -1,8 +1,8 @@ | |||
1 | # Macro3 | 1 | # Macro3 |
2 | 2 | ||
3 |  | 3 |  |
4 | 4 | ||
5 | Macro3 is a low-profile macro pad with encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr) using direct micro-controller pin wiring. | 5 | Macro3 is a low-profile macro pad with dual encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr). |
6 | 6 | ||
7 | ## Keyboard Info | 7 | ## Keyboard Info |
8 | 8 | ||
@@ -21,6 +21,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to | |||
21 | Enter the bootloader in 3 ways: | 21 | Enter the bootloader in 3 ways: |
22 | 22 | ||
23 | * **Bootmagic reset**: Hold down the top right key and plug in the controller. | 23 | * **Bootmagic reset**: Hold down the top right key and plug in the controller. |
24 | * **Physical reset button**: Briefly press the reset button soldered on the PCB. | ||
25 | * **Keycode in layout**: Press the key mapped to `RESET` if it is configured. | 24 | * **Keycode in layout**: Press the key mapped to `RESET` if it is configured. |
25 | * **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material. | ||
26 | 26 | ||