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

Update WT60-H1, WT60-H3 layouts #20114

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Update WT60-H1, WT60-H3 layouts #20114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 2 additions & 32 deletions keyboards/wilba_tech/wt60_h1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,8 @@
/* Copyright 2020 Jason Williams (Wilba)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2023 Jason Williams (@wilba)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once


/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
Comment on lines -30 to -34
Copy link
Member

Choose a reason for hiding this comment

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

Already done in develop.


/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
84 changes: 78 additions & 6 deletions keyboards/wilba_tech/wt60_h1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,91 @@
{
"keyboard_name": "WT60-H1",
"keyboard_name": "WT60-H1",
"manufacturer": "wilba.tech",
"url": "https://wilba.tech",
"maintainer": "Wilba",
"url": "https://wilba.tech",
"maintainer": "Wilba",
"usb": {
"vid": "0x6582",
"pid": "0x0024",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_tsangan_hhkb"],
"diode_direction": "COL2ROW",
"matrix_pins": {
"rows": ["F0", "F1", "F4", "F6", "F7"],
"cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"]
},
"community_layouts": ["60_ansi_split_bs_rshift"],
"layout_aliases": {
"LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
},
"layouts": {
"LAYOUT_60_tsangan_hhkb": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
{ "matrix": [0, 0], "x": 0.0, "y": 0.0 },
{ "matrix": [0, 1], "x": 1.0, "y": 0.0 },
{ "matrix": [0, 2], "x": 2.0, "y": 0.0 },
{ "matrix": [0, 3], "x": 3.0, "y": 0.0 },
{ "matrix": [0, 4], "x": 4.0, "y": 0.0 },
{ "matrix": [0, 5], "x": 5.0, "y": 0.0 },
{ "matrix": [0, 6], "x": 6.0, "y": 0.0 },
{ "matrix": [0, 7], "x": 7.0, "y": 0.0 },
{ "matrix": [0, 8], "x": 8.0, "y": 0.0 },
{ "matrix": [0, 9], "x": 9.0, "y": 0.0 },
{ "matrix": [0, 10], "x": 10.0, "y": 0.0 },
{ "matrix": [0, 11], "x": 11.0, "y": 0.0 },
{ "matrix": [0, 12], "x": 12.0, "y": 0.0 },
{ "matrix": [0, 13], "x": 13.0, "y": 0.0 },
{ "matrix": [2, 13], "x": 14.0, "y": 0.0 },
{ "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
{ "matrix": [1, 1], "x": 1.5, "y": 1.0 },
{ "matrix": [1, 2], "x": 2.5, "y": 1.0 },
{ "matrix": [1, 3], "x": 3.5, "y": 1.0 },
{ "matrix": [1, 4], "x": 4.5, "y": 1.0 },
{ "matrix": [1, 5], "x": 5.5, "y": 1.0 },
{ "matrix": [1, 6], "x": 6.5, "y": 1.0 },
{ "matrix": [1, 7], "x": 7.5, "y": 1.0 },
{ "matrix": [1, 8], "x": 8.5, "y": 1.0 },
{ "matrix": [1, 9], "x": 9.5, "y": 1.0 },
{ "matrix": [1, 10], "x": 10.5, "y": 1.0 },
{ "matrix": [1, 11], "x": 11.5, "y": 1.0 },
{ "matrix": [1, 12], "x": 12.5, "y": 1.0 },
{ "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
{ "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
{ "matrix": [2, 1], "x": 1.75, "y": 2.0 },
{ "matrix": [2, 2], "x": 2.75, "y": 2.0 },
{ "matrix": [2, 3], "x": 3.75, "y": 2.0 },
{ "matrix": [2, 4], "x": 4.75, "y": 2.0 },
{ "matrix": [2, 5], "x": 5.75, "y": 2.0 },
{ "matrix": [2, 6], "x": 6.75, "y": 2.0 },
{ "matrix": [2, 7], "x": 7.75, "y": 2.0 },
{ "matrix": [2, 8], "x": 8.75, "y": 2.0 },
{ "matrix": [2, 9], "x": 9.75, "y": 2.0 },
{ "matrix": [2, 10], "x": 10.75, "y": 2.0 },
{ "matrix": [2, 11], "x": 11.75, "y": 2.0 },
{ "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2.0 },
{ "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
{ "matrix": [3, 2], "x": 2.25, "y": 3.0 },
{ "matrix": [3, 3], "x": 3.25, "y": 3.0 },
{ "matrix": [3, 4], "x": 4.25, "y": 3.0 },
{ "matrix": [3, 5], "x": 5.25, "y": 3.0 },
{ "matrix": [3, 6], "x": 6.25, "y": 3.0 },
{ "matrix": [3, 7], "x": 7.25, "y": 3.0 },
{ "matrix": [3, 8], "x": 8.25, "y": 3.0 },
{ "matrix": [3, 9], "x": 9.25, "y": 3.0 },
{ "matrix": [3, 10], "x": 10.25, "y": 3.0 },
{ "matrix": [3, 11], "x": 11.25, "y": 3.0 },
{ "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
{ "matrix": [3, 13], "x": 14.0, "y": 3.0 },
{ "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
{ "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
{ "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
{ "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
{ "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
{ "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
{ "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
{ "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 }
]
}
}
}
36 changes: 12 additions & 24 deletions keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,40 @@
/* Copyright 2020 Jason Williams (Wilba)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2023 Jason Williams (@wilba)
// SPDX-License-Identifier: GPL-2.0-or-later

// Default layout for WT60-H1
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

// Default layer
[0] = LAYOUT_60_tsangan_hhkb(
[0] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_RCTL),

// Fn1 Layer
[1] = LAYOUT_60_tsangan_hhkb(
[1] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

// Fn2 Layer
[2] = LAYOUT_60_tsangan_hhkb(
[2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

// Fn3 Layer
[3] = LAYOUT_60_tsangan_hhkb(
[3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
4 changes: 3 additions & 1 deletion keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#include "../default/keymap.c"
// Copyright 2023 Jason Williams (@wilba)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "../default/keymap.c"
17 changes: 0 additions & 17 deletions keyboards/wilba_tech/wt60_h1/wt60_h1.c
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions keyboards/wilba_tech/wt60_h1/wt60_h1.h
View file
Open in desktop

This file was deleted.

34 changes: 2 additions & 32 deletions keyboards/wilba_tech/wt60_h3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,8 @@
/* Copyright 2020 Jason Williams (Wilba)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2023 Jason Williams (@wilba)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once


/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
Loading