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 ppr_merro60 #2173

Merged
merged 14 commits into from
Apr 1, 2024
Merged

add ppr_merro60 #2173

merged 14 commits into from
Apr 1, 2024

Conversation

gaclee3b
Copy link
Contributor

Description

Adding new 60% PCB.

QMK Pull Request

qmk/qmk_firmware#23014

Checklist

  • The VIA support for this keyboard is MERGED in QMK master already (MANDATORY)
  • The VIA definition follows the guide here: https://caniusevia.com/docs/layouts
  • I have a V3 JSON version for this keyboard definition.(MANDATORY)
  • I have tested this keyboard definition using VIA's "Design" tab.
  • I have tested this keyboard definition with firmware on a device.
  • I have assigned alpha keys and modifier keys with the correct colors.
  • The Vendor ID is not 0xFEED

@gaclee3b
Copy link
Contributor Author

the build looks like it's failing because it's expecting "v2" format (specifically requiring the "lighting" property), but "v3" is required. Did I configure something incorrectly or is this a bug in the checker?

@gaclee3b
Copy link
Contributor Author

Looks good after moving my files from "src" to "v3". Can someone help me review and approve?

dunk2k
dunk2k suggested changes Feb 23, 2024
View reviewed changes
Copy link
Contributor

@dunk2k dunk2k left a comment •
edited
Loading

Choose a reason for hiding this comment

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

  1. add bottom row layouts:
    1. WKL and HHKB (inherent variants of Tsangan)
    2. Separate 10u
    3. additional compatible split spacebar
  2. moved 2.75u Right shift and 2u Backspace to align with ISO Enter
  3. moved "y": 0.25 from 3rd bottom row to 2nd bottom row
  4. bottom row "ANSI" renamed to "Standard"

v3/chlx/ppr_merro60/ppr_merro60.json Outdated Show resolved Hide resolved
v3/chlx/ppr_merro60/ppr_merro60.json Show resolved Hide resolved
v3/chlx/ppr_merro60/ppr_merro60.json Outdated Show resolved Hide resolved
v3/chlx/ppr_merro60/ppr_merro60.json Show resolved Hide resolved
v3/chlx/ppr_merro60/ppr_merro60.json Show resolved Hide resolved
v3/chlx/ppr_merro60/ppr_merro60.json Show resolved Hide resolved
gaclee3b and others added 6 commits February 23, 2024 16:42
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
53544b7 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
3da3dc5 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
43b83f2 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
dab0241 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
00f7530 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@gaclee3b @dunk2k
Update v3/chlx/ppr_merro60/ppr_merro60.json
b753b82 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Xelus22
Xelus22 requested changes Feb 25, 2024
View reviewed changes
Copy link
Collaborator

@Xelus22 Xelus22 left a comment

Choose a reason for hiding this comment

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

image

Should this be grey?

@gaclee3b gaclee3b requested a review from Xelus22 February 25, 2024 19:29
@gaclee3b
Copy link
Contributor Author

hello, i think i've covered the requested changes a few weeks ago and don't have any other changes planned. could someone check and approve?

Xelus22
Xelus22 requested changes Mar 30, 2024
View reviewed changes
Copy link
Collaborator

@Xelus22 Xelus22 left a comment

Choose a reason for hiding this comment

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

Hey sorry for the long delay, been quite busy. Just one last thing you will need decals in the empty spots on the bottom rows

https://www.caniusevia.com/docs/layouts#layout-options

@gaclee3b gaclee3b requested a review from Xelus22 March 30, 2024 12:11
@Xelus22 Xelus22 merged commit 22eefda into the-via:master Apr 1, 2024
2 checks passed
j4ckofalltrades pushed a commit to j4ckofalltrades/via-keyboards that referenced this pull request Apr 10, 2024
@pull @DOIO2022
@SmollChungus @Lrfoster03 @Xelus22 @adophoxia @zlabkeeb @Vertex-kb @Ethirallan @blindassassin111 @Cipulot @nwhirschfeld @noroadsleft @infinityis @mechlovin @hineybush @strayfade @eerraa @4pplet @Bregoliii @joliverMI @ramonimbao @veriyaniot @cskeeters @ebastler @JackyJia73 @yulei @gaclee3b @dunk2k @awkannan
[pull] master from the-via:master (#101)
77e0784 
* Update kb12-01.json

* Add files via upload

* PW88 addition

* Compensator VIA json definitions

* Fixed split definitions and added V2 json

* Update kb19-01.json

* Update v3/smoll/pw88.json

Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>

* Add files via upload

* Update v3/doio/kb04/kb04-01.json

Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>

* removed v2 definition

* [ Add 6Pad Via Macropad ]

* Add files via upload

* Add files via upload

* feat: add support for marshkeys/flowerpad

* Added SP BAE Support

* Create osav2_topre.json

* Create osav2_numpad_topre.json

* Add MNK 60 EC

* Add MNK 65 EC

* Add EC Type-K

* Fix layout option

* added TechnicPad

* technicpad: reformated <keyboard>.json files

* Update the layout support for XD96

Updates the VIA support for the XD96 keyboard, using matrix data found
in a TMK keymap generator.

* adding CMK11

* Add 60XT

* Update zed60.json

add support lighting keycode

* matrix fix

* Update yd60mq.json

Removal of Stepped Caps option. This option is redundant since both normal and stepped positions share the same Row/Col position. Furthermore, the renderer doesn't handle the stepped caps correctly.

This PR also adds the features proposed in the-via#2182 by @plodah , while also addressing the inherent multilayout index shift that the removal of the step caps option causes.

* Update v3/smoll/pw88.json

Applied correct key colors scheme as per documentation.

* Add sf2040 Support

* Update sf2040.json

* Add SIRIND Brick65

Add SIRIND Brick65

* fixing wkl layout

* Added Swiss support

* Move to v3

* Added km113 keyboard

* Re-structured folders to match QMK structure

* Add EQUATOR

* [ Add zlabkeeb 15pad VIA ]

* added highlight colors to json files

* Adds support for slice65 from pizzakeyboards

* Update via.json colors

* Add werk.technica werk.one config

* Update and rename via.json to swiss.json

* Create t75.json

* Update v3/vertex/t75/t75.json

* renaming files and folders to align with the rest of the repo

* Update v3/rmi_kb/equator/equator.json

* Update posey_split_v5-via.json.json

Added custom menu support for hardware repeat and layer-shifting color choices. Also cleaned up some long decimals.

* Renamed files and added custom menus to V4

* UPDATE

* Update v3/zlabkeeb/15pad/15pad.json

* Update src/pizzakeyboards/slice65/slice65.json

* fix: Moves slice65 to v3 folder

* removed legacy definition

* fixed technicpad v3 definition

* Update v3/technicpad/technicpad.json

* Add files via upload

* added 810e

* Update v3/doio/kb3x/kb3x-01.json

* Added SKILLER SGK50 S2 keyboard

* update key color, remove stepped lock and reformat the json files

* Update v3/neson_design/810e.json

* Update src/pmk/posey_split/v5/posey_split_v5.json

* Update src/pmk/posey_split/v4/posey_split_v4.json

* Move to V3 per @Cipulot request/advice

src is the legacy folder. Moving to the appropriate newer V3 folder.

* add ppr_merro60 (the-via#2173)

* add ppr_merro60

* move v3 files from v2 'src' dir to 'v3'

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* update key colors for (6,0), (7,0), (6,6), (7,6). tested operational loading in via and running on board.

* remove pipe from modifier color code

* add decal blocks

---------

Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* formatting

* formatting

* formatting

* SRC pass

* V3 pass

* Add kb38  via supported

* Add new versions of Sat75 to VIA

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

* Update v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json

* Update v3/cannonkeys/satisfaction75_rev2/satisfaction75_rev2.json

* yet another pass

* key order and json formatting script

---------

Co-authored-by: DOIO2022 <116554792+DOIO2022@users.noreply.github.com>
Co-authored-by: smollchungusm <mpamuller@msn.com>
Co-authored-by: Logan <lrfoster03@gmail.com>
Co-authored-by: SmollChungus <38044391+SmollChungus@users.noreply.github.com>
Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Logan Foster <44828794+Lrfoster03@users.noreply.github.com>
Co-authored-by: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com>
Co-authored-by: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Co-authored-by: Ethirallan <ethirallan@gmail.com>
Co-authored-by: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: Niclas Hirschfeld <niclas@wonderland.io>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
Co-authored-by: mechlovin <57231893+mechlovin@users.noreply.github.com>
Co-authored-by: hineybush <joshhinnebusch@gmail.com>
Co-authored-by: Strayfade <epicplayvig@gmail.com>
Co-authored-by: era <phyojinbin@gmail.com>
Co-authored-by: 4pplet <mail@4pplet.com>
Co-authored-by: Bregoli <leandercoolen@gmail.com>
Co-authored-by: bingkun.li <bingkun.li@westberrytech.com>
Co-authored-by: joliverMI <joliver@mechingenuity.com>
Co-authored-by: joliverMI <36174681+joliverMI@users.noreply.github.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Veriyans <162705394+veriyaniot@users.noreply.github.com>
Co-authored-by: NW <nwhirschfeld@users.noreply.github.com>
Co-authored-by: Chad Skeeters <chad.skeeters@gmail.com>
Co-authored-by: Bregoliii <34028962+Bregoliii@users.noreply.github.com>
Co-authored-by: Moritz Plattner <moritz.plattner@gmx.net>
Co-authored-by: Jacky <128167503+JackyJia73@users.noreply.github.com>
Co-authored-by: Lei Yu <yuleiz@gmail.com>
Co-authored-by: wb <wb@westberrytech.com>
Co-authored-by: chalex <68408520+gaclee3b@users.noreply.github.com>
Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
@gaclee3b gaclee3b deleted the add_ppr_merro60 branch July 5, 2024 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dunk2k dunk2k dunk2k approved these changes

@Xelus22 Xelus22 Xelus22 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.
3 participants
@gaclee3b @Xelus22 @dunk2k