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

small corrections to the total number of leds to space65 (#5001) #5006

Merged
merged 2 commits into from
Jan 30, 2019
Merged

small corrections to the total number of leds to space65 (#5001) #5006

merged 2 commits into from
Jan 30, 2019

Conversation

mnpqraven
Copy link
Contributor

The space65 uses 6 LEDs(3 top and 3 side) instead of 5. Just a small correction :)

Description

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. (https://docs.qmk.fm/#/contributing)
  • 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).

@mnpqraven
Copy link
Contributor Author

idk why but git is putting the whole file as one big diff instead of just the line that should be endited (L62)

@mechmerlin
Copy link
Contributor

mechmerlin commented Jan 30, 2019 •
edited
Loading

I have a fix for this coming in this weekend along with other optimizations.

This is a result of me looking at the webpage and reading brightness setting which is 5 as LED count.

@noroadsleft
Copy link
Member

@mnpqraven

keyboards/gray_studio/space65/config.h doesn't exist in the parent commit of 45ff725 on your source branch. You need to grab the changes from qmk/qmk_firmware and rebase.

git fetch upstream  
git rebase upstream/master

Assuming upstream points to qmk/qmk_firmware, git fetch grabs the current state of qmk/qmk_firmware, and then git rebase takes 45ff725, reverses it, updates your branch to match qmk/qmk_firmware's master branch , and then attempts to apply the same changes that 45ff725 did originally.

At this point, you'll have a merge conflict, but it will only be the line you edited. Open the file, fix the conflict, save, git add, git commit, git push --force-with-lease.

That should update your PR with only the one line you changed.

Extended instructions here: https://docs.qmk.fm/#/newbs_best_practices?id=resolving-merge-conflicts

Since @mechmerlin already has a fix, I'll let you two talk about who should do/will be doing what.

@mechmerlin mechmerlin merged commit 1d49f76 into qmk:master Jan 30, 2019
@mnpqraven
Copy link
Contributor Author

@noroadsleft you are correct, it was an oversight from me because i squashed my random commits from previous work and just added the config.h as a new commit, i'll look into it and improve my rebase/squash practice. Many thanks for the explanation !

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jan 31, 2019
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
81e5bb1 
* 'master' of https://github.com/qmk/qmk_firmware: (43 commits)
  Remove duplicate make invocations
  Fix file size check for parallel make (qmk#5012)
  [Keyboard] 40percent.club's Half 'n' half keyboard port (qmk#5005)
  update canoe/readme (qmk#5014)
  [Keyboard][S65-X] BACKLIGHT_CAPS_LOCK (qmk#4770)
  space65-5001 init, small corrections to the total number of leds (qmk#5006)
  [Keyboard] add dz60rgb keyboard (qmk#4992)
  [Keyboard] Jj40 doc (qmk#4914)
  [Keyboard] Redox Wireless configurator bugfix (qmk#4961)
  added aanzee pcb support (qmk#4962)
  Sweet16 Keymap by Spaceman added (qmk#5003)
  [Keyboard] Gray Studio Directory (qmk#5002)
  Fix link and name spelling in Space65's readme (qmk#5004)
  [Keymap] Updates to ortho_4x12/buswerks keymap (qmk#4996)
  [Keyboard] Gray Studio Space 65 Support (qmk#5001)
  Moving cannonkeys boards to one place, eeprom fix (qmk#4999)
  convert to unix line-endings [skip ci]
  S60x Make Default standard layout and have separate Mac OS one (qmk#4964)
  [Keyboard] Bug Fix To Unigo66 (qmk#4995)
  Contribute the MechMerlin QMK Configurator docs (qmk#4986)
  ...
@mnpqraven mnpqraven deleted the space65-5001 branch January 31, 2019 15:55
calmh added a commit to calmh/qmk_firmware that referenced this pull request Feb 4, 2019
@calmh
Merge branch 'master' into calmh
b089e46 
* master: (463 commits)
  New Keyboard: Sentraq Number Pad RGB DIY Kit (qmk#5047)
  ergodash Keyboard readme documentation (qmk#5046)
  [Keyboard] ADB converter lock LED fix (qmk#5035)
  [Keymap] Added , to fix errors (qmk#5034)
  Stanrc85 layout update/cleanup (qmk#5029)
  Add hand-swap config to Gergo layout (qmk#5033)
  [Keymap] Adds Preonic keymap for muzfuz. Small Planck addition. (qmk#5019)
  Change return type of layer_switch_get_layer() to uint8_t (qmk#5011)
  Space65 Updates (qmk#5008)
  [Keyboard] Add 1upkeyboards 1up80hte (Tsangan style PCB) (qmk#4988)
  Update info.json (qmk#5015)
  Fixed TGR Alice pinout and number of LEDs (qmk#5018)
  Generalized nyquist layout for 5x12 boards. Removed duplicate readme.md that was cased the same and caused issues.
  Remove duplicate make invocations
  Fix file size check for parallel make (qmk#5012)
  [Keyboard] 40percent.club's Half 'n' half keyboard port (qmk#5005)
  update canoe/readme (qmk#5014)
  [Keyboard][S65-X] BACKLIGHT_CAPS_LOCK (qmk#4770)
  space65-5001 init, small corrections to the total number of leds (qmk#5006)
  [Keyboard] add dz60rgb keyboard (qmk#4992)
  ...
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Feb 9, 2019
@mnpqraven @zer09
space65-5001 init, small corrections to the total number of leds (qmk…
23aade5 
…#5006)
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
@mnpqraven
space65-5001 init, small corrections to the total number of leds (qmk…
c9fdf06 
…#5006)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mechmerlin mechmerlin mechmerlin approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@mnpqraven @mechmerlin @noroadsleft @drashna