[Keyboard] Unigo66 fixes and improvements (#5060)
* UniGo66 keyboard added * UniGo66 keyboard added * case correction of unigo66 files * create sirius folder * Update keyboards/sirius/unigo66/rules.mk Co-Authored-By: danielhklein <danielklein@utexas.edu> * Update keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c Co-Authored-By: danielhklein <danielklein@utexas.edu> * Update keyboards/sirius/unigo66/keymaps/default/config.h Co-Authored-By: danielhklein <danielklein@utexas.edu> * Update keyboards/sirius/unigo66/keymaps/danielhklein/config.h Co-Authored-By: danielhklein <danielklein@utexas.edu> * debugging * correct keymap to layout * readme * remove common config * suggested changes to config.h * updates and fixes
This commit is contained in:
Daniel H Klein
committed by
Drashna Jaelre
Drashna Jaelre
parent
6affec582b
commit
76da6ec061
File diff suppressed because it is too large
Load Diff
@@ -6,53 +6,115 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | Bsp |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | Tab | Q | W | E | R | T | L1 | | [ | Y | U | I | O | P | \ |
|
||||
* | Tab | Q | W | E | R | T | PgUp | | [ | Y | U | I | O | P | \ |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | Caps | A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
|
||||
* |--------+------+------+------+------+------| L2 | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | Up |
|
||||
* | Caps | A | S | D | F | G |------| |------| H | J | K | L | ; | Enter |
|
||||
* |--------+------+------+------+------+------| PgDn | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | N | M | , | . | Up |M2/Shift|
|
||||
* `--------+------+------+---------------------------' `---------------------------+------+------+--------'
|
||||
* | Ctrl | Super| Alt | | Left | Down| Right |
|
||||
* | Ctrl | Gui | Alt | | Left | Down| Right |
|
||||
* `--------------------' `--------------------'
|
||||
* ,------|------. ,---------------.
|
||||
* | | PgUp | | Home | |
|
||||
* | Space|------| |------| Enter |
|
||||
* | | PgDn | | End | |
|
||||
* ,-------------. ,---------------.
|
||||
* | | Ins | | Home | |
|
||||
* | Space|------| |------|M1/Space|
|
||||
* | | Del | | End | |
|
||||
* `-------------' `---------------'
|
||||
*/
|
||||
[0] = LAYOUT(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
|
||||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, TG(2), KC_RBRC, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_UP ,
|
||||
KC_LCTL, KC_LGUI,KC_LALT, KC_LEFT,KC_DOWN, KC_RGHT,
|
||||
KC_SPC, KC_PGUP, KC_HOME, KC_ENT,
|
||||
KC_SPC, KC_PGDN, KC_END, KC_ENT
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_PGUP, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
|
||||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGDN, KC_RBRC, KC_N, KC_M, KC_COMM,KC_DOT, KC_UP, LM(2,MOD_RSFT),
|
||||
KC_LCTL, KC_LGUI,KC_LALT, KC_LEFT,KC_DOWN, KC_RGHT,
|
||||
KC_SPC, KC_INS, KC_HOME, LT(1,KC_SPC),
|
||||
KC_NO , KC_DEL, KC_END, KC_NO
|
||||
),
|
||||
/*
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | ~ | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | Del |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | |------| |------| | | | | | ' |
|
||||
* |--------+------+------+------+------+------| | | M3 |------+------+------+------+------+--------|
|
||||
* | | Mute | Vol- | Vol+ | | | | | | | | | | / | |
|
||||
* `--------+------+------+---------------------------' `---------------------------+------+------+--------'
|
||||
* | | | | | | | |
|
||||
* `--------------------' `--------------------'
|
||||
* ,-------------. ,---------------.
|
||||
* | | | | | |
|
||||
* | |------| |------| |
|
||||
* | | | | | |
|
||||
* `-------------' `---------------'
|
||||
*/
|
||||
[1] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______,
|
||||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT,
|
||||
_______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, TG(3), _______, _______, _______, _______, KC_SLSH, _______,
|
||||
_______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______
|
||||
),
|
||||
/*
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | |------| |------| | | | | | ' |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | | | / | |
|
||||
* `--------+------+------+---------------------------' `---------------------------+------+------+--------'
|
||||
* | | | | | | | |
|
||||
* `--------------------' `--------------------'
|
||||
* ,-------------. ,---------------.
|
||||
* | | | | | |
|
||||
* | |------| |------| |
|
||||
* | | | | | |
|
||||
* `-------------' `---------------'
|
||||
*/
|
||||
[2] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______,
|
||||
_______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______
|
||||
),
|
||||
/*
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | | | | | | | | | | | Calc |NumLoc| / | * | - |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | 7 | 8 | 9 | + |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | |------| |------| | | 4 | 5 | 6 | = |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | 1 | 2 | 3 | Enter |
|
||||
* `--------+------+------+---------------------------' `---------------------------+------+------+--------'
|
||||
* | | | | | 0 | . | Enter|
|
||||
* `--------------------' `--------------------'
|
||||
* ,-------------. ,---------------.
|
||||
* | | | | | |
|
||||
* | |------| |------| |
|
||||
* | | | | | |
|
||||
* `-------------' `---------------'
|
||||
*/
|
||||
[3] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PEQL,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT,
|
||||
_______, _______, _______, KC_P0, KC_PDOT,KC_PENT,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______
|
||||
),
|
||||
};
|
||||
|
||||
void matrix_init_user(void) {
|
||||
|
||||
}
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "keyboard.h"
|
||||
#include "led.h"
|
||||
|
||||
|
||||
/* LED ping configuration */
|
||||
#define TMK_LED
|
||||
//#define LEONARDO_LED
|
||||
@@ -87,6 +86,12 @@ int main(void)
|
||||
}
|
||||
*/
|
||||
|
||||
/* wait for USB startup to get ready for debug output */
|
||||
uint8_t timeout = 255; // timeout when USB is not available(Bluetooth)
|
||||
while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) {
|
||||
_delay_ms(4);
|
||||
}
|
||||
|
||||
debug("init: done\n");
|
||||
|
||||
for (;;) {
|
||||
|
||||
17
keyboards/sirius/unigo66/readme.md
Normal file
17
keyboards/sirius/unigo66/readme.md
Normal file
@@ -0,0 +1,17 @@
|
||||
# UniGo66
|
||||
|
||||
|
||||
|
||||
The UniGo66 is an ergonomic wireless keyboard designed by Sirius and manufactured by ALF Studios.
|
||||
|
||||
Join ALF Studios on [Discord](https://discord.gg/GJ8bdM)
|
||||
|
||||
Make example:
|
||||
|
||||
make sirius/unigo66: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).
|
||||
|
||||
To get the U2U into DFU flashing mode, insert the U2U into the computer and press the button in the red circle shown below
|
||||
|
||||
|
||||
@@ -26,5 +26,4 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||
USB_HID_ENABLE = yes
|
||||
|
||||
CUSTOM_MATRIX = yes
|
||||
SRC += custom_matrix.cpp \
|
||||
main.c
|
||||
SRC = custom_matrix.cpp
|
||||
|
||||
@@ -1,5 +1,22 @@
|
||||
#ifndef UNIGO66_H
|
||||
#define UNIGO66_H
|
||||
/*
|
||||
Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
|
||||
|
||||
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/>.
|
||||
*/
|
||||
|
||||
#ifndef USB_USB_H
|
||||
#define USB_USB_H
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
@@ -19,9 +36,31 @@
|
||||
* |-----------------------------------------------------------| ,-----------. |---------------| |-------|
|
||||
* |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut|
|
||||
* `-----------------------------------------------------------' `-----------' `---------------' `-------'
|
||||
|
||||
*
|
||||
*
|
||||
* App: Windows Menu key
|
||||
* Gui: Windows key, Mac ⌘ key or Meta key
|
||||
*
|
||||
* Pwr: Power for Unix and Mac
|
||||
* VDn,Vup,Mut: Volume control for Unix and Mac
|
||||
* Stp,Agn..: for Unix
|
||||
*
|
||||
* KP,: Brazilian Keypad Comma
|
||||
* KP=: Keypad = for Mac
|
||||
* <,#: ISO keys(UK legend)
|
||||
* JPY: Japanese Yen(￥)
|
||||
* RO: Japanese ろ or Brazilian /
|
||||
* MHEN: Japanese 無変換 Non Conversion
|
||||
* HENK: Japanese 変換 Conversion
|
||||
* KANA: Japanese かな Hiragana/Katakana
|
||||
* https://en.wikipedia.org/wiki/Keyboard_layout#Japanese
|
||||
* H/E: Korean 한/영 Hangul/English
|
||||
* HNJ: Korean 한자 Hanja
|
||||
* https://en.wikipedia.org/wiki/Keyboard_layout#Hangul_.28for_Korean.29
|
||||
*
|
||||
* TODO: use same keycode to pass through instead of KC_NO?
|
||||
*/
|
||||
#define LAYOUT_ALL( \
|
||||
#define LAYOUT_all( \
|
||||
K68,K69,K6A,K6B,K6C,K6D,K6E,K6F,K70,K71,K72,K73, \
|
||||
K29, K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45, K46,K47,K48, K81,K80,K7F,K66, K75, \
|
||||
K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A, K49,K4A,K4B, K53,K54,K55,K56, K78,K79, \
|
||||
@@ -64,25 +103,6 @@
|
||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | Bsp |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | Tab | Q | W | E | R | T | L1 | | [ | Y | U | I | O | P | \ |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | Caps | A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
|
||||
* |--------+------+------+------+------+------| L2 | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | Up |
|
||||
* `--------+------+------+---------------------------' `---------------------------+------+------+--------'
|
||||
* | Ctrl | Super| Alt | | Left | Down| Right |
|
||||
* `--------------------' `--------------------'
|
||||
* ,------|------. ,---------------.
|
||||
* | | PgUp | | Home | |
|
||||
* | Space|------| |------| Enter |
|
||||
* | | PgDn | | End | |
|
||||
* `-------------' `---------------'
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
K29,K1E,K1F,K20,K21,K22,K2D, K2E,K23,K24,K25,K26,K27,K2A,\
|
||||
K2B,K14,K1A,K08,K15,K17,K4B, K2F,K1C,K18,K0C,K12,K13,K31,\
|
||||
@@ -91,9 +111,9 @@
|
||||
KE0,KE3,KE2, K50,K51,K4F,\
|
||||
K2C,K49, K4A,K28, \
|
||||
KE6,K4C, K4D,KE4 \
|
||||
) LAYOUT_ALL( \
|
||||
) LAYOUT_all( \
|
||||
KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, \
|
||||
K29, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO,KC_NO, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,\
|
||||
K29, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO,KC_NO, KC_NO,KC_NO,KC_NO,KC_NO, KC_NO, \
|
||||
KC_NO,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,KC_NO,K2A, K49,K4A,K4B, KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO, \
|
||||
K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30, K31, K4C,K4D,K4E, KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO, \
|
||||
K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34, KC_NO,K28, KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO, \
|
||||
|
||||
Reference in New Issue
Block a user