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

Dev/upstream #33

Merged
merged 62 commits into from
Aug 2, 2023
Merged

Dev/upstream #33

merged 62 commits into from
Aug 2, 2023

Conversation

BlueTufa
Copy link
Owner

@BlueTufa BlueTufa commented Aug 2, 2023

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

@github-actions github-actions bot added the keymap label Aug 2, 2023
@BlueTufa BlueTufa merged commit b7cb8d5 into master Aug 2, 2023
@BlueTufa BlueTufa deleted the dev/upstream branch August 2, 2023 03:41
BlueTufa added a commit that referenced this pull request Aug 3, 2023
* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* re-flash 1up
BlueTufa added a commit that referenced this pull request Aug 22, 2023
* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* re-flash 1up
BlueTufa added a commit that referenced this pull request Aug 22, 2023
* [Keyboard] Add Bento Box macropad (qmk#20521)

* moondrop/dash75: fix keymap (qmk#21680)

* Clarify custom keycode enum requirement for PRs (qmk#21648)

* Add VIA layout for Dactyl Manuform 5x6 (qmk#21649)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Contributing docs: add note to make sure repo is up to date (qmk#21694)

* Fix `binepad/bn009` and `durgod/dgk6x/hades_ansi` keymaps (qmk#21701)

* [Keyboard] Update usb.* of `dactyl_lightcycle` (qmk#21462)

* [Keyboard] add laneware `raindrop` keyboard (qmk#21277)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add Projectd/65/Projectd_65_ansi (qmk#21520)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>

* [Keymap] Add Via keymap for CXT Studio (qmk#21675)

* [Keyboard] fix json for nemui65 (qmk#21629)

* [Keyboard] Update USB settings for dactyl_maximus (qmk#21666)

* [Keyboard] Add mk47 keyboard (qmk#19797)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>

* correct keymap file name for tkl_f13_jis layout (qmk#21631)

* Fix `keyboard` field for some JSON keymaps (qmk#21752)

* [Keyboard] Add Shostudio Arc (qmk#21733)

* [Keymap] Update rpbaptist crkbd (qmk#21674)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Richard Baptist <richard@remote.com>

* [Keymap] Update andrebrait keymap for GMMK Pro (qmk#21668)

* [Keymap] submitting janat-t planck keymap (qmk#21619)

Co-authored-by: Janat Taerakul <jtaerakul@indeed.com>

* [keyboard] Graystudio Think6.5 V3 Support Revised (qmk#21560)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add Chouchou keyboard (qmk#21699)

* Add ScottoErgo Keyboard (qmk#20944)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add Scotto34 Keyboard (qmk#20943)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add ScottoInvader Keyboard (qmk#20941)

Co-authored-by: Ryan <fauxpark@gmail.com>

* coarse/cordillera: fix backlight config (qmk#21761)

* The PoweredByPorridge layout for the Keyboardio Atreus (qmk#21737)

Co-authored-by: jack <0x6a73@protonmail.com>

* Add Galatea rev3 keyboard (qmk#21758)

* Adding support for TAN67 PCB (qmk#21003)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Keyboard] Add Jelly Evolv (qmk#21407)

Co-authored-by: jack <0x6a73@protonmail.com>

* [Keyboard] Add linworks favepada (qmk#20794)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* Initial support for ALT v2 (qmk#21754)

* Initial support for CTRL v2 (qmk#21755)

* Initial support for SHIFT v2 (qmk#21756)

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* PI60 cleanup

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* PI60 cleanup

* cleanup

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* PI60 cleanup

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* PI60 cleanup

* cleanup

* Dev/upstream (#33)

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* re-flash 1up

---------

Co-authored-by: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 3geek14 <nerd.of.pi@gmail.com>
Co-authored-by: Hugh Rawlinson <hughrawlinson@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: gskygithub <106651989+gskygithub@users.noreply.github.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>
Co-authored-by: Brian McKenna <brian@brianmckenna.org>
Co-authored-by: spbgzh <72414103+spbgzh@users.noreply.github.com>
Co-authored-by: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>
Co-authored-by: mechlovin <57231893+mechlovin@users.noreply.github.com>
Co-authored-by: Richard Baptist <rpbaptist@users.noreply.github.com>
Co-authored-by: Richard Baptist <richard@remote.com>
Co-authored-by: Andre Brait <andrebrait@gmail.com>
Co-authored-by: Janat Taerakul <janat.taerakul@gmail.com>
Co-authored-by: Janat Taerakul <jtaerakul@indeed.com>
Co-authored-by: Yizhen Liu <62583086+edwardslau@users.noreply.github.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Joe Scotto <8194147+joe-scotto@users.noreply.github.com>
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Powered by Porridge <11315349+PoweredByPorridge@users.noreply.github.com>
Co-authored-by: studiokestra <74369928+studiokestra@users.noreply.github.com>
Co-authored-by: Pangorin <68218885+Pangorin@users.noreply.github.com>
Co-authored-by: owlab2 <64054049+lizhenmingdirk@users.noreply.github.com>
Co-authored-by: DUILCHOI <48977039+duilchoi@users.noreply.github.com>
Co-authored-by: Dan White <dan.white@cleerlyhealth.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant