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

[Keyboard] Clean up contra & move to data-driven #19973

Merged
merged 4 commits into from
Mar 1, 2023
Merged

[Keyboard] Clean up contra & move to data-driven #19973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
178ea8f
Update keyboard readme information
filterpaper Feb 28, 2023
85a6ff3
Convert to data driven, add copyright header
filterpaper Mar 1, 2023
da9333f
Remove keyboard info sub-title
filterpaper Mar 1, 2023
a941c23
Remove image link
filterpaper Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert to data driven, add copyright header
  • Loading branch information
@filterpaper
filterpaper committed Mar 1, 2023
commit 85a6ff32912d317d9641a889f564266ab871d229
15 changes: 0 additions & 15 deletions keyboards/contra/config.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/contra/contra.c
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions keyboards/contra/contra.h
View file
Open in desktop

This file was deleted.

118 changes: 116 additions & 2 deletions keyboards/contra/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,135 @@
"manufacturer": "Cartel",
"url": "",
"maintainer": "qmk",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"usb": {
"vid": "0x4354",
"pid": "0x0001",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["F6", "B3", "B2", "B6"]
},
"community_layouts": ["planck_mit", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]
"layout": [
{"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
{"label":"Q", "matrix": [0, 1], "x":1, "y":0},
{"label":"W", "matrix": [0, 2], "x":2, "y":0},
{"label":"E", "matrix": [0, 3], "x":3, "y":0},
{"label":"R", "matrix": [0, 4], "x":4, "y":0},
{"label":"T", "matrix": [0, 5], "x":5, "y":0},
{"label":"Y", "matrix": [0, 6], "x":6, "y":0},
{"label":"U", "matrix": [0, 7], "x":7, "y":0},
{"label":"I", "matrix": [0, 8], "x":8, "y":0},
{"label":"O", "matrix": [0, 9], "x":9, "y":0},
{"label":"P", "matrix": [0, 10], "x":10, "y":0},
{"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},

{"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
{"label":"A", "matrix": [1, 1], "x":1, "y":1},
{"label":"S", "matrix": [1, 2], "x":2, "y":1},
{"label":"D", "matrix": [1, 3], "x":3, "y":1},
{"label":"F", "matrix": [1, 4], "x":4, "y":1},
{"label":"G", "matrix": [1, 5], "x":5, "y":1},
{"label":"H", "matrix": [1, 6], "x":6, "y":1},
{"label":"J", "matrix": [1, 7], "x":7, "y":1},
{"label":"K", "matrix": [1, 8], "x":8, "y":1},
{"label":"L", "matrix": [1, 9], "x":9, "y":1},
{"label":";", "matrix": [1, 10], "x":10, "y":1},
{"label":"'", "matrix": [1, 11], "x":11, "y":1},

{"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
{"label":"Z", "matrix": [2, 1], "x":1, "y":2},
{"label":"X", "matrix": [2, 2], "x":2, "y":2},
{"label":"C", "matrix": [2, 3], "x":3, "y":2},
{"label":"V", "matrix": [2, 4], "x":4, "y":2},
{"label":"B", "matrix": [2, 5], "x":5, "y":2},
{"label":"N", "matrix": [2, 6], "x":6, "y":2},
{"label":"M", "matrix": [2, 7], "x":7, "y":2},
{"label":",", "matrix": [2, 8], "x":8, "y":2},
{"label":".", "matrix": [2, 9], "x":9, "y":2},
{"label":"/", "matrix": [2, 10], "x":10, "y":2},
{"label":"Return", "matrix": [2, 11], "x":11, "y":2},

{"matrix": [3, 0], "x":0, "y":3},
{"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
{"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
{"label":"Super", "matrix": [3, 3], "x":3, "y":3},
{"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
{"matrix": [3, 5], "x":5, "y":3},
{"matrix": [3, 6], "x":6, "y":3},
{"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
{"label":"←", "matrix": [3, 8], "x":8, "y":3},
{"label":"↓", "matrix": [3, 9], "x":9, "y":3},
{"label":"↑", "matrix": [3, 10], "x":10, "y":3},
{"label":"→", "matrix": [3, 11], "x":11, "y":3}
]
},

"LAYOUT_planck_mit": {
"layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]
"layout": [
{"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
{"label":"Q", "matrix": [0, 1], "x":1, "y":0},
{"label":"W", "matrix": [0, 2], "x":2, "y":0},
{"label":"E", "matrix": [0, 3], "x":3, "y":0},
{"label":"R", "matrix": [0, 4], "x":4, "y":0},
{"label":"T", "matrix": [0, 5], "x":5, "y":0},
{"label":"Y", "matrix": [0, 6], "x":6, "y":0},
{"label":"U", "matrix": [0, 7], "x":7, "y":0},
{"label":"I", "matrix": [0, 8], "x":8, "y":0},
{"label":"O", "matrix": [0, 9], "x":9, "y":0},
{"label":"P", "matrix": [0, 10], "x":10, "y":0},
{"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},

{"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
{"label":"A", "matrix": [1, 1], "x":1, "y":1},
{"label":"S", "matrix": [1, 2], "x":2, "y":1},
{"label":"D", "matrix": [1, 3], "x":3, "y":1},
{"label":"F", "matrix": [1, 4], "x":4, "y":1},
{"label":"G", "matrix": [1, 5], "x":5, "y":1},
{"label":"H", "matrix": [1, 6], "x":6, "y":1},
{"label":"J", "matrix": [1, 7], "x":7, "y":1},
{"label":"K", "matrix": [1, 8], "x":8, "y":1},
{"label":"L", "matrix": [1, 9], "x":9, "y":1},
{"label":";", "matrix": [1, 10], "x":10, "y":1},
{"label":"'", "matrix": [1, 11], "x":11, "y":1},

{"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
{"label":"Z", "matrix": [2, 1], "x":1, "y":2},
{"label":"X", "matrix": [2, 2], "x":2, "y":2},
{"label":"C", "matrix": [2, 3], "x":3, "y":2},
{"label":"V", "matrix": [2, 4], "x":4, "y":2},
{"label":"B", "matrix": [2, 5], "x":5, "y":2},
{"label":"N", "matrix": [2, 6], "x":6, "y":2},
{"label":"M", "matrix": [2, 7], "x":7, "y":2},
{"label":",", "matrix": [2, 8], "x":8, "y":2},
{"label":".", "matrix": [2, 9], "x":9, "y":2},
{"label":"/", "matrix": [2, 10], "x":10, "y":2},
{"label":"Return", "matrix": [2, 11], "x":11, "y":2},

{"matrix": [3, 0], "x":0, "y":3},
{"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
{"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
{"label":"Super", "matrix": [3, 3], "x":3, "y":3},
{"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
{"matrix": [3, 5], "x":5, "y":3},
{"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
{"label":"←", "matrix": [3, 8], "x":8, "y":3},
{"label":"↓", "matrix": [3, 9], "x":9, "y":3},
{"label":"↑", "matrix": [3, 10], "x":10, "y":3},
{"label":"→", "matrix": [3, 11], "x":11, "y":3}
]
}
}
}
3 changes: 3 additions & 0 deletions keyboards/contra/keymaps/default/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright QMK Community
// SPDX-License-Identifier: GPL-2.0+

#pragma once


Expand Down
19 changes: 1 addition & 18 deletions keyboards/contra/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output

LAYOUTS_HAS_RGB = no

# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
# This file intentionally left blank