Refactor zinc to use split_common #7114

monksoffunk · 2019-10-22T13:29:18Z

This removes own split related codes and uses split_common files.

Description

This removes following files under the zinc/revx/:

matrix.c
serial_config.h
serial_config_simpleapi.h
split_scomm.h
split_scomm.c
split_util.c
split_util.h

Also, new RGB LED options added:

Backlight or/and underglow feature
Now can select from continuous RGB Animations between LR or separate RGB Animations (the same as before)

Types of Changes

Checklist

My code follows the code style of this project.
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).

zvecr · 2019-10-22T14:21:55Z

As mentioned in #7111 you have modified user keymaps, therefore i am adding the breaking change.

Also there are a few tidy up changes in #7111 that I would want applied to this PR, I will add them as a review shortly, though its a shame we now have 2 PRs the main thing is we are now targeting split_common.

monksoffunk · 2019-10-22T14:39:48Z

@zvecr I tried to review #7111, but too many things to add and I've already prepared this PR, so I choose open this. I'm sorry about that.
Anyway thanks.

monksoffunk · 2019-11-11T01:49:23Z

Why is keyboards/zinc/serial.c listed on conflicting files though it is deleted?

fauxpark · 2019-11-11T02:32:37Z

@monksoffunk that's due to this commit. The contents of the deleted serial.c are not the same as the one in master.

You should be able to git merge master from this branch, then git mergetool to "keep" the deleted file, and finally git merge --continue to commit.

monksoffunk · 2019-11-11T02:47:37Z

@fauxpark Thanks. but I don't have write access to do.
@zvecr What about your review?

Duckle29 · 2019-11-11T10:36:14Z

@monksoffunk You would perform those merges on your own branch.

First of all make sure your master branch is up to date with upstream, then do what fauxpark suggested on your zinc_splitcommon_2019OCT branch :)

keyboards/zinc/readme.md

keyboards/zinc/rules.mk

# Conflicts: # keyboards/zinc/serial.c

Co-Authored-By: fauxpark <[email protected]>

monksoffunk · 2020-03-17T01:45:01Z

@zvecr @drashna
I believe I've done what is expected.
The authors of keymaps have confirmed this PR.
Is there anything else I should do?

monksoffunk · 2020-04-06T02:24:00Z

@zvecr @Duckle29
Re-review please!

noroadsleft

I've changed the target branch to future with the intention of running this through our Breaking Changes process. If you can get a changelog entry written per the Docs by this Saturday, we can get this in on the next cycle and it will land in qmk:master toward the end of May as it stands right now.

Code changes look good to me.

monksoffunk · 2020-04-28T10:06:45Z

@noroadsleft
Thanks for your help!
I want to make sure the location of ChangeLog file that I need to create.
You mean (qmk_firmware/keyboards/zinc/docs/ChangeLog/20200530/PR7114.md)?

Resolve Conflicts: # keyboards/zinc/config.h

noroadsleft · 2020-04-29T06:31:23Z

I want to make sure the location of ChangeLog file that I need to create.
You mean (qmk_firmware/keyboards/zinc/docs/ChangeLog/20200530/PR7114.md)?

ChangeLog should be at qmk_firmware/docs/ChangeLog/20200530/PR7114.md.

noroadsleft · 2020-05-04T00:08:13Z

@monksoffunk I may want to flesh out the changelog entry some more; probably in #8978. Would appreciate your input there should I mention you on that PR.

Code-wise I'm calling this good.

Thanks!

* Add Zinc keyboard * Fix RGB LED init of monks/keymap.c * Add RGBLED_BOTH_ENABLE option * Fix RGBLED_BOTH_ENABLE option * Add LED_BOTH_ENABLE feature to 2 keymaps * Use split_common instead of own split flies * Fix split LED * Fix RGB LED config for iOS device * Add RGB_MOD reverse key to default keymap * Update readme_jp.md of default keymap * Add readme_en.md of default keymap * Merge branch 'master' into zinc_splitcommon # Conflicts: # keyboards/zinc/serial.c * Update keyboards/zinc/readme.md * Update keyboards/zinc/readme.md * Update keyboards/zinc/readme.md * Update keyboards/zinc/rules.mk * Update keyboards/zinc/rules.mk * Update toshi0383 keymap * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Remove build option firmware size impacts (as #6947) * Remove some dead code and whitespace * Remove unused code * Remove unused code * Update keyboards/zinc/rev1/config.h * Update keyboards/zinc/reva/config.h * Update keyboards/zinc/keymaps/default/rules.mk * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/readme_en.md * Update keyboards/zinc/keymaps/default/readme_en.md * Breaking Changes Changelog

* Add Zinc keyboard * Fix RGB LED init of monks/keymap.c * Add RGBLED_BOTH_ENABLE option * Fix RGBLED_BOTH_ENABLE option * Add LED_BOTH_ENABLE feature to 2 keymaps * Use split_common instead of own split flies * Fix split LED * Fix RGB LED config for iOS device * Add RGB_MOD reverse key to default keymap * Update readme_jp.md of default keymap * Add readme_en.md of default keymap * Merge branch 'master' into zinc_splitcommon # Conflicts: # keyboards/zinc/serial.c * Update keyboards/zinc/readme.md * Update keyboards/zinc/readme.md * Update keyboards/zinc/readme.md * Update keyboards/zinc/rules.mk * Update keyboards/zinc/rules.mk * Update toshi0383 keymap * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Update keyboards/zinc/keymaps/toshi0383/rules.mk * Remove build option firmware size impacts (as qmk#6947) * Remove some dead code and whitespace * Remove unused code * Remove unused code * Update keyboards/zinc/rev1/config.h * Update keyboards/zinc/reva/config.h * Update keyboards/zinc/keymaps/default/rules.mk * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/keymap.c * Update keyboards/zinc/keymaps/default/readme_en.md * Update keyboards/zinc/keymaps/default/readme_en.md * Breaking Changes Changelog

* Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968) * Convert V-USB usbdrv to a submodule (#8321) * Unify Tap Hold functions and documentation (#8348) * Changing board names to prevent confusion (#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (#8499) * Move spaceman keyboards (#8830) * Migrate miscellaneous `fn_actions` entries (#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (#8537) * Refactor Lily58 to use split_common (#6260) * Refactor zinc to use split_common (#7114) * Add a message if bin/qmk doesn't work (#9000) * Fix conflicting types for 'tfp_printf' (#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480) * Refactor and updates to TKC1800 code (#8472) * Switch to qmk forks for everything (#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484) * Audio enable corrections (2/3) (#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582) * Audio enable corrections (Part 4) (#8974) * Fix typo from PR7114 (#9171) * Augment future branch Changelogs (#8978) * Revert "Branch point for 2020 May 30 Breaking Change"

* Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968) * Convert V-USB usbdrv to a submodule (qmk#8321) * Unify Tap Hold functions and documentation (qmk#8348) * Changing board names to prevent confusion (qmk#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499) * Move spaceman keyboards (qmk#8830) * Migrate miscellaneous `fn_actions` entries (qmk#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537) * Refactor Lily58 to use split_common (qmk#6260) * Refactor zinc to use split_common (qmk#7114) * Add a message if bin/qmk doesn't work (qmk#9000) * Fix conflicting types for 'tfp_printf' (qmk#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480) * Refactor and updates to TKC1800 code (qmk#8472) * Switch to qmk forks for everything (qmk#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484) * Audio enable corrections (2/3) (qmk#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582) * Audio enable corrections (Part 4) (qmk#8974) * Fix typo from PR7114 (qmk#9171) * Augment future branch Changelogs (qmk#8978) * Revert "Branch point for 2020 May 30 Breaking Change"

monksoffunk added 11 commits October 22, 2019 16:32

Add Zinc keyboard

6a25112

Fix RGB LED init of monks/keymap.c

5c47980

Add RGBLED_BOTH_ENABLE option

e0cb787

Fix RGBLED_BOTH_ENABLE option

954d4d0

Add LED_BOTH_ENABLE feature to 2 keymaps

72c76f0

Use split_common instead of own split flies

38b0ba5

Fix split LED

23263c8

Fix RGB LED config for iOS device

6e574e0

Add RGB_MOD reverse key to default keymap

d6fb248

Update readme_jp.md of default keymap

acff2b6

Add readme_en.md of default keymap

a11a241

monksoffunk mentioned this pull request Oct 22, 2019

Convert zinc to use split_common #7111

Closed

14 tasks

zvecr added the breaking_change Changes that need to wait for a version increment label Oct 22, 2019

zvecr requested a review from a team October 22, 2019 14:22

zvecr added the keyboard label Oct 22, 2019

drashna approved these changes Oct 22, 2019

View reviewed changes

Merge branch 'master' into zinc_splitcommon

307b74d

fauxpark requested changes Nov 11, 2019

View reviewed changes

monksoffunk and others added 6 commits November 11, 2019 21:18

Merge branch 'master' into zinc_splitcommon

31646b0

# Conflicts: # keyboards/zinc/serial.c

Update keyboards/zinc/readme.md

f8c8300

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/zinc/readme.md

e81e9e2

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/zinc/readme.md

e014349

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/zinc/rules.mk

d404168

Co-Authored-By: fauxpark <[email protected]>

Update keyboards/zinc/rules.mk

8656180

Co-Authored-By: fauxpark <[email protected]>

monksoffunk requested a review from Duckle29 March 23, 2020 00:12

noroadsleft changed the base branch from master to future April 28, 2020 00:54

noroadsleft approved these changes Apr 28, 2020

View reviewed changes

noroadsleft added the future_2020q2 label Apr 28, 2020

Merge branch 'master' into zinc_splitcommon_2019OCT

44330b4

Resolve Conflicts: # keyboards/zinc/config.h

Breaking Changes Changelog

51ff769

noroadsleft force-pushed the future branch from 4445fc5 to 43fa4c2 Compare April 29, 2020 17:02

noroadsleft merged commit e927820 into qmk:future May 4, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor zinc to use split_common #7114

Refactor zinc to use split_common #7114

monksoffunk commented Oct 22, 2019

zvecr commented Oct 22, 2019

monksoffunk commented Oct 22, 2019

monksoffunk commented Nov 11, 2019

fauxpark commented Nov 11, 2019

monksoffunk commented Nov 11, 2019 •

edited

Loading

Duckle29 commented Nov 11, 2019

monksoffunk commented Mar 17, 2020

monksoffunk commented Apr 6, 2020

noroadsleft left a comment

monksoffunk commented Apr 28, 2020 •

edited

Loading

noroadsleft commented Apr 29, 2020

noroadsleft commented May 4, 2020

Refactor zinc to use split_common #7114

Refactor zinc to use split_common #7114

Conversation

monksoffunk commented Oct 22, 2019

Description

Types of Changes

Checklist

zvecr commented Oct 22, 2019

monksoffunk commented Oct 22, 2019

monksoffunk commented Nov 11, 2019

fauxpark commented Nov 11, 2019

monksoffunk commented Nov 11, 2019 • edited Loading

Duckle29 commented Nov 11, 2019

monksoffunk commented Mar 17, 2020

monksoffunk commented Apr 6, 2020

noroadsleft left a comment

Choose a reason for hiding this comment

monksoffunk commented Apr 28, 2020 • edited Loading

noroadsleft commented Apr 29, 2020

noroadsleft commented May 4, 2020

monksoffunk commented Nov 11, 2019 •

edited

Loading

monksoffunk commented Apr 28, 2020 •

edited

Loading