Update Miryoku #13307

manna-harbour · 2021-06-23T07:09:43Z

Types of Changes

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

manna-harbour · 2021-07-02T04:31:16Z

This is ready to merge at any time. Please let me know if you need anything to make it easier to review. Thanks!

drashna

Could you add a GPL2+ compliant copyright header to the c and h files?

For instance:

qmk_firmware/quantum/template/base/keyboard.c

Lines 1 to 15 in 28ff511

 /* Copyright %YEAR% %YOUR_NAME% 

  * 

  * This program is free software: you can redistribute it and/or modify 

  * it under the terms of the GNU General Public License as published by 

  * the Free Software Foundation, either version 2 of the License, or 

  * (at your option) any later version. 

  * 

  * This program is distributed in the hope that it will be useful, 

  * but WITHOUT ANY WARRANTY; without even the implied warranty of 

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 

  * GNU General Public License for more details. 

  * 

  * You should have received a copy of the GNU General Public License 

  * along with this program. If not, see <https://www.gnu.org/licenses/>. 

  */

Fix reddit link Duplicate open parenthesis next to close parenthesis on NSSL Add customisation instructions Add lily58 Add gergo Co-authored-by: Jonathan Dayton <[email protected]> Clean up LAYOUT macro formatting Add alternative vi-style navigation layout Add kyria Add minidox Change order of keyboards Add iris Expand TOC Re-order userspace subheadings Add atreus Add customisation section Add split_3x5_3 and split_3x6_3 layouts Add for_science Fix wrong paths in keyboard config.h and keymap.c headings Fix keyboard ordering Fix blank lines around headings Add compatibility with new org-mode version. Remove keyboards/crkbd now covered by layouts/split_3x6_3 Add Halmak Alphabetise alternative alpha arrangements Move build options out of base layer alphas headings Add list of keyboards supporting split_3x5_3 layout Enable Auto Shift and Retro Shift Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping) Change kyria thumb key mapping Add planck_mit layout Remove alternative bottom row support from ortho_4x12 Remove minidox - Covered by split_3x5_3 layout Add moonlander Remove KC_ macros Add 60_ansi layout Add ortho_5x15 layout Closes #5 Co-authored-by: Rob <[email protected]> Fix typo (#7) Author: sonnius <[email protected]> Add redox_w (#8) Author: Brian Romanko <[email protected]> Co-authored-by: Manna Harbour <[email protected]> Add AUTO_SHIFT_NO_SETUP to reduce firmware size Update image paths Add instructions to checkout development branch Add kyria extended thumbs option, change default, add KLE Change clipboard keys - Change order to be mirror of windows bindings - Change default to use CUA bindings for Cut, Copy, and Paste, and Fun Cluster bindings for Undo and Redo - Add alternative bindings - Fun Cluster (original miryoku bindings) - Mac - Windows - Change prefix for local macros from X_ to U_ Disable Retro Shift, enable Auto Shift for non-alphas Revert "Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping)" Add Experimental Features section Update miryoku image link Update cover image link Add dactyl_manuform/4x5 Add cutomisation examples Add https to remote example Fix dactyl_manuform/4x5 subset mapping Add extended thumbs to ortho_4x12 Update Colemak Mod-DH naming Closes manna-harbour/qmk_firmware#13 Add dactyl_manuform/5x6 Resolves manna-harbour/qmk_firmware#14 Co-authored-by: Sebastian Morales <[email protected]> Add note on FORCE_LAYOUT - Needed to use EXTENDED_THUMBS on planck Add parent directories to keyboard headings and re-order Add keyboardio/atreus Resolves manna-harbour/qmk_firmware#15 Add torn Resolves #16 Author: Brian Romanko <[email protected]> Co-authored-by: Manna Harbour <[email protected]> Change map to zip - Adds support for python3, still compatible with python2. Resolves #10 Resolves #19 Co-authored-by: Ori <[email protected]> Add python-version Add sofle Add ergotravel Add ortho_5x12 Add ortho_4x10 Add :main no header argument to C code blocks resolves manna-harbour/qmk_firmware#11 resolves #12 Co-authored-by: RubioJr9 <[email protected]> Add flipped layers and inverted-T nav alternative layouts - Separate tap_table into alphas_table and thumbs_table - Add mode argument to table-layout-half - Remove layer_name - Rename layers - Add mods and clipboard to MBO and mirror - Add MIRYOKU_LAYERS=FLIP - Add MIRYOKU_NAV=INVERTEDT Add layer diagrams Update contact section Update links for Bilateral Combinations and Retro Shift Add description and no reverse angle option to 60_ansi layout Update list of keyboards supporting community layouts - and example build command lines Change moonlander thumb keys Update list of keyboards supporting split_3x5_3 Add license to tangled C source files

manna-harbour · 2021-07-03T10:57:12Z

I've added the header. It's the same text as in your example but with more compact formatting. Let me know if that's not acceptable and I'll change it to the usual formatting. Thanks!

drashna · 2021-07-03T15:11:03Z

I'm not 100% sure about the more compact licensing form, but I think it's okay.
But thanks!

drashna · 2021-07-03T16:08:46Z

Thanks!

manna-harbour · 2021-07-03T21:54:32Z

Thanks everyone!

…velop * 'develop' of https://github.com/qmk/qmk_firmware: (37 commits) [Keyboard] Add CX60 (qmk#13402) Specskeys Configurator Bugfix and Refactor (qmk#13439) [Keyboard] IDOBAO ID67 (qmk#13378) [Keyboard] ortho boards from the technik gb (qmk#13382) [Keyboard] Add soldered variant of Titan 65 keyboard. (qmk#13270) Pisces: correct layout macro reference in info.json (qmk#13410) [Keymap] Update Miryoku (qmk#13307) [Keyboard] Add wings42 keyboard (qmk#12734) [Keyboard] Added LAYOUT_60_iso_split_rshift to ok60 (qmk#12902) [Keymap] Jonavin merc additional encoder functionality (qmk#13039) [Bug] Pachi RGB - fix rgb placement (qmk#13428) AW20216 use register increment for framebuffer flushes (qmk#13430) Improve 'show_build_options' target (qmk#13425) [Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (qmk#13406) [Keymap] Jonavin quefrency keymap add encoder functionality + 2tap Shift CAPSLOCK (qmk#13376) [Docs] RGB Matrix Caps Lock and Layer indicator example (qmk#13367) [Keymap] Add stanrc85 community layout (qmk#13338) [Keymap] 2Moons-JP Keymap Update (qmk#13279) [Keyboard] Added pistachio rev2 (qmk#13248) [Keymap] niclake - Keymap updates - Boardwalk updates & DZ60 create (qmk#13245) ...

Fix reddit link Duplicate open parenthesis next to close parenthesis on NSSL Add customisation instructions Add lily58 Add gergo Co-authored-by: Jonathan Dayton <[email protected]> Clean up LAYOUT macro formatting Add alternative vi-style navigation layout Add kyria Add minidox Change order of keyboards Add iris Expand TOC Re-order userspace subheadings Add atreus Add customisation section Add split_3x5_3 and split_3x6_3 layouts Add for_science Fix wrong paths in keyboard config.h and keymap.c headings Fix keyboard ordering Fix blank lines around headings Add compatibility with new org-mode version. Remove keyboards/crkbd now covered by layouts/split_3x6_3 Add Halmak Alphabetise alternative alpha arrangements Move build options out of base layer alphas headings Add list of keyboards supporting split_3x5_3 layout Enable Auto Shift and Retro Shift Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping) Change kyria thumb key mapping Add planck_mit layout Remove alternative bottom row support from ortho_4x12 Remove minidox - Covered by split_3x5_3 layout Add moonlander Remove KC_ macros Add 60_ansi layout Add ortho_5x15 layout Closes manna-harbour#5 Co-authored-by: Rob <[email protected]> Fix typo (manna-harbour#7) Author: sonnius <[email protected]> Add redox_w (manna-harbour#8) Author: Brian Romanko <[email protected]> Co-authored-by: Manna Harbour <[email protected]> Add AUTO_SHIFT_NO_SETUP to reduce firmware size Update image paths Add instructions to checkout development branch Add kyria extended thumbs option, change default, add KLE Change clipboard keys - Change order to be mirror of windows bindings - Change default to use CUA bindings for Cut, Copy, and Paste, and Fun Cluster bindings for Undo and Redo - Add alternative bindings - Fun Cluster (original miryoku bindings) - Mac - Windows - Change prefix for local macros from X_ to U_ Disable Retro Shift, enable Auto Shift for non-alphas Revert "Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping)" Add Experimental Features section Update miryoku image link Update cover image link Add dactyl_manuform/4x5 Add cutomisation examples Add https to remote example Fix dactyl_manuform/4x5 subset mapping Add extended thumbs to ortho_4x12 Update Colemak Mod-DH naming Closes manna-harbour/qmk_firmware#13 Add dactyl_manuform/5x6 Resolves manna-harbour/qmk_firmware#14 Co-authored-by: Sebastian Morales <[email protected]> Add note on FORCE_LAYOUT - Needed to use EXTENDED_THUMBS on planck Add parent directories to keyboard headings and re-order Add keyboardio/atreus Resolves manna-harbour/qmk_firmware#15 Add torn Resolves manna-harbour#16 Author: Brian Romanko <[email protected]> Co-authored-by: Manna Harbour <[email protected]> Change map to zip - Adds support for python3, still compatible with python2. Resolves manna-harbour#10 Resolves manna-harbour#19 Co-authored-by: Ori <[email protected]> Add python-version Add sofle Add ergotravel Add ortho_5x12 Add ortho_4x10 Add :main no header argument to C code blocks resolves manna-harbour/qmk_firmware#11 resolves manna-harbour#12 Co-authored-by: RubioJr9 <[email protected]> Add flipped layers and inverted-T nav alternative layouts - Separate tap_table into alphas_table and thumbs_table - Add mode argument to table-layout-half - Remove layer_name - Rename layers - Add mods and clipboard to MBO and mirror - Add MIRYOKU_LAYERS=FLIP - Add MIRYOKU_NAV=INVERTEDT Add layer diagrams Update contact section Update links for Bilateral Combinations and Retro Shift Add description and no reverse angle option to 60_ansi layout Update list of keyboards supporting community layouts - and example build command lines Change moonlander thumb keys Update list of keyboards supporting split_3x5_3 Add license to tangled C source files

github-actions bot added the keymap label Jun 23, 2021

manna-harbour force-pushed the miryoku-pr branch from ab7b2d3 to 540b100 Compare June 24, 2021 06:21

drashna reviewed Jul 3, 2021

View reviewed changes

manna-harbour force-pushed the miryoku-pr branch from 540b100 to f57d8a2 Compare July 3, 2021 10:51

drashna approved these changes Jul 3, 2021

View reviewed changes

drashna requested a review from a team July 3, 2021 15:10

fauxpark approved these changes Jul 3, 2021

View reviewed changes

drashna merged commit 65f8da3 into qmk:master Jul 3, 2021

manna-harbour deleted the miryoku-pr branch October 11, 2021 10:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Miryoku #13307

Update Miryoku #13307

manna-harbour commented Jun 23, 2021

manna-harbour commented Jul 2, 2021

drashna left a comment

manna-harbour commented Jul 3, 2021 •

edited

Loading

drashna commented Jul 3, 2021

drashna commented Jul 3, 2021

manna-harbour commented Jul 3, 2021

	/* Copyright %YEAR% %YOUR_NAME%
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 2 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see <https://www.gnu.org/licenses/>.
	*/

Update Miryoku #13307

Update Miryoku #13307

Conversation

manna-harbour commented Jun 23, 2021

Types of Changes

Checklist

manna-harbour commented Jul 2, 2021

drashna left a comment

Choose a reason for hiding this comment

manna-harbour commented Jul 3, 2021 • edited Loading

drashna commented Jul 3, 2021

drashna commented Jul 3, 2021

manna-harbour commented Jul 3, 2021

manna-harbour commented Jul 3, 2021 •

edited

Loading