tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-03-08 04:10:36 +00:00
parent b6000e0fe5 8f70adc0b6
commit b5996bf793
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/macro3/config.h
View File

@ -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 } \
}

2
keyboards/macro3/keymaps/default/keymap.c
View File

@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
_______, _______, _______, _______,
RESET, _______, _______, _______
QK_BOOT, _______, _______, _______
)
};

4
keyboards/macro3/macro3.c
View File

@ -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) {

4
keyboards/macro3/readme.md
View File

@ -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.