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

Readded lost pgm_read_word code to encoder array lookups #7577

Merged
merged 1 commit into from
Dec 22, 2019
Merged

Readded lost pgm_read_word code to encoder array lookups #7577

merged 1 commit into from
Dec 22, 2019

Conversation

XScorpion2
Copy link
Contributor

Description

Adding code that was lost at some point to the Sol Rev2 Encoder keymaps.

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

yanfali
yanfali reviewed Dec 9, 2019
View reviewed changes
Copy link
Contributor

@yanfali yanfali left a comment

Choose a reason for hiding this comment

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

Looks straightforward. Have you regression tested the spamming thing?

Legonut
Legonut reviewed Dec 9, 2019
View reviewed changes
Copy link
Contributor

@Legonut Legonut left a comment

Choose a reason for hiding this comment

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

Tested, works. Thanks @XScorpion2 !

@Legonut
Copy link
Contributor

Legonut commented Dec 21, 2019

Any chance we can get this merged soon? I have a lot of customers building boards that are having trouble.

zvecr
zvecr approved these changes Dec 21, 2019
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

If we can get confirmation of the question @yanfali raised, I see no reason this can't be merged soonish.

@XScorpion2
Copy link
Contributor Author

Oh sorry, ya I tested the spamming issue and it does not occur with this updated pr.

@drashna
Copy link
Member

drashna commented Dec 22, 2019

Thanks!

@drashna drashna merged commit 0e2ff9b into qmk:master Dec 22, 2019
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Dec 26, 2019
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
01b7405 
* 'master' of https://github.com/qmk/qmk_firmware: (226 commits)
  Make the keyboard beep when Audio is enabled and `\a` is encountered in a sendstring
  Turn off RGB Matrix LEDs when keyboard sleeps (qmk#7713)
  Add backwards compatibility for oled_write_raw_P on ARM
  Update toshi0383 keymap (qmk#7700)
  Completely remove i2c_transmit_receive function (qmk#7686)
  Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
  Add central location for ChibiOS defines (qmk#7542)
  Add TADA68 keymap/rules/config for QMK bootloader (qmk#7679)
  [Docs] fix docs (qmk#7642)
  [Keyboard] Clueboard 60 fix col 11 12 mixup (qmk#7685)
  Missed these LTO blocks
  I corrected my name.
  [Keymap] Added userspace for d4mation. Included their keymap for the Atreus62 (qmk#7483)
  [Keymap] Custom user keymap for Think6.5 with LED range control (qmk#7603)
  [Keymap] CRKBD Custom Keymap - KidBrazil (qmk#7630)
  [Keymap] Add pico 70 keys keymap (qmk#7654)
  Improve docs "Edit Document" footer
  Tidy up dztech config.h
  Tidy up dztech default keymaps and info.json (qmk#7608)
  Heisenberg handwired keyboard added (qmk#7643)
  ...
akrob pushed a commit to akrob/qmk_firmware that referenced this pull request Dec 28, 2019
Merge remote-tracking branch 'upstream/master'
6edd8aa 
* upstream/master: (1080 commits)
  Update toshi0383 keymap (qmk#7700)
  Completely remove i2c_transmit_receive function (qmk#7686)
  Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
  Add central location for ChibiOS defines (qmk#7542)
  Add TADA68 keymap/rules/config for QMK bootloader (qmk#7679)
  [Docs] fix docs (qmk#7642)
  [Keyboard] Clueboard 60 fix col 11 12 mixup (qmk#7685)
  Missed these LTO blocks
  I corrected my name.
  [Keymap] Added userspace for d4mation. Included their keymap for the Atreus62 (qmk#7483)
  [Keymap] Custom user keymap for Think6.5 with LED range control (qmk#7603)
  [Keymap] CRKBD Custom Keymap - KidBrazil (qmk#7630)
  [Keymap] Add pico 70 keys keymap (qmk#7654)
  Improve docs "Edit Document" footer
  Tidy up dztech config.h
  Tidy up dztech default keymaps and info.json (qmk#7608)
  Heisenberg handwired keyboard added (qmk#7643)
  [Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
  Ported J80 to QMK (qmk#7488)
  [Keyboard] Magnavox Videowriter conversion with Pro Micro (qmk#7634)
  ...
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
@XScorpion2 @patrl
Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
937916b
@XScorpion2 XScorpion2 deleted the bugfix/sol_r2_encoders branch January 5, 2020 02:27
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@XScorpion2 @HokieGeek
Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
dd57d96
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@XScorpion2 @kujawakk
Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
f023354
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Legonut Legonut Legonut left review comments

@yanfali yanfali yanfali left review comments

@zvecr zvecr zvecr approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@XScorpion2 @Legonut @drashna @yanfali @zvecr