summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-08 04:10:36 +0000
committerQMK Bot <hello@qmk.fm>2022-03-08 04:10:36 +0000
commitb5996bf7939ec1af9f9f23a6c645b288748926fb (patch)
tree3178c23919d051f2317684669ea25c6c7d6dc399
parentb6000e0fe56ee9e2388175d240656ffd2ec486b8 (diff)
parent8f70adc0b6e8c1e7f08f9fd2496385c4053282ee (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/macro3/config.h2
-rw-r--r--keyboards/macro3/keymaps/default/keymap.c2
-rw-r--r--keyboards/macro3/macro3.c4
-rw-r--r--keyboards/macro3/readme.md4
4 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h
index 722cdf319f..7e7b371960 100644
--- a/keyboards/macro3/config.h
+++ b/keyboards/macro3/config.h
@@ -18,7 +18,7 @@
#define MATRIX_COLS 4
/* key matrix pins */
-#define DIRECT_PINS { \
+#define DIRECT_PINS { \
{ D7, C6, D4, D1 }, \
{ B1, B4, B5, B3 } \
}
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c
index 11ebeff023..e866d481df 100644
--- a/keyboards/macro3/keymaps/default/keymap.c
+++ b/keyboards/macro3/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
_______, _______, _______, _______,
- RESET, _______, _______, _______
+ QK_BOOT, _______, _______, _______
)
};
diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c
index 90bb982509..0937abfc83 100644
--- a/keyboards/macro3/macro3.c
+++ b/keyboards/macro3/macro3.c
@@ -10,9 +10,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 0) {
if (clockwise) {
- tap_code(KC_VOLU);
+ tap_code_delay(KC_VOLU, 10);
} else {
- tap_code(KC_VOLD);
+ tap_code_delay(KC_VOLD, 10);
}
} else if (index == 1) {
if (clockwise) {
diff --git a/keyboards/macro3/readme.md b/keyboards/macro3/readme.md
index 0234741174..40cf927392 100644
--- a/keyboards/macro3/readme.md
+++ b/keyboards/macro3/readme.md
@@ -6,7 +6,7 @@ Macro3 is a low-profile macro pad with dual encoder support designed by [@davidp
## Keyboard Info
-* Keyboard Maintainer: [davidphilipbarr](https://github.com/davidphilipbarr)
+* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper), [davidphilipbarr](https://github.com/davidphilipbarr)
* Hardware Supported: [Macro3](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
* Hardware Availability: order PCBs with gerber file from the repository
@@ -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.
-* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` 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.