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 keyboard vortex/M0110a #22183

Closed
wants to merge 117 commits into from
Closed

ADD keyboard vortex/M0110a #22183

wants to merge 117 commits into from

Conversation

gskygithub
Copy link
Contributor

Description

Add m0110a keyboard

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

@gskygithub
Add files via upload
d9588c0
@gskygithub
[keyboard]
8c7aff1
@gskygithub
[Keyboard]
1dd4c87
@gskygithub
Delete flash_spi.c
74e52d3
@gskygithub
Delete flash_spi.h
19b7d38
@gskygithub
Delete wb32_spi_master.c
7f77d7a
@gskygithub
Delete wb32_spi_master.h
2c0fe84
@gskygithub
[Keyboard]
ecbff72
@gskygithub
Resolved requested changes
9c423d1
@gskygithub
Resolved requested changes
318c463
@gskygithub
Changed rules.mk file accordingly.
dd42220
@gskygithub
Resolved changes accordingly.
52a3301
@gskygithub
Update config.h file and rules.mk file
1c3f1e6
@gskygithub
Removed eeprom_flash.c file
8db03c1
@gskygithub
Update default/keymap.c file
6b050ac
@gskygithub
Delete keyboards/darkproject/kd83a_bfg_edition directory
03ff34c
@gskygithub
Add keyboard
da0a8e5
@gskygithub
Merge branch 'qmk:master' into master
733cf2c
@gskygithub
Add keyboard
273d1da
@gskygithub
Delete darkproject/kd83a_bfg_edition directory
4f3f6c9
@gskygithub
Resolved Changes
4773980
@gskygithub
Merge branch 'qmk:master' into master
ded388f
@gskygithub
Resolved requested changes
e79a657
@gskygithub
Merge branch 'qmk:master' into master
5fedd8a
@gskygithub
keyboard
c89ae6b
@gskygithub
Add keyboard
45d803f
@gskygithub
Delete keyboard
11e36a3
@gskygithub
Merge branch 'qmk:master' into master
1dce29e
@gskygithub
Merge branch 'qmk:master' into master
71157f0
@gskygithub
Add keyboard
5d9043d
@gskygithub
Copy link
Contributor Author

@gskygithub,

Is matrix position [10,2] the left half of a split backspace? None of the other layouts use that position.

@noroadsleft Updated, thanks.

noroadsleft
noroadsleft reviewed Oct 17, 2023
View reviewed changes
keyboards/vortex/m0110a/info.json
@@ -340,7 +340,7 @@
{ "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
{ "label": "\\", "matrix": [10, 5], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 1 },
Copy link
Member

Choose a reason for hiding this comment

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

Is this accurate? It was initially [10,5] for the ANSI Backslash.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@noroadsleft yes, we want to use these two matrix for backslash. It is ok to keep [10,2]. because we want to use [10,2] for split backspace.

@drashna drashna self-requested a review October 22, 2023 04:29
@gskygithub
Copy link
Contributor Author

@drashna @waffle87 @noroadsleft could someone please take a look at this PR, thanks.

@github-actions GitHub Actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Dec 30, 2023
@gskygithub
Copy link
Contributor Author

@waffle87 @drashna @noroadsleft can someone, please take a look at this PR, thanks.

@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Jan 2, 2024
@github-actions GitHub Actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Feb 17, 2024
@gskygithub
Copy link
Contributor Author

@waffle87 @drashna @noroadsleft can someone, please take a look at this PR, thanks.

@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Feb 18, 2024
dunk2k
dunk2k suggested changes Mar 21, 2024
View reviewed changes
keyboards/vortex/m0110a/keymaps/default/config.h Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

please migrate settings in this file to info.json, using /data/mappings/info_config.hjson as reference, and then delete file

keyboards/vortex/m0110a/info.json
{ "label": "Num0", "matrix": [12, 3], "w":2, "x": 15.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
},
},
"LAYOUT_ansi_split_bs": {
"layout": [
{ "label": "ESC", "matrix": [1, 6], "x": 0, "y": 0 },
{ "label": "1", "matrix": [1, 7], "x": 1, "y": 0 },
{ "label": "2", "matrix": [2, 7], "x": 2, "y": 0 },
{ "label": "3", "matrix": [3, 7], "x": 3, "y": 0 },
{ "label": "4", "matrix": [4, 7], "x": 4, "y": 0 },
{ "label": "5", "matrix": [4, 6], "x": 5, "y": 0 },
{ "label": "6", "matrix": [5, 6], "x": 6, "y": 0 },
{ "label": "7", "matrix": [5, 7], "x": 7, "y": 0 },
{ "label": "8", "matrix": [6, 7], "x": 8, "y": 0 },
{ "label": "9", "matrix": [7, 7], "x": 9, "y": 0 },
{ "label": "0", "matrix": [8, 7], "x": 10, "y": 0 },
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 0 },
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 0 },
{ "label": "Backspace", "matrix": [10, 1], "x": 13, "y": 1 },
{ "label": "delete", "matrix": [6, 5], "x": 14, "y": 1 },
{ "label": "Numlock", "matrix": [11, 4], "x": 15.5, "y": 0 },
{ "label": "Num/", "matrix": [12, 4], "x": 16.5, "y": 0 },
{ "label": "Num*", "matrix": [13, 4], "x": 17.5, "y": 0 },
{ "label": "Num-", "matrix": [13, 5], "x": 18.5, "y": 0 },
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [3, 0], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [4, 0], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [4, 1], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [5, 0], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [7, 0], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
{ "label": "\\", "matrix": [10, 5], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Num7", "matrix": [11, 0], "x": 15.5, "y": 1 },
{ "label": "Num8", "matrix": [12, 0], "x": 16.5, "y": 1 },
{ "label": "Num9", "matrix": [13, 0], "x": 17.5, "y": 1 },
{ "label": "Num+", "matrix": [11, 3], "h":2, "x": 18.5, "y": 1 },
{ "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [1, 2], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [3, 2], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [4, 2], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [4, 3], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [5, 3], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [5, 2], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [7, 2], "x": 9.75, "y": 2 },
{ "label": ";", "matrix": [8, 2], "x": 10.75, "y": 2 },
{ "label": "'", "matrix": [8, 3], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "Num4", "matrix": [11, 1], "x": 15.5, "y": 2 },
{ "label": "Num5", "matrix": [12, 1], "x": 16.5, "y": 2 },
{ "label": "Num6", "matrix": [13, 1], "x": 17.5, "y": 2 },
{ "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 3 },
{ "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [2, 4], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [4, 4], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [4, 5], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [5, 5], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [5, 4], "x": 8.25, "y": 3 },
{ "label": ",", "matrix": [6, 4], "x": 9.25, "y": 3 },
{ "label": ".", "matrix": [7, 4], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [8, 5], "x": 11.25, "y": 3 },
{ "label": "Shift", "matrix": [9, 1], "w": 2.75, "x": 12.25, "y": 3 },
{ "label": "Num1", "matrix": [11, 2], "x": 15.5, "y": 3 },
{ "label": "Num2", "matrix": [12, 2], "x": 16.5, "y": 3 },
{ "label": "Num3", "matrix": [13, 2], "x": 17.5, "y": 3 },
{ "label": "Numenter", "matrix": [13, 6], "h":2, "x": 18.5, "y": 3 },
{ "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 4 },
{ "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 4 },
{ "label": "RAlt", "matrix": [9, 5], "w": 1.25, "x": 10, "y": 4 },
{ "label": "RWin", "matrix": [8, 4], "w": 1.25, "x": 11.25, "y": 4 },
{ "label": "RCtrl", "matrix": [0, 4], "w": 1.25, "x": 12.5, "y": 4 },
{ "label": "FN", "matrix": [9, 2], "w": 1.25, "x": 13.75, "y": 4 },
{ "label": "Num0", "matrix": [12, 3], "w":2, "x": 15.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},

keyboards/vortex/m0110a/info.json
{ "label": "Num0", "matrix": [12, 3], "w":2, "x": 15.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
},
},
"LAYOUT_iso_split_bs": {
"layout": [
{ "label": "ESC", "matrix": [1, 6], "x": 0, "y": 0 },
{ "label": "1", "matrix": [1, 7], "x": 1, "y": 0 },
{ "label": "2", "matrix": [2, 7], "x": 2, "y": 0 },
{ "label": "3", "matrix": [3, 7], "x": 3, "y": 0 },
{ "label": "4", "matrix": [4, 7], "x": 4, "y": 0 },
{ "label": "5", "matrix": [4, 6], "x": 5, "y": 0 },
{ "label": "6", "matrix": [5, 6], "x": 6, "y": 0 },
{ "label": "7", "matrix": [5, 7], "x": 7, "y": 0 },
{ "label": "8", "matrix": [6, 7], "x": 8, "y": 0 },
{ "label": "9", "matrix": [7, 7], "x": 9, "y": 0 },
{ "label": "0", "matrix": [8, 7], "x": 10, "y": 0 },
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 0 },
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 0 },
{ "label": "Backspace", "matrix": [10, 1], "x": 13, "y": 1 },
{ "label": "delete", "matrix": [6, 5], "x": 14, "y": 1 },
{ "label": "Numlock", "matrix": [11, 4], "x": 15.5, "y": 0 },
{ "label": "Num/", "matrix": [12, 4], "x": 16.5, "y": 0 },
{ "label": "Num*", "matrix": [13, 4], "x": 17.5, "y": 0 },
{ "label": "Num-", "matrix": [13, 5], "x": 18.5, "y": 0 },
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [3, 0], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [4, 0], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [4, 1], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [5, 0], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [7, 0], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
{ "label": "Num7", "matrix": [11, 0], "x": 15.5, "y": 1 },
{ "label": "Num8", "matrix": [12, 0], "x": 16.5, "y": 1 },
{ "label": "Num9", "matrix": [13, 0], "x": 17.5, "y": 1 },
{ "label": "Num+", "matrix": [11, 3], "h":2, "x": 18.5, "y": 1 },
{ "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [1, 2], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [3, 2], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [4, 2], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [4, 3], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [5, 3], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [5, 2], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [7, 2], "x": 9.75, "y": 2 },
{ "label": ";", "matrix": [8, 2], "x": 10.75, "y": 2 },
{ "label": "'", "matrix": [8, 3], "x": 11.75, "y": 2 },
{ "label": "#", "matrix": [0, 2], "x": 12.75, "y": 2 },
{ "label": "Enter", "matrix": [10, 4], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
{ "label": "Num4", "matrix": [11, 1], "x": 15.5, "y": 2 },
{ "label": "Num5", "matrix": [12, 1], "x": 16.5, "y": 2 },
{ "label": "Num6", "matrix": [13, 1], "x": 17.5, "y": 2 },
{ "label": "Shift", "matrix": [0, 0], "w": 1.25, "x": 0, "y": 3 },
{ "label": "\\", "matrix": [2, 3], "x": 1.25, "y": 3 },
{ "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [2, 4], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [4, 4], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [4, 5], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [5, 5], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [5, 4], "x": 8.25, "y": 3 },
{ "label": ",", "matrix": [6, 4], "x": 9.25, "y": 3 },
{ "label": ".", "matrix": [7, 4], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [8, 5], "x": 11.25, "y": 3 },
{ "label": "Shift", "matrix": [9, 1], "w": 2.75, "x": 12.25, "y": 3 },
{ "label": "Num1", "matrix": [11, 2], "x": 15.5, "y": 3 },
{ "label": "Num2", "matrix": [12, 2], "x": 16.5, "y": 3 },
{ "label": "Num3", "matrix": [13, 2], "x": 17.5, "y": 3 },
{ "label": "Numenter", "matrix": [13, 6], "h":2, "x": 18.5, "y": 3 },
{ "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 4 },
{ "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 4 },
{ "label": "RAlt", "matrix": [9, 5], "w": 1.25, "x": 10, "y": 4 },
{ "label": "RWin", "matrix": [8, 4], "w": 1.25, "x": 11.25, "y": 4 },
{ "label": "RCtrl", "matrix": [0, 4], "w": 1.25, "x": 12.5, "y": 4 },
{ "label": "FN", "matrix": [9, 2], "w": 1.25, "x": 13.75, "y": 4 },
{ "label": "Num0", "matrix": [12, 3], "w":2, "x": 15.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},

keyboards/vortex/m0110a/info.json
{ "label": "Num0", "matrix": [12, 3], "x": 16.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
},
},
"LAYOUT_1800_ansi_split_bs": {
"layout": [
{ "label": "ESC", "matrix": [1, 6], "x": 0, "y": 0 },
{ "label": "1", "matrix": [1, 7], "x": 1, "y": 0 },
{ "label": "2", "matrix": [2, 7], "x": 2, "y": 0 },
{ "label": "3", "matrix": [3, 7], "x": 3, "y": 0 },
{ "label": "4", "matrix": [4, 7], "x": 4, "y": 0 },
{ "label": "5", "matrix": [4, 6], "x": 5, "y": 0 },
{ "label": "6", "matrix": [5, 6], "x": 6, "y": 0 },
{ "label": "7", "matrix": [5, 7], "x": 7, "y": 0 },
{ "label": "8", "matrix": [6, 7], "x": 8, "y": 0 },
{ "label": "9", "matrix": [7, 7], "x": 9, "y": 0 },
{ "label": "0", "matrix": [8, 7], "x": 10, "y": 0 },
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 0 },
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 0 },
{ "label": "Backspace", "matrix": [10, 1], "x": 13, "y": 1 },
{ "label": "delete", "matrix": [6, 5], "x": 14, "y": 1 },
{ "label": "Numlock", "matrix": [11, 4], "x": 15.5, "y": 0 },
{ "label": "Num/", "matrix": [12, 4], "x": 16.5, "y": 0 },
{ "label": "Num*", "matrix": [13, 4], "x": 17.5, "y": 0 },
{ "label": "Num-", "matrix": [13, 5], "x": 18.5, "y": 0 },
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [3, 0], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [4, 0], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [4, 1], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [5, 0], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [7, 0], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
{ "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Num7", "matrix": [11, 0], "x": 15.5, "y": 1 },
{ "label": "Num8", "matrix": [12, 0], "x": 16.5, "y": 1 },
{ "label": "Num9", "matrix": [13, 0], "x": 17.5, "y": 1 },
{ "label": "Num+", "matrix": [11, 3], "h":2, "x": 18.5, "y": 1 },
{ "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [1, 2], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [3, 2], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [4, 2], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [4, 3], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [5, 3], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [5, 2], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [7, 2], "x": 9.75, "y": 2 },
{ "label": ";", "matrix": [8, 2], "x": 10.75, "y": 2 },
{ "label": "'", "matrix": [8, 3], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "Num4", "matrix": [11, 1], "x": 15.5, "y": 2 },
{ "label": "Num5", "matrix": [12, 1], "x": 16.5, "y": 2 },
{ "label": "Num6", "matrix": [13, 1], "x": 17.5, "y": 2 },
{ "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 3 },
{ "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [2, 4], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [4, 4], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [4, 5], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [5, 5], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [5, 4], "x": 8.25, "y": 3 },
{ "label": ",", "matrix": [6, 4], "x": 9.25, "y": 3 },
{ "label": ".", "matrix": [7, 4], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [8, 5], "x": 11.25, "y": 3 },
{ "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 3 },
{ "label": "Up", "matrix": [3, 5], "x": 14.25, "y": 3.25 },
{ "label": "Num1", "matrix": [11, 2], "x": 15.5, "y": 3 },
{ "label": "Num2", "matrix": [12, 2], "x": 16.5, "y": 3 },
{ "label": "Num3", "matrix": [13, 2], "x": 17.5, "y": 3 },
{ "label": "Numenter", "matrix": [13, 6], "h":2, "x": 18.5, "y": 3 },
{ "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 4 },
{ "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 4 },
{ "label": "RAlt", "matrix": [9, 5], "x": 10, "y": 4 },
{ "label": "FN", "matrix": [9, 2], "x": 11, "y": 4 },
{ "label": "RCtrl", "matrix": [0, 4], "x": 12, "y": 4 },
{ "label": "Left", "matrix": [0, 3], "x": 13.25, "y": 4.25 },
{ "label": "Down", "matrix": [7, 3], "x": 14.25, "y": 4.25 },
{ "label": "Right", "matrix": [0, 5], "x": 15.25, "y": 4.25 },
{ "label": "Num0", "matrix": [12, 3], "x": 16.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
},

keyboards/vortex/m0110a/info.json
{ "label": "Num0", "matrix": [12, 3], "x": 16.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
}
},
"LAYOUT_1800_iso_split_bs": {
"layout": [
{ "label": "ESC", "matrix": [1, 6], "x": 0, "y": 0 },
{ "label": "1", "matrix": [1, 7], "x": 1, "y": 0 },
{ "label": "2", "matrix": [2, 7], "x": 2, "y": 0 },
{ "label": "3", "matrix": [3, 7], "x": 3, "y": 0 },
{ "label": "4", "matrix": [4, 7], "x": 4, "y": 0 },
{ "label": "5", "matrix": [4, 6], "x": 5, "y": 0 },
{ "label": "6", "matrix": [5, 6], "x": 6, "y": 0 },
{ "label": "7", "matrix": [5, 7], "x": 7, "y": 0 },
{ "label": "8", "matrix": [6, 7], "x": 8, "y": 0 },
{ "label": "9", "matrix": [7, 7], "x": 9, "y": 0 },
{ "label": "0", "matrix": [8, 7], "x": 10, "y": 0 },
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 0 },
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 0 },
{ "label": "Backspace", "matrix": [10, 1], "x": 13, "y": 1 },
{ "label": "delete", "matrix": [6, 5], "x": 14, "y": 1 },
{ "label": "Numlock", "matrix": [11, 4], "x": 15.5, "y": 0 },
{ "label": "Num/", "matrix": [12, 4], "x": 16.5, "y": 0 },
{ "label": "Num*", "matrix": [13, 4], "x": 17.5, "y": 0 },
{ "label": "Num-", "matrix": [13, 5], "x": 18.5, "y": 0 },
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [3, 0], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [4, 0], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [4, 1], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [5, 0], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [7, 0], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
{ "label": "Num7", "matrix": [11, 0], "x": 15.5, "y": 1 },
{ "label": "Num8", "matrix": [12, 0], "x": 16.5, "y": 1 },
{ "label": "Num9", "matrix": [13, 0], "x": 17.5, "y": 1 },
{ "label": "Num+", "matrix": [11, 3], "h":2, "x": 18.5, "y": 1 },
{ "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [1, 2], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [3, 2], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [4, 2], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [4, 3], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [5, 3], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [5, 2], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [7, 2], "x": 9.75, "y": 2 },
{ "label": ";", "matrix": [8, 2], "x": 10.75, "y": 2 },
{ "label": "'", "matrix": [8, 3], "x": 11.75, "y": 2 },
{ "label": "#", "matrix": [0, 2], "x": 12.75, "y": 2 },
{ "label": "Enter", "matrix": [10, 4], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
{ "label": "Num4", "matrix": [11, 1], "x": 15.5, "y": 2 },
{ "label": "Num5", "matrix": [12, 1], "x": 16.5, "y": 2 },
{ "label": "Num6", "matrix": [13, 1], "x": 17.5, "y": 2 },
{ "label": "Shift", "matrix": [0, 0], "w": 1.25, "x": 0, "y": 3 },
{ "label": "\\", "matrix": [2, 3], "x": 1.25, "y": 3 },
{ "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [2, 4], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [4, 4], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [4, 5], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [5, 5], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [5, 4], "x": 8.25, "y": 3 },
{ "label": ",", "matrix": [6, 4], "x": 9.25, "y": 3 },
{ "label": ".", "matrix": [7, 4], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [8, 5], "x": 11.25, "y": 3 },
{ "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 3 },
{ "label": "Up", "matrix": [3, 5], "x": 14.25, "y": 3.25 },
{ "label": "Num1", "matrix": [11, 2], "x": 15.5, "y": 3 },
{ "label": "Num2", "matrix": [12, 2], "x": 16.5, "y": 3 },
{ "label": "Num3", "matrix": [13, 2], "x": 17.5, "y": 3 },
{ "label": "Numenter", "matrix": [13, 6], "h":2, "x": 18.5, "y": 3 },
{ "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 4 },
{ "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 4 },
{ "label": "RAlt", "matrix": [9, 5], "x": 10, "y": 4 },
{ "label": "FN", "matrix": [9, 2], "x": 11, "y": 4 },
{ "label": "RCtrl", "matrix": [0, 4], "x": 12, "y": 4 },
{ "label": "Left", "matrix": [0, 3], "x": 13.25, "y": 4.25 },
{ "label": "Down", "matrix": [7, 3], "x": 14.25, "y": 4.25 },
{ "label": "Right", "matrix": [0, 5], "x": 15.25, "y": 4.25 },
{ "label": "Num0", "matrix": [12, 3], "x": 16.5, "y": 4 },
{ "label": "Numdel", "matrix": [13, 3], "x": 17.5, "y": 4 }
]
}

waffle87
waffle87 requested changes Mar 30, 2024
View reviewed changes
keyboards/vortex/m0110a/config.h Outdated
Comment on lines 21 to 26
#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

keyboards/vortex/m0110a/info.json Outdated
},
"processor": "WB32FQ95",
"qmk": {
"tap_keycode_delay": 10
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"tap_keycode_delay": 10
"tap_keycode_delay": 10,
"locking": {
"enabled": true,
"resync": true
}

keyboards/vortex/m0110a/info.json Outdated
"vid": "0x342D"
},
"eeprom": {
"driver": "wear_leveling"
Copy link
Member

@waffle87 waffle87 Mar 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
"driver": "wear_leveling"
"driver": "wear_leveling",
"wear_leveling": {
"driver": "spi_flash",
"backing_size": 8192
}

keyboards/vortex/m0110a/keymaps/default/config.h Outdated
Copy link
Member

Choose a reason for hiding this comment

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

This file must be removed.

keyboards/vortex/m0110a/readme.md Outdated
@@ -0,0 +1,24 @@
# M0110A
![m0110a](https://imgur.com/bWpBa8th.png)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
![m0110a](https://imgur.com/bWpBa8th.png)
![m0110a](https://imgur.com/bWpBa8t.png)

keyboards/vortex/m0110a/rules.mk Outdated
@@ -0,0 +1 @@
WEAR_LEVELING_DRIVER = spi_flash
Copy link
Member

Choose a reason for hiding this comment

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

This can be configured via info.json on the branch you are targeting now.

Suggested change
WEAR_LEVELING_DRIVER = spi_flash
# This file intentionally left blank

@gskygithub gskygithub requested a review from waffle87 April 3, 2024 08:12
noroadsleft
noroadsleft reviewed May 1, 2024
View reviewed changes
keyboards/vortex/m0110a/info.json
"backing_size": 8192
}
},
"layouts": {
Copy link
Member

Choose a reason for hiding this comment

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

Trying to make sense of this.

  • [10, 2] only gets used on 1800 layout boards in ANSI layout, as the 1.5u Backslash key
  • [8 ,4] only gets used as the 1.25u RWin key, and is only available in the 60% + Numpad layout, and not the mini 1800 layout with arrow keys
  • 2u Backspace is [10, 1], and Split Backspace is [10, 1] and [6, 5]

Do I have all of that correct?

@github-actions GitHub Actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Jun 16, 2024
@github-actions GitHub Actions
Copy link

Thank you for your contribution!
This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
// [stale-action-closed]

@github-actions github-actions bot closed this Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft requested changes

@dunk2k dunk2k dunk2k requested changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna Awaiting requested review from drashna

@waffle87 waffle87 Awaiting requested review from waffle87

Assignees
No one assigned
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution. 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
@gskygithub @noroadsleft @drashna @fauxpark @waffle87 @dunk2k