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

Adding my keymap #20345

Merged
merged 27 commits into from
Apr 30, 2023
Merged

Adding my keymap #20345

merged 27 commits into from
Apr 30, 2023

Conversation

jestes5111
Copy link
Contributor

Description

Adding my Iris keymap, focused on editing in VIM/Excel, gaming, and keyboard-focused media consumption.

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

  • N/A

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • 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).

keyboards/keebio/iris/keymaps/jestes5111/config.h Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/config.h Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/rules.mk Outdated Show resolved Hide resolved
lib/chibios Outdated Show resolved Hide resolved
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

It looks like you have changes to the submodules here. These need to be reverted before the PR can be approved.

Rebasing sometimes will fix this. Otherwise, you'd want to do something like this to fix them:

git checkout master
git submodule foreach 'git log -n1 --oneline'
# remember the first abcdef1234 on the submodules that have an issue
git checkout @@your-branch@@
# for each of the problematic repo's:
cd lib/@@name@@
git checkout abcdef1234

keyboards/keebio/iris/keymaps/jestes5111/README.md Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.svg Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

Updated as per requests

keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/jestes5111/keymap.c Outdated Show resolved Hide resolved
@jestes5111 jestes5111 requested a review from drashna April 10, 2023 11:49
@elpekenin
Copy link
Contributor

Note: #20345 (comment)

Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

Made requested changes

Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

Updated as per requests

Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

Made requested changes

@waffle87
Copy link
Member

waffle87 commented Apr 19, 2023

Two reviewers have requested you rename your README.md file to lowercase. Please do not mark comments as resolved without making the changes...

Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

readme.md should actually be lowercase now. I renamed it locally when I was initially requested to change it to lowercase, but it never updated here.

Copy link
Contributor Author

@jestes5111 jestes5111 left a comment

Choose a reason for hiding this comment

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

Reviewing older changes

Comment on lines +126 to +128
SEND_STRING(":disguised_face: :thumbsup:");
wait_ms(100);
tap_code(KC_ENTER);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
SEND_STRING(":disguised_face: :thumbsup:");
wait_ms(100);
tap_code(KC_ENTER);
SEND_STRING(":disguised_face: :thumbsup:" SS_DELAY(100) SS_TAP(X_ENTER));

@tzarc tzarc merged commit c55c7fe into qmk:master Apr 30, 2023
struckmb pushed a commit to struckmb/qmk_firmware that referenced this pull request May 1, 2023
rodrigob pushed a commit to rodrigob/qmk_firmware that referenced this pull request May 2, 2023
barrettclark added a commit to barrettclark/qmk_firmware that referenced this pull request May 4, 2023
* upstream/master: (46 commits)
  [Keyboard] Add 1upkeyboards pi50 (qmk#20242)
  `sofle/via` encoder map & doc handedness update (qmk#20630)
  [Keyboard] add phantagom/baragon marcopad (qmk#20543)
  [Keyboard] add phantagom/varan rgb numpad (qmk#20587)
  [Keymap] Small changes to fix failing karn keyboard build (qmk#20618)
  Repair Spleeb i2c config and chrishoage keymap (qmk#20644)
  Adding my keymap (qmk#20345)
  Add additional options for Drag Scroll config (qmk#20523)
  Added Velvet Hotswap and Solder PCBs (qmk#20510)
  [Keyboard] Add the Aster Ergo PCB (qmk#20513)
  vertex/angle65 - Implement RGBlight (qmk#20514)
  [Keymap update] Keymap & docs update (qmk#20298)
  Fix MATRIX_HAS_GHOST when MATRIX_COL > 16 (qmk#20093)
  ez_maker/directpins/promicro: Fix bootloader mismatch (qmk#20627)
  Fix up positioning of keys for Keychron Q10/V10 and Q6/V6 (qmk#20582)
  [Keymap] Add johnstegeman iris colemak keymap (qmk#20575)
  [Keyboard] Add Manibus VIA support (qmk#20497)
  Add KBDCraft Adam64 Lego board (qmk#20503)
  Update code example to match description (qmk#20528)
  NK Plus (qmk#20392)
  ...
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants