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

Upgrade master #34

Merged
merged 132 commits into from
Aug 22, 2023
Merged

Upgrade master #34

merged 132 commits into from
Aug 22, 2023

Conversation

BlueTufa
Copy link
Owner

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

Synth-and-Keys and others added 30 commits August 2, 2023 10:05
@Synth-and-Keys
[Keyboard] Add Bento Box macropad (qmk#20521)
34a2f14
@fauxpark
moondrop/dash75: fix keymap (qmk#21680)
19536b8
@3geek14
Clarify custom keycode enum requirement for PRs (qmk#21648)
aa8d1c5
@hughrawlinson @dunk2k
Add VIA layout for Dactyl Manuform 5x6 (qmk#21649)
37b6260 
Co-authored-by: Duncan Sutherland <[email protected]>
@fauxpark
Contributing docs: add note to make sure repo is up to date (qmk#21694)
049a4ba
@fauxpark
Fix binepad/bn009 and durgod/dgk6x/hades_ansi keymaps (qmk#21701)
d52bafa
@dunk2k
[Keyboard] Update usb.* of dactyl_lightcycle (qmk#21462)
e4716d2
@dunk2k @sigprof @fauxpark
[Keyboard] add laneware raindrop keyboard (qmk#21277)
75d84e5 
Co-authored-by: Sergey Vlasov <[email protected]>
Co-authored-by: Ryan <[email protected]>
@gskygithub @fauxpark
[Keyboard] Add Projectd/65/Projectd_65_ansi (qmk#21520)
a0c99e3 
Co-authored-by: Ryan <[email protected]>
Co-authored-by: gksygithub <[email protected]>
@puffnfresh
[Keymap] Add Via keymap for CXT Studio (qmk#21675)
3831407
@spbgzh
[Keyboard] fix json for nemui65 (qmk#21629)
e4e90fa
@dunk2k
[Keyboard] Update USB settings for dactyl_maximus (qmk#21666)
6f63857
@jonylee1986 @drashna
@fauxpark @waffle87 @zvecr @itarze
[Keyboard] Add mk47 keyboard (qmk#19797)
8d0e9e0 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Joy <[email protected]>
Co-authored-by: Joy Lee <[email protected]>
@dunk2k
correct keymap file name for tkl_f13_jis layout (qmk#21631)
e6187b7
@fauxpark
Fix keyboard field for some JSON keymaps (qmk#21752)
125a903
@mechlovin
[Keyboard] Add Shostudio Arc (qmk#21733)
f3ef90b
@rpbaptist @drashna @richardbaptist
[Keymap] Update rpbaptist crkbd (qmk#21674)
815cecf 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Richard Baptist <[email protected]>
@andrebrait
[Keymap] Update andrebrait keymap for GMMK Pro (qmk#21668)
280a96b
@janat-t
[Keymap] submitting janat-t planck keymap (qmk#21619)
6038023 
Co-authored-by: Janat Taerakul <[email protected]>
@edwardslau @waffle87
@dunk2k @fauxpark
[keyboard] Graystudio Think6.5 V3 Support Revised (qmk#21560)
31a9d2d 
Co-authored-by: jack <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
Co-authored-by: Ryan <[email protected]>
@dlip
[Keyboard] Add Chouchou keyboard (qmk#21699)
dbd847d
@joe-scotto @drashna @fauxpark
Add ScottoErgo Keyboard (qmk#20944)
ad954fe 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@joe-scotto @filterpaper
@drashna @fauxpark
Add Scotto34 Keyboard (qmk#20943)
8be8d50 
Co-authored-by: Albert Y <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@joe-scotto @fauxpark
Add ScottoInvader Keyboard (qmk#20941)
50ab230 
Co-authored-by: Ryan <[email protected]>
@fauxpark
coarse/cordillera: fix backlight config (qmk#21761)
dea2d94
@PoweredByPorridge @waffle87
The PoweredByPorridge layout for the Keyboardio Atreus (qmk#21737)
190738c 
Co-authored-by: jack <[email protected]>
@studiokestra
Add Galatea rev3 keyboard (qmk#21758)
d91857d
@Pangorin @drashna
@fauxpark @dunk2k
Adding support for TAN67 PCB (qmk#21003)
6d9eab8 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
@lizhenmingdirk @waffle87
[Keyboard] Add Jelly Evolv (qmk#21407)
dd4f4f8 
Co-authored-by: jack <[email protected]>
@duilchoi @drashna
@dunk2k @waffle87
[Keyboard] Add linworks favepada (qmk#20794)
11970b1 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Duncan Sutherland <[email protected]>
Co-authored-by: jack <[email protected]>
BlueTufa and others added 23 commits August 21, 2023 21:28
@BlueTufa
ketch IJ debugging and other fixes
a8863d5
@BlueTufa
Ketch cleanup
ae5ee21
@BlueTufa
PI60 cleanup
d2caf3e
@BlueTufa
latest and greatest changes after resetting master branch
db311a0
@dwhite-cleerly @BlueTufa
Old keymap
8641b9d
@dwhite-cleerly @BlueTufa
latest
a4810a4
@BlueTufa
DZ-60 split rshift with arrows
fff8203
@BlueTufa
typo
465efc6
@BlueTufa
missing after rebase
c3651d3
@BlueTufa
Build GMMK Pro w/ encoder
3f2af90
@BlueTufa
update
40b5847
@dwhite-cleerly @BlueTufa
latest
4310c87
@BlueTufa
Badger BM43a
7faa997
@BlueTufa
Badger flashed Preonic
38ef9b7
@BlueTufa
Badger Preonic
56cb70c
@BlueTufa
latest greatest hits including Keychron Q2
3d85180
@BlueTufa
Ketch layout
8244d43
@BlueTufa
DEV: PyCharm updates to pi60
28d8d0e
@BlueTufa
Planck updates
d704933
@BlueTufa
IJ Debug command
b0528f5
@BlueTufa
PI60 cleanup
6281dcf
@BlueTufa
cleanup
40a3201
@BlueTufa
Dev/upstream (#33)
b09efb8 
* 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
@github-actions github-actions bot added documentation Improvements or additions to documentation keymap keyboard via labels Aug 22, 2023
@BlueTufa BlueTufa merged commit 9d5c477 into master Aug 22, 2023
1 of 2 checks passed
@BlueTufa BlueTufa deleted the upgrade-master branch August 22, 2023 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
documentation Improvements or additions to documentation keyboard keymap via
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.