From fae66c9e81da5b9cededc5ed4ea2c853b3687f94 Mon Sep 17 00:00:00 2001 From: sunsetsonwheels Date: Sat, 14 Dec 2024 22:50:59 +1100 Subject: [PATCH 1/2] Port Swiss to VIAL --- keyboards/swiss/keyboard.json | 2 +- keyboards/swiss/keymaps/vial/config.h | 9 ++ keyboards/swiss/keymaps/vial/keymap.c | 23 +++++ keyboards/swiss/keymaps/vial/rules.mk | 3 + keyboards/swiss/keymaps/vial/vial.json | 135 +++++++++++++++++++++++++ keyboards/swiss/readme.md | 17 ++-- 6 files changed, 179 insertions(+), 10 deletions(-) create mode 100644 keyboards/swiss/keymaps/vial/config.h create mode 100644 keyboards/swiss/keymaps/vial/keymap.c create mode 100644 keyboards/swiss/keymaps/vial/rules.mk create mode 100644 keyboards/swiss/keymaps/vial/vial.json diff --git a/keyboards/swiss/keyboard.json b/keyboards/swiss/keyboard.json index 039153cd7f5..c033727b376 100644 --- a/keyboards/swiss/keyboard.json +++ b/keyboards/swiss/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "Bregoli", - "keyboard_name": "swiss", + "keyboard_name": "Swiss", "maintainer": "Bregoli", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/swiss/keymaps/vial/config.h b/keyboards/swiss/keymaps/vial/config.h new file mode 100644 index 00000000000..4c52e1773fc --- /dev/null +++ b/keyboards/swiss/keymaps/vial/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID { 0xC5, 0x64, 0x74, 0x99, 0xA3, 0x2A, 0x18, 0x39 } + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } + +#define VIAL_UNLOCK_COMBO_COLS { 0, 12 } \ No newline at end of file diff --git a/keyboards/swiss/keymaps/vial/keymap.c b/keyboards/swiss/keymaps/vial/keymap.c new file mode 100644 index 00000000000..7f7d2ef6033 --- /dev/null +++ b/keyboards/swiss/keymaps/vial/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [0] = LAYOUT_60_hhkb( + 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), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + /* FN */ + [1] = LAYOUT_60_hhkb( + 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_SLCT, 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 + ) +}; + diff --git a/keyboards/swiss/keymaps/vial/rules.mk b/keyboards/swiss/keymaps/vial/rules.mk new file mode 100644 index 00000000000..4852be61c54 --- /dev/null +++ b/keyboards/swiss/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/swiss/keymaps/vial/vial.json b/keyboards/swiss/keymaps/vial/vial.json new file mode 100644 index 00000000000..ac592faa166 --- /dev/null +++ b/keyboards/swiss/keymaps/vial/vial.json @@ -0,0 +1,135 @@ +{ + "name": "Swiss", + "vendorId": "0x4C43", + "productId": "0x0420", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,12" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,11", + "3,12" + ], + [ + { + "x": 1.5 + }, + "4,0", + { + "w": 1.5 + }, + "4,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,5", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10", + "4,12" + ] + ] + } +} \ No newline at end of file diff --git a/keyboards/swiss/readme.md b/keyboards/swiss/readme.md index 779f7dcc7fa..43658fe3013 100644 --- a/keyboards/swiss/readme.md +++ b/keyboards/swiss/readme.md @@ -3,26 +3,25 @@ ![Swiss](https://i.imgur.com/8G6MB5D.png) An HHKB that looks like... Cheese? -A fun, not so serious, ridiculously cheesy keyboard. +A fun, not so serious, ridiculously cheesy keyboard. -* Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0) -* Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard +- Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0) +- Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard Make example for this keyboard (after setting up your build environment): - make swiss:default + make swiss:vial Flashing example for this keyboard: - make swiss:default:flash + make swiss:vial:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). - ## Bootloader Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 84b9ae9b356d84a900f2308a4ee7a39c4bb936fe Mon Sep 17 00:00:00 2001 From: sunsetsonwheels Date: Sun, 15 Dec 2024 06:50:08 +1100 Subject: [PATCH 2/2] Revert some changes --- keyboards/swiss/keyboard.json | 2 +- keyboards/swiss/keymaps/vial/config.h | 2 +- keyboards/swiss/keymaps/vial/vial.json | 3 --- keyboards/swiss/readme.md | 17 +++++++++-------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/keyboards/swiss/keyboard.json b/keyboards/swiss/keyboard.json index c033727b376..039153cd7f5 100644 --- a/keyboards/swiss/keyboard.json +++ b/keyboards/swiss/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "Bregoli", - "keyboard_name": "Swiss", + "keyboard_name": "swiss", "maintainer": "Bregoli", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/swiss/keymaps/vial/config.h b/keyboards/swiss/keymaps/vial/config.h index 4c52e1773fc..8649592c3ce 100644 --- a/keyboards/swiss/keymaps/vial/config.h +++ b/keyboards/swiss/keymaps/vial/config.h @@ -4,6 +4,6 @@ #define VIAL_KEYBOARD_UID { 0xC5, 0x64, 0x74, 0x99, 0xA3, 0x2A, 0x18, 0x39 } +// Esc + Enter #define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } - #define VIAL_UNLOCK_COMBO_COLS { 0, 12 } \ No newline at end of file diff --git a/keyboards/swiss/keymaps/vial/vial.json b/keyboards/swiss/keymaps/vial/vial.json index ac592faa166..2a3f3f44ef7 100644 --- a/keyboards/swiss/keymaps/vial/vial.json +++ b/keyboards/swiss/keymaps/vial/vial.json @@ -1,7 +1,4 @@ { - "name": "Swiss", - "vendorId": "0x4C43", - "productId": "0x0420", "matrix": { "rows": 5, "cols": 15 diff --git a/keyboards/swiss/readme.md b/keyboards/swiss/readme.md index 43658fe3013..779f7dcc7fa 100644 --- a/keyboards/swiss/readme.md +++ b/keyboards/swiss/readme.md @@ -3,25 +3,26 @@ ![Swiss](https://i.imgur.com/8G6MB5D.png) An HHKB that looks like... Cheese? -A fun, not so serious, ridiculously cheesy keyboard. +A fun, not so serious, ridiculously cheesy keyboard. -- Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0) -- Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard +* Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0) +* Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard Make example for this keyboard (after setting up your build environment): - make swiss:vial + make swiss:default Flashing example for this keyboard: - make swiss:vial:flash + make swiss:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + ## Bootloader Enter the bootloader in 3 ways: -- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available