Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keymap Fixes for 7U layout, RGB and Audio support #2779

Merged
merged 1 commit into from
Apr 26, 2018

Conversation

yanfali
Copy link
Contributor

@yanfali yanfali commented Apr 21, 2018

  • confused KC_COMM, KC_SLSH, KC_DOT order
  • KC_INS -> KC_DEL
  • Document audio on C4 and B7, set default RGB to pin C6

 - confused KC_COMM, KC_SLSH, KC_DOT order
 - KC_INS -> KC_DEL
 - Document audio on C4 and B7, set default RGB to pin C6
@drashna drashna requested a review from skullydazed April 21, 2018 07:22
my_timer = timer_read();
}

void matrix_scan_user(void) {

This comment was marked as resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason while the mcu is initializing if I don't wait until it's done it slows the song down.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay. And weird

@@ -69,6 +69,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define RGB_DI_PIN C6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the board have a solder point for this, specifically?

If not, then it may be better in the keymap's config.h.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why yes it does. @skullydazed put in 4 pins specifically for peripherals. VCC, GND, C5 and C6 on the bottom of the PCB. I picked 6 because @walkerstop also used this pin for his board.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, awesome then.

However, since it's a core keyboard file that's being edited here, I'd like to have @skullydazed check off on this first, since it's his board.

Copy link
Contributor Author

@yanfali yanfali Apr 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely. He eyeballed it on slack, but I'll wait for him to approve.

@drashna
Copy link
Member

drashna commented Apr 26, 2018

Thanks!

@drashna drashna merged commit 535a4d5 into qmk:master Apr 26, 2018
@yanfali yanfali deleted the yanfali-2x1800 branch April 26, 2018 20:52
carlpehrson pushed a commit to carlpehrson/qmk_firmware that referenced this pull request May 7, 2018
- confused KC_COMM, KC_SLSH, KC_DOT order
 - KC_INS -> KC_DEL
 - Document audio on C4 and B7, set default RGB to pin C6
akatrevorjay added a commit to akatrevorjay/qmk_firmware that referenced this pull request Oct 8, 2018
* 'master' of git://github.com/qmk/qmk_firmware: (105 commits)
  Add dz60 iso layout with vim-style arrows (qmk#2837)
  Fix Clicky Down code
  Addkeymap/tada fakb (qmk#2830)
  Add knops mini info json and implemented latest QMK standards (qmk#2832)
  Add RGB keymap to UT47 (qmk#2826)
  QMK Configurator updates to Tada68 (qmk#2825)
  Add keymap diagram (qmk#2819)
  QMK Configurator updates for Mechmini v2 (qmk#2820)
  QMK Configurator Support (qmk#2821)
  QMK Configurator Support for HHKB and Staryu (qmk#2823)
  Fix UT47 matrix (qmk#2824)
  Updated tri-layer block in keymap file. (qmk#2827)
  Add missing 7U and 4U layouts to 2x1800 (qmk#2829)
  New Numpad Support: naKey from ckeys.org (qmk#2828)
  Bring dactyl/matrix.c in line with quantum/matrix.c (qmk#2613)
  FC660C Configurator Support (qmk#2817)
  avocado toast change (qmk#2816)
  QMK Configurator Support MF68 (qmk#2815)
  More QMK Configurator Support for Pearl (qmk#2814)
  Keymap Fixes for 7U layout, RGB and Audio support (qmk#2779)
  ...
hauleth pushed a commit to hauleth/qmk_firmware that referenced this pull request Jan 24, 2019
- confused KC_COMM, KC_SLSH, KC_DOT order
 - KC_INS -> KC_DEL
 - Document audio on C4 and B7, set default RGB to pin C6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants