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

Merge upstream #14

Merged
merged 3,869 commits into from
Mar 23, 2021
Merged

Merge upstream #14

merged 3,869 commits into from
Mar 23, 2021

Conversation

ids1024
Copy link
Member

@ids1024 ids1024 commented Mar 22, 2021

It's good to not be too far behind upstream, and probably good to update before releasing Launch. Luckily it doesn't seem to be too hard. This seems to be working fine, including with the Configurator.

This seems to save up some space, going from:

* The firmware size is fine - 25982/28672 (90%, 2690 bytes free)

to:

* The firmware size is fine - 24898/28672 (86%, 3774 bytes free)

I had been wondering if an upstream update would likely increase the ROM size, but I guess upstream is similarly concerned about space on microcontroller ROMs, naturally. The changelogs mention removing an obsolete feature or two to save space, as well as "optimizations".

Changelogs mention work on supporting info.jsonfiles as a (partial?) alternative to config.h/rules.mk. Not sure that would really be an improvement... Also of note, there are fixes for compiling with GCC 10, which we have already noticed is an issue.

What particularly stood out is the addition of a hook than can be used to limit the brightness to avoid drawing too much current, perhaps it could be useful to take advantage of that: qmk#10638

drashna and others added 30 commits February 18, 2021 23:43
@drashna
[Keyboard] Phase Studio's Titan 65 (qmk#11920)
cd8c71a
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
84ee7e4
@nuno99costa @drashna
@zvecr @fauxpark
[Keyboard] Quadrant by Ealdin (qmk#11747)
307c974 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
64e162a
@foostan @drashna
@zvecr @fauxpark
[Keyboard] Add new keyboard Cornelius (qmk#11719)
e3f0157 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
7852f4f
@CMMS-Freather @fauxpark
@zvecr @spidey3
[Keyboard] change to saka68 solder firmware config. add sam's s80 fir…
bb11e72 
…mware (qmk#11834)

Co-authored-by: Ryan <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Joshua Diamond <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
6136cd3
@filterpaper
[Keyboard] Add swap-hands array for CRKBD (Corne) (qmk#11915)
63f8620 
Co-authored-by: filterpaper <filterpaper@localhost>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
7713f8f
@noroadsleft
[Keyboard] Xealous Brown handwired Refactor (qmk#11929)
fdff753
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
161cea7
enable rgb underglow for VIA-firmware (qmk#11746)
fd6f7b5
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
8c317c4
@fraanrosi
[Keymap] Adding fraanrosi keymap. (changes applied) (qmk#11862)
1ff1892 
* Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

* Se añade Keymap.

* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

* Update keymap.md

* Rename keymap.md to readme.md

* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

* Update readme.md

* Update readme.md

* Update readme.md

* adding helix-keyboard.png

* Update readme.md

* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

* Cambios en el Keymap para mayor comodidad del uso del mouse.

* Update readme.md

* Update readme.md

* -Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

* Update readme.md

* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

* Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

* Update Readme.mp

* Revert "Update Readme.mp"

This reverts commit eb9a271.

* Update readme.md

* Clean up, organization, indent fixes

* Update readme.md

* Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

* Se añade Keymap.

* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

* Update keymap.md

* Rename keymap.md to readme.md

* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

* Update readme.md

* Update readme.md

* Update readme.md

* adding helix-keyboard.png

* Update readme.md

* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

* Cambios en el Keymap para mayor comodidad del uso del mouse.

* Update readme.md

* Update readme.md

* -Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

* Update readme.md

* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

* Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

* Update Readme.mp

* Revert "Update Readme.mp"

This reverts commit eb9a271.

* Update readme.md

* Update readme.md

* Clean up, organization, indent fixes

* Update readme.md

Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

Se añade Keymap.

Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

Update keymap.md

Rename keymap.md to readme.md

Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

-Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

Update readme.md

Update readme.md

Update readme.md

adding helix-keyboard.png

Update readme.md

-Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

Cambios en el Keymap para mayor comodidad del uso del mouse.

Update readme.md

Update readme.md

-Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

Update readme.md

Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

Update Readme.mp

Revert "Update Readme.mp"

This reverts commit eb9a271.

Update readme.md

Clean up, organization, indent fixes

Update readme.md

* Changes and corrections were made to Pull Request.

* Since the last change, readme.md and comment in keymap.c were to be updated.
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
fa44492
@Antebios
Adding new handwired ortho 5x14 keyboard (qmk#11597)
73e2bf5 
Co-authored-by: Richard Nunez <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
9f6ac28
@noroadsleft
Iron180: layout macro and Configurator rework (qmk#11948)
6a83791
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
4794f6a
@fauxpark
Output selection: Remove "USB and BT" option (qmk#11940)
7ab9f6a
@semicolonsnet @drashna
adding personal keymaps (qmk#11952)
a0a67d4 
* adding personal keymaps

* Update keyboards/xd60/keymaps/semicolonsnet/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* added license

* added license

Co-authored-by: Drashna Jaelre <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
a6a93bc
@stanrc85
assign each key an LED for reactive modes (qmk#11949)
9853e35
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
6b1c3e6
@melonbred
Update ortho.h (qmk#11945)
c588cb4
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
720597d
@yynmt
Add via support to Dozen0 (qmk#11932)
07100d5 
* Change VID and PID

* Add via kyemap

* Update keymap.c

* Update keymap.c

Co-authored-by: yynmt <[email protected]>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
23c6d7a
@veikman
[Keyboard] Concertina (qmk#11922)
5655d6e 
* [Keyboard] Concertina

* Added a novel handwired keyboard.

* Concertina lint

* Perfunctory changes to pass CI.

* Concertina line width

* Changes from code review: GPL headers, modernization, full-width
  representation of matrix to match info.json.
devriesp and others added 22 commits March 16, 2021 23:22
@devriesp
[Keyboard] add via keymap to afternoonlabs breeze keyboard (qmk#12247)
90f95de
@matthewdias
[Keyboard] Add barleycorn smd keyboard (qmk#12200)
163e9b0
@Salicylic-acid3
[Keyboard] Modification of ErgoArrows info.json (qmk#11980)
2376533 
The order of key descriptions in ErgoArrows info.json was wrong, so it has been corrected.
@lyso1 @drashna
[Keyboard] add oled and encoder function to lck75 (qmk#11825)
5381943 
Co-authored-by: Drashna Jaelre <[email protected]>
@tszaboo @zvecr
@drashna @fauxpark
[Keyboard] Add support for ortho4exent (qmk#11699)
8a2d3a8 
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@rverst
[Keymap] Add userspace rverst (qmk#12205)
3bc7f46 
Co-authored-by: Robert Verst <[email protected]>
@jumper149
[Keymap] jumper149 keymap for the dztech/dz65rgb (qmk#12142)
6e79767
@klausweiss @drashna @fauxpark
[Keyboard] Add handwired/bolek keyboard (qmk#12234)
f490777 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@GloriousThrall @drashna
Adding Keyboard: GMMK Pro (qmk#12030)
cc84831 
* GMMK Pro QMK Firmware Code

* info.json added

* updated info.json for the unused keys

* redoing info.json

* readme for pro

* gmmk initial readme

* pipeline fix, issue with compiling gmmk.h

* gmmk pro code formatting changes

* removed rules.mk

* noci file

* Updates

* updated matrix function to match keymap

* updating the keymap layout, renaming matrix, updating layout name to LAYOUT

* fauxpark changes added

* PID VID updates

* removed chconfig and made rules.mk comments cleaner

Co-authored-by: Drashna Jael're <[email protected]>
@fauxpark
XT converter cleanup (qmk#12264)
9331c22
@github-actions @qmk-bot
[CI] Format code according to conventions (qmk#12277)
9807225 
Co-authored-by: QMK Bot <[email protected]>
@noroadsleft
Aleblazer Zodiark touch-up (qmk#12279)
ed44636
@str-dst @fauxpark @drashna
Fixed keymap names of Noah AVR (qmk#12265)
c833b77 
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
@Xelus22 @fauxpark
[Keyboard] Add Pachi (qmk#12132)
a5576f9 
Co-authored-by: Ryan <[email protected]>
@fauxpark
qmk doctor: Don't run udev checks under WSL (qmk#12231)
69eca63
@noroadsleft
Sirius UniGo66 touch-up (qmk#12280)
8dfe37a 
* un-nest layout macros

* use #pragma once include guard in unigo66.h

* unify rules.mk to QMK AVR template

- remove Bootloader selection comment block
- unify Build Option header comment
- align Build Option rules and inline comments

* remove unused LAYOUT_all macro

* update readme.md to match QMK template
@noclew
[Keyboard] Vanana, Vaguette Lite, and Waaffle (qmk#11441)
0ab88f5 
* added Vanana / Vaguette Lite / Waaffle

* changed extra GPIO allocations of Waaffle and Vanana

* Apply suggestions from code review

changed layout name of vaguette Lite / requested by drashna

* Apply suggestions from code review

Requested keymap changes have been made.

* all changes requested by collaborators are made

* RGB config updated / keymap updated

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* Apply suggestions from code review

request changes are made

* pre rename h

* vaguettelite reanmed to lowercases

* fixed vanana keymap

* Apply suggestions from code review

* changed Bootmagic key of VaguetteLite as suggested

* Updated via keymap of Vaguette Lite as suggested

* add vaguette lite 6.25 layout

* added vaguette lite noclew keymap

* updated vaguette lite 6.25u keymap description

* updated vanana default keymap

* updated keymap spacing

* reabased from the official repo

* Update keymap.c

fixed vaguette lite keymap

* Apply suggestions from code review

All the requested changes by a collaborator were made.

* updated info.json of Vanana and readme files of Vanana and waffle

* rename LAYOUT_waaffle to LAYOUT_ortho_5x16

Also adjusts the info.json data to put a visual gap between the extension and main PCBs.

* make rules.mk and info.json specific to rev3

Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository.

* add controller board build targets

Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each.

Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build.
@noroadsleft
Boston: correct LAYOUT macro data (qmk#12282)
217e3a5 
- correct macro reference
- add missing encoder position
- correct maintainer value to reference keyboard maintainer's GitHub account
- remove trailing whitespace
@str-dst @fauxpark @noroadsleft
Fix Kira80 license headers (qmk#12303)
c5b0366 
Co-authored-by: Ryan <[email protected]>
Co-authored-by: James Young <[email protected]>
@ids1024
Revert "Configuration values for starting HSV and speed (qmk#7740)"
b0ed135 
This reverts commit de1f60f.
@ids1024
Merge remote-tracking branch 'upstream/master' into merge-upstream
cdd46d2
@ids1024
Update launch_1 rules.mk for changes in Qmk
bd93a48
@ids1024 ids1024 requested a review from jackpot51 March 22, 2021 19:36
@ids1024 ids1024 merged commit c399cbf into master Mar 23, 2021
@ids1024 ids1024 deleted the merge-upstream branch March 23, 2021 02:32
@reesericci
Copy link

@ids1024 it would be better if this repo was merged upstream into qmk so that it would be natively available inside of the qmk configurator, etc.

ids1024 added a commit to pop-os/keyboard-configurator that referenced this pull request Mar 21, 2023
@ids1024
Fixes / improvements for mapping in layouts.py
2c05ff9 
* Handle firmware version `0.12.20`, as used in
system76/qmk_firmware#14 (which I think was
released?)
* Don't mutate header files.
* Map names to match what previous version used
  - Need to make sure everything, including `RESET`/`BOOT`, is working
    as expected, with both versions.
* Add `\n` to end of generated json files.
* Fix behavior without `--override`.

This still avoids updating the default keymaps for builtin keyboards
pending #140.
13r0ck pushed a commit to pop-os/keyboard-configurator that referenced this pull request Mar 23, 2023
@ids1024 @13r0ck
Fixes / improvements for mapping in layouts.py
36d08a3 
* Handle firmware version `0.12.20`, as used in
system76/qmk_firmware#14 (which I think was
released?)
* Don't mutate header files.
* Map names to match what previous version used
  - Need to make sure everything, including `RESET`/`BOOT`, is working
    as expected, with both versions.
* Add `\n` to end of generated json files.
* Fix behavior without `--override`.

This still avoids updating the default keymaps for builtin keyboards
pending #140.
13r0ck pushed a commit to pop-os/keyboard-configurator that referenced this pull request Mar 23, 2023
@ids1024 @13r0ck
Fixes / improvements for mapping in layouts.py
6536c5b 
* Handle firmware version `0.12.20`, as used in
system76/qmk_firmware#14 (which I think was
released?)
* Don't mutate header files.
* Map names to match what previous version used
  - Need to make sure everything, including `RESET`/`BOOT`, is working
    as expected, with both versions.
* Add `\n` to end of generated json files.
* Fix behavior without `--override`.

This still avoids updating the default keymaps for builtin keyboards
pending #140.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackpot51 jackpot51 jackpot51 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.