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

Merge Master into IvaanDev branch #2

Merged
merged 4,298 commits into from
Jan 15, 2023
Merged

Merge Master into IvaanDev branch #2

merged 4,298 commits into from
Jan 15, 2023

Conversation

Ivaan
Copy link
Owner

@Ivaan Ivaan commented Jan 15, 2023

Merge Master into IvaanDev branch

shieldsd and others added 30 commits November 20, 2022 00:27
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <[email protected]>
Co-authored-by: Alex Baldwin <[email protected]>
#18929)

* add split space and ISO

* Update wkl.h

* update ISO

* update

* change KC_LGUI to KC_RGUI

* delete RGUI

* format

* update promise87 readme.md

* update promise87 wkl readme.md

* Update readme.md

* Update readme.md

* change KC_SLCK to KC_SCRL

* wuque/promise87/ansi: standardize Layout Macro names

- rename `LAYOUT_tkl_f13_ansi` to `LAYOUT_tkl_f13_ansi_tsangan`
- convert `LAYOUT_tkl_f13_ansi_iso` to `LAYOUT_tkl_f13_iso_tsangan` (adds position `K41`)
- rename `LAYOUT_tkl_f13_ansi_split_space` to `LAYOUT_tkl_f13_ansi_tsangan_split_space`
- rename `LAYOUT_tkl_f13_ansi_split_bs` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs`
- rename `LAYOUT_tkl_f13_ansi_split_lshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_lshift`
- rename `LAYOUT_tkl_f13_ansi_split_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_rshift`
- rename `LAYOUT_tkl_f13_ansi_split_bs_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift`

* wuque/promise87/wkl: refactor LAYOUT_tkl_f13_ansi_wkl_iso

Refactors `LAYOUT_tkl_f13_ansi_wkl_iso` into `LAYOUT_tkl_f13_iso_wkl` by adding position `K41` (Non-US Backslash) to the layout macro.

Co-authored-by: James Young <[email protected]>
* Rename `eeprom_stm32` to `eeprom_legacy_emulated_flash`.

* Rename `flash_stm32` to `legacy_flash_ops`.

* Rename `eeprom_teensy` to `eeprom_kinetis_flexram`.
* Publish metadata

* Ensure content is sorted
* Additional dd backlight config

* Update docs
zvecr and others added 29 commits January 7, 2023 17:02
Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Abhishek Malavalli <[email protected]>
* keychron/v1/ansi: correct layout data

* keychron/v1/ansi_encoder: correct layout data
* keychron/v3/ansi_encoder: correct layout data

* keychron/v3/iso_encoder: correct layout data
* quarkeys/z60/hotswap: rename LAYOUT to LAYOUT_60_ansi_tsangan_split_rshift

* quarkeys/z60/solder: add matrix diagram

* quarkeys/z60/solder: rename LAYOUT to LAYOUT_all

* quarkeys/z60/solder: add LAYOUT_60_ansi

* quarkeys/z60/solder: add LAYOUT_60_ansi_split_bs_rshift

* quarkeys/z60/solder: add LAYOUT_60_iso

* quarkeys/z60/solder: add LAYOUT_60_iso_split_bs_rshift

* quarkeys/z60/solder: add LAYOUT_60_ansi_tsangan

* quarkeys/z60/solder: add LAYOUT_60_tsangan_hhkb

* quarkeys/z60/solder: add LAYOUT_60_iso_tsangan

* quarkeys/z60/solder: enable Community Layout support
@Ivaan Ivaan merged commit 8d17c20 into Ivaan:IvaanDev Jan 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.