Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-10-01 17:57:17 +00:00
commit 3c9ac5ce58
9 changed files with 171 additions and 7 deletions

View File

@ -1,7 +1,9 @@
# The Uni
# The Uni v1 and v2
![Uni v2](https://i.imgur.com/hIIK8xN.jpg)
- Keyboard Maintainer: [Peter](https://github.com/petercpark)
- Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni)
- Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni) (For personal use only)
- Hardware Supported:
- The Uni v1 and v2 (pro_micro)
- Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)
@ -10,8 +12,8 @@
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).
- **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):

View File

@ -19,13 +19,18 @@ A compact unibody split ortholinear keyboard made specifically for stenography.
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).
- **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):
# version 1 and 2
make the_uni/pro_micro:default
# version 3
make the_uni/usb_c:default
# version 4
qmk compile -kb the_uni/rp_2040 -km 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).

View File

@ -0,0 +1,61 @@
/* Copyright 2019
*
* 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"
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 11
#define MATRIX_COL_PINS { GP24, GP23, GP21, GP20, GP19, GP6, GP5, GP4, GP3, GP2, GP1 }
#define MATRIX_ROW_PINS { GP25, GP18, GP17 }
// #define DEBUG_MATRIX_SCAN_RATE
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
//#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* number of backlight levels */
// #ifdef BACKLIGHT_PIN
// #define BACKLIGHT_LEVELS 3
// #endif
/* 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
// #ifdef RGB_DI_PIN
// #define RGBLIGHT_ANIMATIONS
// #define RGBLED_NUM 0
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
// #endif
// #endif
#define FORCE_NKRO

View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.4"
}
}

View File

@ -0,0 +1,25 @@
# Uni v4
![Uni v4](https://i.imgur.com/HyvMu26h.png)
- Hardware Supported:
- The Uni v4
- Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)
- Uses the rp2040 chip
Make the .uf2 file by doing:
# Bootloader
Enter the bootloader by:
- **Physical boot button**:
- First, unplug the Uni v4.
- Then press and hold the button on the back of the PCB marked "B" while you plug in the keyboard. This will create register the keyboard as a storage device on the computer.
- Copy and paste the .uf2 file in the top directory of the device. Once done, it will automatically reboot the keyboard.
Make examples for this keyboard (after setting up your build environment):
qmk compile -kb the_uni/rp_2040 -km 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).

View File

@ -0,0 +1,17 @@
/* Copyright 2021 Stefan Kerkmann
*
* 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 "rp_2040.h"

View File

@ -0,0 +1,30 @@
/*
Copyright 2021 Peter C. Park <peter@stenokeyboards.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/>.
*/
#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 } \
}

View File

@ -0,0 +1,19 @@
# MCU name
MCU = RP2040
# Bootloader selection
BOOTLOADER = rp2040
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
STENO_ENABLE = yes

View File

@ -1,5 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
"device_version": "0.0.3"
}
}