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

Add sriwedari70 and move kamigakushi to new folder #20334

Merged
merged 21 commits into from
May 20, 2023
Merged

Add sriwedari70 and move kamigakushi to new folder #20334

merged 21 commits into from
May 20, 2023

Conversation

alabahuy
Copy link
Contributor

@alabahuy alabahuy commented Apr 4, 2023 •
edited
Loading

Description

add new board sriwedari70 dan move kamigakushi to new folder

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

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Apr 4, 2023
waffle87
waffle87 requested changes Apr 4, 2023
View reviewed changes
Copy link
Member

@waffle87 waffle87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also update data/mappings/keyboard_aliases.hjson accordingly.

keyboards/jaykeeb/sriwedari70/config.h Outdated Show resolved Hide resolved
@waffle87 waffle87 changed the base branch from master to develop April 4, 2023 03:13
@alabahuy alabahuy changed the base branch from develop to master April 4, 2023 03:35
@alabahuy alabahuy changed the base branch from master to develop April 4, 2023 03:36
@alabahuy alabahuy requested a review from waffle87 April 9, 2023 13:58
@alabahuy
Copy link
Contributor Author

any update @waffle87 ?

@alabahuy
Copy link
Contributor Author

alabahuy commented Apr 26, 2023 •
edited
Loading

do I have to close this PR and create a separate new PR? @waffle87

@waffle87
Copy link
Member

No, that will only lengthen the process. The primary thing stopping this from being merged is the conflicts. Maybe this doc will help.

@rizalfr
Copy link
Contributor

rizalfr commented May 5, 2023

conflict has been fixed ya @waffle87

@waffle87 waffle87 requested a review from a team May 6, 2023 20:13
fauxpark
fauxpark requested changes May 6, 2023
View reviewed changes
keyboards/jaykeeb/kamigakushi/info.json Outdated Show resolved Hide resolved
keyboards/jaykeeb/kamigakushi/info.json Outdated Show resolved Hide resolved
keyboards/jaykeeb/kamigakushi/rules.mk Outdated Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/info.json Outdated Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/info.json Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/rules.mk Outdated Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/info.json Outdated Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/info.json Outdated Show resolved Hide resolved
keyboards/jaykeeb/sriwedari70/info.json Outdated Show resolved Hide resolved
rezaadio and others added 3 commits May 8, 2023 09:02
@rezaadio @fauxpark
Update keyboards/jaykeeb/kamigakushi/info.json
36a1536 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/kamigakushi/info.json
30602c4 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/kamigakushi/rules.mk
a85d980 
Co-authored-by: Ryan <fauxpark@gmail.com>
rezaadio and others added 6 commits May 8, 2023 09:03
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/info.json
44561c1 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/info.json
3c1ee2a 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/rules.mk
fcbb187 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/info.json
1b4ee17 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/info.json
ca03771 
Co-authored-by: Ryan <fauxpark@gmail.com>
@rezaadio @fauxpark
Update keyboards/jaykeeb/sriwedari70/info.json
494ecda 
Co-authored-by: Ryan <fauxpark@gmail.com>
@alabahuy
Copy link
Contributor Author

alabahuy commented May 9, 2023

Thanks @waffle87 @fauxpark

@alabahuy
Copy link
Contributor Author

any update for merged? @waffle87 @fauxpark

tzarc
tzarc approved these changes May 20, 2023
View reviewed changes
Copy link
Member

@tzarc tzarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Next time this needs to be two PRs -- as per the PR Checklist each PR should be the smallest set of changes.

One PR would be the move, one PR would be the new keyboard.

Please don't repeat this next time.

@tzarc tzarc merged commit 0d844a5 into qmk:develop May 20, 2023
@alabahuy alabahuy deleted the Jay branch May 20, 2023 13:00
@alabahuy alabahuy mentioned this pull request May 20, 2023
Merged
7 tasks
sigprof added a commit to sigprof/qmk_firmware that referenced this pull request May 20, 2023
@sigprof
rart/rart80:via: restore rules.mk after qmk#20334
5b2c89e 
PR qmk#20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
@sigprof sigprof mentioned this pull request May 20, 2023
Merged
14 tasks
zvecr pushed a commit that referenced this pull request May 20, 2023
@sigprof
rart/rart80:via: restore rules.mk after #20334 (#21002)
6a7ba7a 
PR #20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
@alabahuy alabahuy mentioned this pull request May 24, 2023
Merged
7 tasks
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request May 29, 2023
@freznel10
Squashed commit of the following:
6295d3f 
commit 0ffa4ef
Merge: 11bba43 42c6920
Author: QMK Bot <hello@qmk.fm>
Date:   Sun May 28 22:27:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 42c6920
Author: Joel Challis <git@zvecr.com>
Date:   Sun May 28 23:27:13 2023 +0100

    Update auto_tag.yml (qmk#21050)

commit 11bba43
Merge: f2808dc d02ff2e
Author: QMK Bot <hello@qmk.fm>
Date:   Sun May 28 20:37:30 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit d02ff2e
Author: Joel Challis <git@zvecr.com>
Date:   Sun May 28 21:36:46 2023 +0100

    Update "Most Recent ChangeLog" (qmk#21071)

commit f2808dc
Author: Nick Brassel <nick@tzarc.org>
Date:   Mon May 29 06:19:41 2023 +1000

    Branch point for 2023q3 Breaking Change.

commit 5024370
Merge: 16767e4 8b1d86e
Author: Nick Brassel <nick@tzarc.org>
Date:   Mon May 29 06:17:24 2023 +1000

    Merge branch 'develop'

commit 8b1d86e
Author: Nick Brassel <nick@tzarc.org>
Date:   Mon May 29 06:16:06 2023 +1000

    Remove `develop` note in readme.

commit 32d8655
Author: Nick Brassel <nick@tzarc.org>
Date:   Mon May 29 06:02:11 2023 +1000

    `develop` 2023q2 changelog (qmk#21049)

    Co-authored-by: Ryan <fauxpark@gmail.com>

commit 8c9f54d
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun May 28 13:38:24 2023 +1000

    Encoder map: NUM_DIRECTIONS (qmk#21066)

commit f98f8ee
Author: nuess0r <nussgipfel@brain4free.org>
Date:   Sat May 27 15:12:36 2023 +0200

    Consolidate modelm v2 (qmk#14996)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Nick Brassel <nick@tzarc.org>

commit e759230
Author: Nick Brassel <nick@tzarc.org>
Date:   Sat May 27 14:49:57 2023 +1000

    Fix up `keebio/cepstrum` (qmk#21062)

commit 249fb3c
Author: André Greiner-Petter <5708782+AndreG-P@users.noreply.github.com>
Date:   Sat May 27 12:26:14 2023 +0900

    [BUG] Allow multiple IS31FL3741 drivers per board in rgb_matrix (qmk#20988)

commit 5642bd1
Author: Nick Brassel <nick@tzarc.org>
Date:   Sat May 27 13:23:07 2023 +1000

    Fix up `qmk find` when not specifying filters. (qmk#21059)

commit 363bfdb
Author: Ryan <fauxpark@gmail.com>
Date:   Sat May 27 12:27:44 2023 +1000

    Move `RGBLIGHT_LIMIT_VAL` to data driven (qmk#20974)

    Co-authored-by: Nick Brassel <nick@tzarc.org>

commit 8fdcba1
Merge: 5efdc28 16767e4
Author: QMK Bot <hello@qmk.fm>
Date:   Fri May 26 20:19:17 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 16767e4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri May 26 21:18:33 2023 +0100

    Bump JamesIves/github-pages-deploy-action from 4.4.1 to 4.4.2 (qmk#21057)

    Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.1 to 4.4.2.
    - [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
    - [Commits](JamesIves/github-pages-deploy-action@v4.4.1...v4.4.2)

    ---
    updated-dependencies:
    - dependency-name: JamesIves/github-pages-deploy-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 5efdc28
Merge: b2e5017 1c1bc56
Author: QMK Bot <hello@qmk.fm>
Date:   Fri May 26 02:07:54 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 1c1bc56
Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Date:   Fri May 26 04:07:06 2023 +0200

    [Bugfix + Refactor] `qmk painter-convert-graphics` (qmk#19994)

commit b2e5017
Author: Joel Challis <git@zvecr.com>
Date:   Thu May 25 23:08:12 2023 +0100

    Move `thekey` to Drop vendor folder (qmk#21032)

commit 873922d
Author: Joel Challis <git@zvecr.com>
Date:   Thu May 25 23:07:47 2023 +0100

    Implement UF2 device type id extension tag (qmk#21029)

commit ed69d78
Author: Drashna Jaelre <drashna@live.com>
Date:   Thu May 25 08:41:12 2023 -0700

    [Bug][Keyboard] Fix key display on Corne OLED (qmk#21044)

commit 6e41377
Author: Joel Challis <git@zvecr.com>
Date:   Wed May 24 23:27:57 2023 +0100

    qmk info - Remove printing of "Keyboard Folder" (qmk#21033)

commit 6d93d8b
Merge: a12c1e0 f9c3297
Author: QMK Bot <hello@qmk.fm>
Date:   Wed May 24 18:48:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit f9c3297
Author: Danny <nooges@users.noreply.github.com>
Date:   Wed May 24 14:47:46 2023 -0400

    Add encoder map FoldKB in VIA (qmk#21038)

commit a12c1e0
Merge: 3969d70 618d0f0
Author: QMK Bot <hello@qmk.fm>
Date:   Wed May 24 07:54:46 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 618d0f0
Author: Xyverz <xyverz@gmail.com>
Date:   Wed May 24 00:54:06 2023 -0700

    Removed unneeded layers from xyverz keymaps (qmk#21008)

commit 3969d70
Author: Joel Challis <git@zvecr.com>
Date:   Mon May 22 07:04:19 2023 +0100

    Duplicate board files for blok converter (qmk#20629)

    * Duplicate board files for blok converter

    * Swap converters board file too

    * Update platforms/chibios/boards/QMK_BLOK/configs/board.h

commit fb056c5
Author: Joel Challis <git@zvecr.com>
Date:   Mon May 22 07:03:59 2023 +0100

    Update json2c to use dump_lines (qmk#21013)

commit 595f7db
Author: Ryan <fauxpark@gmail.com>
Date:   Mon May 22 13:40:34 2023 +1000

    Remove HHKB RN42 code (qmk#21007)

commit 36b08d5
Merge: 5261ac9 725c9f3
Author: QMK Bot <hello@qmk.fm>
Date:   Sun May 21 16:44:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 725c9f3
Author: Bodo Graumann <mail@bodograumann.de>
Date:   Sun May 21 18:44:06 2023 +0200

    Use wayback machine for unreachable site (qmk#20987)

commit 5261ac9
Merge: 9d96bfc 08a8d35
Author: QMK Bot <hello@qmk.fm>
Date:   Sun May 21 15:57:48 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 08a8d35
Author: Ananya Kirti <AnanyaKirti@users.noreply.github.com>
Date:   Sun May 21 21:27:08 2023 +0530

    [Keyboard] Added Support for trainpad (qmk#20973)

    * Added Support for trainpad

    added support for trainpad

    * corrected capitalisation

    corrected capitalisation

    * Update keyboards/trainpad/keymaps/via/keymap.c

    * Update keyboards/trainpad/info.json

    * Update keyboards/trainpad/keymaps/default/keymap.c

    * Update readme.md

    updated readme to remove handwire, and corrected number of keys

    * removed config.h, trainpad.c and trainpad.h

    removed config.h, trainpad.c and trainpad.h

    * updated readme

    upadted readme to correct capitalisation

    * Update keyboards/trainpad/info.json

    * Update keyboards/trainpad/info.json

    * Update keyboards/trainpad/rules.mk

    * updated Readme

    updated Readme

    * Update keyboards/trainpad/readme.md

commit 9d96bfc
Merge: d7220da 420e35f
Author: QMK Bot <hello@qmk.fm>
Date:   Sat May 20 21:29:58 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 420e35f
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun May 21 07:29:21 2023 +1000

    `qmk generate-make-dependencies` improvements (qmk#21001)

    * Recommendations from @sigprof

    * Fix CI tests

commit d7220da
Author: Drashna Jaelre <drashna@live.com>
Date:   Sat May 20 13:22:46 2023 -0700

    [Bug] Fix issue with Repeat Key-Combo test (qmk#21005)

commit 6a7ba7a
Author: Sergey Vlasov <sigprof@gmail.com>
Date:   Sat May 20 21:51:26 2023 +0300

    rart/rart80:via: restore rules.mk after qmk#20334 (qmk#21002)

    PR qmk#20334 accidentally removed the `rules.mk` file from the `via` keymap
    for `rart/rart80`; restore that file.
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
@rezaadio @fauxpark
@rizalfr @coquizen
Add sriwedari70 and move kamigakushi to new folder (qmk#20334)
c78fffb 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zacksupreme <zacksupreme@gmail.com>
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
@sigprof @coquizen
rart/rart80:via: restore rules.mk after qmk#20334 (qmk#21002)
00e6366 
PR qmk#20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
@rezaadio @fauxpark
@rizalfr @autoferrit
Add sriwedari70 and move kamigakushi to new folder (qmk#20334)
1f7a14b 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zacksupreme <zacksupreme@gmail.com>
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
@sigprof @autoferrit
rart/rart80:via: restore rules.mk after qmk#20334 (qmk#21002)
69e81e4 
PR qmk#20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@waffle87 waffle87 waffle87 approved these changes

@fauxpark fauxpark fauxpark approved these changes

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alabahuy @waffle87 @rizalfr @tzarc @fauxpark @rezaadio