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

GeonWorks Frog Mini Soldered Layout Rework #18308

Merged
merged 20 commits into from
Sep 14, 2022

Conversation

noroadsleft
Copy link
Member

Description

  • fms.h: add matrix diagram
  • info.json: fix syntax error
  • info.json: apply friendly formatting
  • physically arrange LAYOUT_all macro
    With this change, the keycode for the right half of a Split Backspace is now at the end of the top row, instead of at the end of the bottom row.
  • adds 16 layout macros

cc @Gondolindrim (keyboard maintainer)

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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

@noroadsleft noroadsleft added enhancement keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Sep 7, 2022
@noroadsleft noroadsleft requested a review from a team September 7, 2022 21:28
@noroadsleft
Copy link
Member Author

QMK CLI renderings of the new layouts:

[click]
Layout LAYOUT_60_ansi
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌───┐┌───┐┌───┐┌───────────────────────┐┌───┐┌───┐┌───┐┌───┐
│Ctr││Win││Alt││Space                  ││Alt││Win││Men││Ctr│
└───┘└───┘└───┘└───────────────────────┘└───┘└───┘└───┘└───┘
Layout LAYOUT_60_ansi_split_bs_rshift
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌───┐┌───┐┌───┐┌───────────────────────┐┌───┐┌───┐┌───┐┌───┐
│Ctr││Win││Alt││Space                  ││Alt││Win││Men││Ctr│
└───┘└───┘└───┘└───────────────────────┘└───┘└───┘└───┘└───┘
Layout LAYOUT_60_ansi_tsangan
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌────┐┌──┐┌────┐┌──────────────────────────┐┌────┐┌──┐┌────┐
│Ctrl││Wi││Alt ││Space                     ││Alt ││Me││Ctrl│
└────┘└──┘└────┘└──────────────────────────┘└────┘└──┘└────┘
Layout LAYOUT_60_tsangan_hhkb
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐┌──┐┌────┐┌──────────────────────────┐┌────┐┌──┐┌────┐
│Ctrl││Wi││Alt ││Space                     ││Alt ││Me││Ctrl│
└────┘└──┘└────┘└──────────────────────────┘└────┘└──┘└────┘
Layout LAYOUT_60_ansi_wkl
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌────┐    ┌────┐┌──────────────────────────┐┌────┐    ┌────┐
│Ctrl│    │Alt ││Space                     ││Alt │    │Ctrl│
└────┘    └────┘└──────────────────────────┘└────┘    └────┘
Layout LAYOUT_60_ansi_wkl_split_bs_rshift
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐    ┌────┐┌──────────────────────────┐┌────┐    ┌────┐
│Ctrl│    │Alt ││Space                     ││Alt │    │Ctrl│
└────┘    └────┘└──────────────────────────┘└────┘    └────┘
Layout LAYOUT_60_hhkb
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
      ┌──┐┌────┐┌──────────────────────────┐┌────┐┌──┐
      │Wi││Alt ││Space                     ││Alt ││Me│
      └──┘└────┘└──────────────────────────┘└────┘└──┘
Layout LAYOUT_60_tsangan_hhkb_10u_space
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐┌──┐┌──────────────────────────────────────┐┌──┐┌────┐
│Ctrl││Wi││Space                                 ││Me││Ctrl│
└────┘└──┘└──────────────────────────────────────┘└──┘└────┘
Layout LAYOUT_60_hhkb_10u_space
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
      ┌──┐┌──────────────────────────────────────┐┌──┐
      │Wi││Space                                 ││Me│
      └──┘└──────────────────────────────────────┘└──┘
Layout LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2@││3#││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││\|  │
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'"││Enter  │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───────┘
┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shift  ││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐    ┌──────────────────────────────────────┐    ┌────┐
│Ctrl│    │Space                                 │    │Ctrl│
└────┘    └──────────────────────────────────────┘    └────┘
Layout LAYOUT_60_iso
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌───┐┌───┐┌───┐┌───────────────────────┐┌───┐┌───┐┌───┐┌───┐
│Ctr││Win││Alt││Space                  ││Alt││Win││Men││Ctr│
└───┘└───┘└───┘└───────────────────────┘└───┘└───┘└───┘└───┘
Layout LAYOUT_60_iso_split_bs_rshift
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌───┐┌───┐┌───┐┌───────────────────────┐┌───┐┌───┐┌───┐┌───┐
│Ctr││Win││Alt││Space                  ││Alt││Win││Men││Ctr│
└───┘└───┘└───┘└───────────────────────┘└───┘└───┘└───┘└───┘
Layout LAYOUT_60_iso_tsangan
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌────┐┌──┐┌────┐┌──────────────────────────┐┌────┐┌──┐┌────┐
│Ctrl││Wi││Alt ││Space                     ││Alt ││Me││Ctrl│
└────┘└──┘└────┘└──────────────────────────┘└────┘└──┘└────┘
Layout LAYOUT_60_iso_tsangan_split_bs_rshift
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐┌──┐┌────┐┌──────────────────────────┐┌────┐┌──┐┌────┐
│Ctrl││Wi││Alt ││Space                     ││Alt ││Me││Ctrl│
└────┘└──┘└────┘└──────────────────────────┘└────┘└──┘└────┘
Layout LAYOUT_60_iso_wkl
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bksp  │
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──────┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift    │
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────────┘
┌────┐    ┌────┐┌──────────────────────────┐┌────┐    ┌────┐
│Ctrl│    │Alt ││Space                     ││Alt │    │Ctrl│
└────┘    └────┘└──────────────────────────┘└────┘    └────┘
Layout LAYOUT_60_iso_wkl_split_bs_rshift
┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
│Es││1!││2"││3£││4$││5%││6^││7&││8*││9(││0)││-_││=+││Bk││Bk│
└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[{││]}││Ente│
└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐   │
┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│   │
│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││'@││#~││   │
└─────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘
┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
│Shi││\|││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││Shift││Fn│
└───┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└─────┘└──┘
┌────┐    ┌────┐┌──────────────────────────┐┌────┐    ┌────┐
│Ctrl│    │Alt ││Space                     ││Alt │    │Ctrl│
└────┘    └────┘└──────────────────────────┘└────┘    └────┘

@drashna drashna merged commit 083ac40 into qmk:master Sep 14, 2022
tacahiroy pushed a commit to tacahiroy/qmk_firmware that referenced this pull request Oct 2, 2022
SjB added a commit to SjB/qmk_firmware that referenced this pull request Oct 12, 2022
* upstream/master: (319 commits)
  Fix handwired/swiftrax/bumblebee layout macro (qmk#18377)
  [Keyboard] Add pi40 (qmk#18207)
  [Keyboard] Removal of deprecated defines in IDOBAO keyboards (qmk#18358)
  Fix problem that Chidori is not recognized by host computer. (qmk#17882)
  [Keyboard] Add a new keyboard 'plum47' (qmk#18359)
  [Docs] RESET -> QK_BOOT (qmk#18365)
  Remove `RESET` keycodes from fjlabs keyboards (qmk#18364)
  [Keyboard] Add Vector PCB (qmk#17380)
  [Keyboard] Add Calice (qmk#17929)
  GeonWorks Frog Mini Soldered Layout Rework (qmk#18308)
  [Keyboard] Add skmt/15k keyboard (qmk#18321)
  [Keyboard] Replace Nayeon ATmega32u4 config with RP2040 (qmk#18265)
  Bump anothrNick/github-tag-action from 1.42.0 to 1.45.0 (qmk#18355)
  fix: Remove TERM_ON/TERM_OFF from my keymap (qmk#18354)
  Bump anothrNick/github-tag-action from 1.39.0 to 1.42.0 (qmk#18344)
  Fix keyboard_name for Unicomp Classic/Ultra Classic keyboards (qmk#18327)
  Add EM.8 keyboard  (qmk#18328)
  fixed missing x coordinate on spacebar (qmk#18330)
  GMMK2: Fix 'ISO' within product name (qmk#18322)
  Added gmmk v2 p65 keyboard. (qmk#18185)
  ...
@noroadsleft noroadsleft deleted the rf/geonworks_frogmini_fms branch October 23, 2022 04:49
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants