From f6de4085a099073dd0277691ec5aa3aaa1998a91 Mon Sep 17 00:00:00 2001 From: mkdl <56965481+mkdl@users.noreply.github.com> Date: Sun, 21 Feb 2021 05:06:51 +0100 Subject: [PATCH] added unix60, moved togehter with southpaw75 into fr4 folder (#11195) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/{ => fr4}/southpaw75/config.h | 0 keyboards/{ => fr4}/southpaw75/info.json | 0 .../southpaw75/keymaps/default/keymap.c | 0 keyboards/{ => fr4}/southpaw75/readme.md | 0 keyboards/{ => fr4}/southpaw75/rules.mk | 0 keyboards/{ => fr4}/southpaw75/southpaw75.c | 0 keyboards/{ => fr4}/southpaw75/southpaw75.h | 0 keyboards/fr4/unix60/config.h | 42 +++++++++++++++++++ keyboards/fr4/unix60/info.json | 12 ++++++ keyboards/fr4/unix60/keymaps/default/keymap.c | 38 +++++++++++++++++ keyboards/fr4/unix60/readme.md | 15 +++++++ keyboards/fr4/unix60/rules.mk | 22 ++++++++++ keyboards/fr4/unix60/unix60.c | 17 ++++++++ keyboards/fr4/unix60/unix60.h | 36 ++++++++++++++++ 14 files changed, 182 insertions(+) rename keyboards/{ => fr4}/southpaw75/config.h (100%) rename keyboards/{ => fr4}/southpaw75/info.json (100%) rename keyboards/{ => fr4}/southpaw75/keymaps/default/keymap.c (100%) rename keyboards/{ => fr4}/southpaw75/readme.md (100%) rename keyboards/{ => fr4}/southpaw75/rules.mk (100%) rename keyboards/{ => fr4}/southpaw75/southpaw75.c (100%) rename keyboards/{ => fr4}/southpaw75/southpaw75.h (100%) create mode 100644 keyboards/fr4/unix60/config.h create mode 100644 keyboards/fr4/unix60/info.json create mode 100644 keyboards/fr4/unix60/keymaps/default/keymap.c create mode 100644 keyboards/fr4/unix60/readme.md create mode 100644 keyboards/fr4/unix60/rules.mk create mode 100644 keyboards/fr4/unix60/unix60.c create mode 100644 keyboards/fr4/unix60/unix60.h diff --git a/keyboards/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h similarity index 100% rename from keyboards/southpaw75/config.h rename to keyboards/fr4/southpaw75/config.h diff --git a/keyboards/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json similarity index 100% rename from keyboards/southpaw75/info.json rename to keyboards/fr4/southpaw75/info.json diff --git a/keyboards/southpaw75/keymaps/default/keymap.c b/keyboards/fr4/southpaw75/keymaps/default/keymap.c similarity index 100% rename from keyboards/southpaw75/keymaps/default/keymap.c rename to keyboards/fr4/southpaw75/keymaps/default/keymap.c diff --git a/keyboards/southpaw75/readme.md b/keyboards/fr4/southpaw75/readme.md similarity index 100% rename from keyboards/southpaw75/readme.md rename to keyboards/fr4/southpaw75/readme.md diff --git a/keyboards/southpaw75/rules.mk b/keyboards/fr4/southpaw75/rules.mk similarity index 100% rename from keyboards/southpaw75/rules.mk rename to keyboards/fr4/southpaw75/rules.mk diff --git a/keyboards/southpaw75/southpaw75.c b/keyboards/fr4/southpaw75/southpaw75.c similarity index 100% rename from keyboards/southpaw75/southpaw75.c rename to keyboards/fr4/southpaw75/southpaw75.c diff --git a/keyboards/southpaw75/southpaw75.h b/keyboards/fr4/southpaw75/southpaw75.h similarity index 100% rename from keyboards/southpaw75/southpaw75.h rename to keyboards/fr4/southpaw75/southpaw75.h diff --git a/keyboards/fr4/unix60/config.h b/keyboards/fr4/unix60/config.h new file mode 100644 index 0000000000..53d2104fdd --- /dev/null +++ b/keyboards/fr4/unix60/config.h @@ -0,0 +1,42 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 . + */ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4652 // "FR" +#define PRODUCT_ID 0x5558 // "UX" +#define DEVICE_VER 0x0001 +#define MANUFACTURER FR4Boards +#define PRODUCT unix60 + +/* key matrix size */ +#define MATRIX_ROWS 7 +#define MATRIX_COLS 9 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7 } +#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json new file mode 100644 index 0000000000..04b2cf62d5 --- /dev/null +++ b/keyboards/fr4/unix60/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "unix60", + "url": "https://github.com/mkdl/Unix60", + "maintainer": "mkdl", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "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, "w":0.6}, {"x":13.6, "y":0, "w":0.8}, {"x":14.4, "y":0, "w":0.6}, {"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}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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":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}] + } + } +} diff --git a/keyboards/fr4/unix60/keymaps/default/keymap.c b/keyboards/fr4/unix60/keymaps/default/keymap.c new file mode 100644 index 0000000000..0a0a6b9742 --- /dev/null +++ b/keyboards/fr4/unix60/keymaps/default/keymap.c @@ -0,0 +1,38 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + 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_B, KC_BSPC, KC_C, + 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_BSLS, + 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_BSLS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_A, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) + ), + + LAYOUT_all( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, 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_LEFT, KC_DOWN, KC_RGHT, 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 + ), + +}; diff --git a/keyboards/fr4/unix60/readme.md b/keyboards/fr4/unix60/readme.md new file mode 100644 index 0000000000..eab1ee9446 --- /dev/null +++ b/keyboards/fr4/unix60/readme.md @@ -0,0 +1,15 @@ +# Unix60 + +![unix60](https://i.imgur.com/ldvKr90l.jpg) + +HHKB layout FR4 Board + +* Keyboard Maintainer: [mkdl](https://github.com/mkdl/) +* Hardware Supported: Unix60 Pro Micro PCB +* Hardware Availability: https://github.com/mkdl/unix60 + +Make example for this keyboard (after setting up your build environment): + + make unix60:default + +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). diff --git a/keyboards/fr4/unix60/rules.mk b/keyboards/fr4/unix60/rules.mk new file mode 100644 index 0000000000..8a411ac604 --- /dev/null +++ b/keyboards/fr4/unix60/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fr4/unix60/unix60.c b/keyboards/fr4/unix60/unix60.c new file mode 100644 index 0000000000..80fd383316 --- /dev/null +++ b/keyboards/fr4/unix60/unix60.c @@ -0,0 +1,17 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 . + */ +#include "unix60.h" diff --git a/keyboards/fr4/unix60/unix60.h b/keyboards/fr4/unix60/unix60.h new file mode 100644 index 0000000000..fa238da9eb --- /dev/null +++ b/keyboards/fr4/unix60/unix60.h @@ -0,0 +1,36 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 . + */ +#pragma once + + +#include "quantum.h" + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ + K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \ + K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, \ + K48, K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ + K64, K65, K66, K67, K68 \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67, K68 } \ +}