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.

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 Support for The Uni #14569

Merged
merged 37 commits into from
Oct 17, 2021
Merged
Changes from 35 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
228e90a
switchable keymap added
Aug 4, 2021
8e3fc54
&& git push
Aug 13, 2021
dfbd597
add support for the Uni v3 and update some readmes
Sep 23, 2021
63873a5
make changes based on pr suggestions
Sep 23, 2021
d7ee938
Update keymap.c
petercpark Sep 24, 2021
7fab323
Update keymap.c
petercpark Sep 24, 2021
c86f83c
Update readme.md
petercpark Sep 24, 2021
595b047
Update keyboards/the_uni/usb_c/rules.mk
petercpark Sep 24, 2021
b7ea98e
first commit
petercpark Apr 13, 2021
cdac2a9
Apply suggestions from code review
petercpark Apr 21, 2021
1bb6449
Apply suggestions from code review by ridingqwerty
petercpark May 7, 2021
86488e3
switchable keymap added
Aug 4, 2021
3cea679
&& git push
Aug 13, 2021
a456cee
add support for the Uni v3 and update some readmes
Sep 23, 2021
429ebaa
update readmes for instructions to enter bootloader
Sep 25, 2021
894d994
switchable keymap added
Aug 4, 2021
bef7873
&& git push
Aug 13, 2021
0a0aea1
add support for the Uni v3 and update some readmes
Sep 23, 2021
6f3a95a
make changes based on pr suggestions
Sep 23, 2021
b283962
Update keymap.c
petercpark Sep 24, 2021
a025cbd
Update keymap.c
petercpark Sep 24, 2021
2c2e57d
Update readme.md
petercpark Sep 24, 2021
4e62cfd
first commit
petercpark Apr 13, 2021
309c89d
Apply suggestions from code review
petercpark Apr 21, 2021
d07cc65
Apply suggestions from code review by ridingqwerty
petercpark May 7, 2021
384f793
switchable keymap added
Aug 4, 2021
43fcfda
&& git push
Aug 13, 2021
1d6e6e4
add support for the Uni v3 and update some readmes
Sep 23, 2021
5a0e381
make changes based on pr suggestions
Sep 23, 2021
9a56f47
Update keymap.c
petercpark Sep 24, 2021
f8863f8
Update keymap.c
petercpark Sep 24, 2021
cd77aa6
Update readme.md
petercpark Sep 24, 2021
90295c6
Update keyboards/the_uni/usb_c/rules.mk
petercpark Sep 24, 2021
be13b68
update readmes for instructions to enter bootloader
Sep 25, 2021
cda1fad
Additional fixes
drashna Oct 11, 2021
20d80e2
Apply suggestions from code review by fauxpark
petercpark Oct 12, 2021
479ef4b
Apply more suggestions from code review by fauxpark
petercpark Oct 12, 2021
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
53 changes: 6 additions & 47 deletions keyboards/the_uni/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -19,59 +19,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keymap_steno.h"

enum uni_layers {
/*
_QWERTY,
_CHOOSE,
*/
_PLOVER,
};

/*
enum uni_keycodes {
PLOVER,
QWERTY
_PLOVER,
};
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
[_QWERTY] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, LT(_CHOOSE, KC_T), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_1, KC_C, KC_V, KC_N, KC_M, KC_2),

[_CHOOSE] = LAYOUT(
_______, _______, _______, _______, _______, PLOVER, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
*/
[_PLOVER] = LAYOUT(
STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR ,
STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR ,
STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N2),
[_PLOVER] = LAYOUT(
STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR ,
STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR ,
STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N2),

};

/*
switch (keycode) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case PLOVER:
if (!record->event.pressed) {
layer_on(_PLOVER);
}
return false;
break;
case QWERTY:
if (!record->event.pressed) {
layer_on(_QWERTY);
}
return false;
break;
}
return true;
}
*/

void matrix_init_user() {
steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
}
57 changes: 5 additions & 52 deletions keyboards/the_uni/keymaps/qwerty/keymap.c
Original file line number Diff line number Diff line change
@@ -16,62 +16,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
//#include "keymap_steno.h"

enum uni_layers {
_QWERTY,
/*
_CHOOSE,
_PLOVER,
*/
_QWERTY,
};

/*
enum uni_keycodes {
PLOVER,
QWERTY
};
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_1, KC_C, KC_V, KC_N, KC_M, KC_2),
/*
[_CHOOSE] = LAYOUT(
_______, _______, _______, _______, _______, PLOVER, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
[_PLOVER] = LAYOUT(
STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR ,
STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR ,
STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N2),
*/
[_QWERTY] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_1, KC_C, KC_V, KC_N, KC_M, KC_2),

};

/*
switch (keycode) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case PLOVER:
if (!record->event.pressed) {
layer_on(_PLOVER);
}
return false;
break;
case QWERTY:
if (!record->event.pressed) {
layer_on(_QWERTY);
}
return false;
break;
}
return true;
}
*/

void matrix_init_user() {
//steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
}
File renamed without changes.
18 changes: 18 additions & 0 deletions keyboards/the_uni/pro_micro/pro_micro.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
Copyright 2021 Peter C. Park <[email protected]>
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/>.
*/

#include "pro_micro.h"
File renamed without changes.
20 changes: 20 additions & 0 deletions keyboards/the_uni/pro_micro/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# The Uni

- Keyboard Maintainer: [Peter](https://github.com/petercpark)
- Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni)
- Hardware Supported:
- The Uni v1 and v2 (pro_micro)
- Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)

# Bootloader

Enter the bootloader by:

* **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
* **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).

Make examples for this keyboard (after setting up your build environment):

make the_uni/pro_micro: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).
20 changes: 20 additions & 0 deletions keyboards/the_uni/pro_micro/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# MCU name
MCU = atmega32u4

# Bootloader
petercpark marked this conversation as resolved.
Show resolved Hide resolved
BOOTLOADER = caterina

# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
EXTRAKEY_ENABLE = no
MOUSEKEY_ENABLE = no # Mouse keys
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no

STENO_ENABLE = yes
petercpark marked this conversation as resolved.
Show resolved Hide resolved
30 changes: 21 additions & 9 deletions keyboards/the_uni/readme.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
# The Uni

![The Uni](https://raw.githubusercontent.com/petercpark/The_Uni/main/Pics/layout.png)
![The Uni Closeup](https://github.com/petercpark/The_Uni/blob/main/Pics/close-up-uni.jpg?raw=true)
![Layout](https://docs.stenokeyboards.com/images/uni-layout.png)
![The Uni v2](https://github.com/petercpark/The_Uni/blob/main/Pics/uni%20v2/uni-v2.JPG?raw=true)

A compact unibody split ortholinear keyboard made specifically for stenography.

- Keyboard Maintainer: [Peter C. Park](https://github.com/petercpark)
- Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni)
- Hardware Supported: The Uni v1 and v2 (pro micro or equivalent)
- Hardware Availability: [website](https://www.stenokeyboards.com)
- Keyboard Maintainer: [Peter](https://github.com/petercpark)
- Link to Keyboard Files (pro_micro version): [https://github.com/petercpark/The_Uni](https://github.com/petercpark/The_Uni)
- Hardware Supported:

Make example for this keyboard (after setting up your build environment):
- The Uni v1 and v2 (pro_micro)
- The Uni v3 (usb_c)

make the_uni:default
- Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)

To enter the bootloader, short the rst and gnd pins with a conductive material such as a tweezer or a wire. Uni v2 will have reset pads next to the pro micro so you can short these pads to reset the pro micro.
# Bootloader

Enter the bootloader by:

* **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
* **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).

Make examples for this keyboard (after setting up your build environment):

make the_uni/pro_micro:default

make the_uni/usb_c: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).
21 changes: 0 additions & 21 deletions keyboards/the_uni/rules.mk

This file was deleted.

52 changes: 52 additions & 0 deletions keyboards/the_uni/usb_c/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
Copyright 2021 Peter C. Park <[email protected]>
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/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x9000
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0002
#define MANUFACTURER stenokeyboards
#define PRODUCT The Uni

/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 11

/* key matrix pins */
#define MATRIX_ROW_PINS { B7, D6, C7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D5, D3, D2, D1, D0, D4 }
#define UNUSED_PINS

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE


/*force the nkro if it does not work*/
#define FORCE_NKRO
20 changes: 20 additions & 0 deletions keyboards/the_uni/usb_c/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# The Uni v3 Firmware

- Keyboard Maintainer: [Peter](https://github.com/petercpark)
- Link to Keyboard Files: Not Available
- Hardware Supported:
- The Uni v3 (usb_c)
- Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)

## Bootloader

Enter the bootloader by:

* **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
* **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).

Make examples for this keyboard (after setting up your build environment):
drashna marked this conversation as resolved.
Show resolved Hide resolved

make the_uni/usb_c: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).
20 changes: 20 additions & 0 deletions keyboards/the_uni/usb_c/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# MCU name
MCU = atmega32u4

# Bootloader
petercpark marked this conversation as resolved.
Show resolved Hide resolved
BOOTLOADER = atmel-dfu

# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
EXTRAKEY_ENABLE = no
MOUSEKEY_ENABLE = no # Mouse keys
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no

STENO_ENABLE = yes
petercpark marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "the_uni.h"
#include "usb_c.h"
30 changes: 30 additions & 0 deletions keyboards/the_uni/usb_c/usb_c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
Copyright 2021 Peter C. Park <[email protected]>
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/>.
*/

#pragma once

#include "quantum.h"

#define LAYOUT( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
K202, K203, K204, K205, K206, K207 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
{ KC_NO, KC_NO, K202, K203, K204, K205, K206, K207, KC_NO, KC_NO, KC_NO } \
}