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.

Sign up for GitHub

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

Jump to bottom

Update encoder functions for Iris VIA keymap #8295

Merged
merged 1 commit into from
Mar 2, 2020
Merged

Update encoder functions for Iris VIA keymap #8295

merged 1 commit into from
Mar 2, 2020

Conversation

nooges
Copy link
Member

@nooges nooges commented Mar 2, 2020

Description

Adds encoder functionality to encoder on right half of VIA keymap.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@zvecr zvecr added the keymap label Mar 2, 2020
@zvecr zvecr requested a review from a team March 2, 2020 19:22
@zvecr zvecr merged commit ce30cd2 into qmk:master Mar 2, 2020
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 3, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
3bd02bc 
* 'master' of https://github.com/qmk/qmk_firmware: (37 commits)
  Update Hungarian keymap and add sendstring LUT (qmk#8220)
  Remove "ugly hack in usb_main.c" comments (qmk#8296)
  Update encoder functions for Iris VIA keymap (qmk#8295)
  Reduce PROGMEM usage for sendstring LUT (qmk#8109)
  [Docs] Update ISP Flashing guide (qmk#8149)
  Rewrite the Bathroom Epiphanies Frosty Flake matrix and LED handling (qmk#8243)
  Add onekey keymap for testing reset to bootloader. (qmk#8288)
  Get the direction right on the S75 encoder (qmk#8287)
  Prune out pure software pwm && custom driver && remove wrapping BACKLIGHT_PIN (qmk#8041)
  Make a fix to savage65 and tmov2 for via (qmk#8286)
  format code according to conventions [skip ci]
  Short term fix for conflicting types for 'tfp_printf' (qmk#8157)
  Fix recent clang-format breaking quantum.c (qmk#8282)
  format code according to conventions [skip ci]
  Remove duplicate BRTG case (qmk#8277)
  Clean up includes for glcdfont headers (qmk#7745)
  Fix the Breaking Changes doc again
  [Docs] translated 'feature_tap_dance.md' to japanese. (qmk#8137)
  PWM DMA based RGB Underglow for STM32 (qmk#7928)
  Add VIA support to Prime_M. Clean up all files (qmk#8247)
  ...
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Mar 5, 2020
@nooges @HokieGeek
Update encoder functions for Iris VIA keymap (qmk#8295)
b6b8272
nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Mar 5, 2020
Merge remote-tracking branch 'upstream/master'
4aeb119 
* upstream/master: (37 commits)
  Add RGB lighting through one of the free pins (qmk#8294)
  [Keymap] Adding the 4sStylZ xd75 (qmk#8285)
  YD60MQ refactor and Configurator layout support (qmk#8313)
  [Keyboard] Forget to ifdef Super16 led config (qmk#8314)
  [Keyboard] Switch to RGB Matrix for Super16 (qmk#8305)
  [Keymap] Keymap Update (qmk#8309)
  New Keyboard: SiddersKB Majbritt (Pronounced My Brit) (qmk#8260)
  [Keyboard] VIA Support: Tada68 (qmk#8289)
  [Keyboard] LFK78 refactor (qmk#7835)
  [Keymap] new userspace for ibnuda (qmk#8221)
  [Keymap] Add crd's equinox keymap (qmk#8251)
  [Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
  Fix bootloader definition for namecard2x4 (qmk#8301)
  Update Hungarian keymap and add sendstring LUT (qmk#8220)
  Remove "ugly hack in usb_main.c" comments (qmk#8296)
  Update encoder functions for Iris VIA keymap (qmk#8295)
  Reduce PROGMEM usage for sendstring LUT (qmk#8109)
  [Docs] Update ISP Flashing guide (qmk#8149)
  Rewrite the Bathroom Epiphanies Frosty Flake matrix and LED handling (qmk#8243)
  Add onekey keymap for testing reset to bootloader. (qmk#8288)
  ...
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@nooges @c0psrul3
Update encoder functions for Iris VIA keymap (qmk#8295)
1d12efb
@nooges nooges deleted the iris4-via-keymap branch March 28, 2020 03:57
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
@nooges @sowbug
Update encoder functions for Iris VIA keymap (qmk#8295)
b49345f
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@nooges @kujawakk
Update encoder functions for Iris VIA keymap (qmk#8295)
c110b15
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@nooges @jakeisnt
Update encoder functions for Iris VIA keymap (qmk#8295)
070a698
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@zvecr zvecr zvecr approved these changes

Assignees
No one assigned
Labels
keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nooges @fauxpark @zvecr