Skip to content

Commit 4ff4c05

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 816accd + cda1792 commit 4ff4c05

File tree

10 files changed

+329
-5
lines changed

10 files changed

+329
-5
lines changed

‎keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
#include QMK_KEYBOARD_H
1919
#include "animation_frames.h"
20-
#include <stdio.h>
21-
2220

2321
enum layer_names {
2422
_BASE,
@@ -97,7 +95,6 @@ uint32_t anim_timer = 0;
9795
uint32_t anim_sleep = 0;
9896
uint8_t current_idle_frame = 0;
9997

100-
char wpm_str[10];
10198
bool tap_anim = false;
10299
bool tap_anim_toggle = false;
103100

@@ -161,8 +158,16 @@ static void render_anim(void) {
161158
void oled_task_user(void) {
162159
render_anim();
163160
oled_set_cursor(0, 14);
164-
sprintf(wpm_str, ">%04d", get_current_wpm());
165-
oled_write_ln(wpm_str, false);
161+
162+
uint8_t n = get_current_wpm();
163+
char wpm_counter[6];
164+
wpm_counter[5] = '\0';
165+
wpm_counter[4] = '0' + n % 10;
166+
wpm_counter[3] = '0' + (n /= 10) % 10;
167+
wpm_counter[2] = '0' + n / 10 ;
168+
wpm_counter[1] = '0';
169+
wpm_counter[0] = '>';
170+
oled_write_ln(wpm_counter, false);
166171
}
167172
#endif
168173

‎keyboards/txuu/config.h

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
Copyright 2021 Matthew Dias <[email protected]>
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#pragma once
19+
20+
#include "config_common.h"
21+
22+
23+
/* USB Device descriptor parameter */
24+
#define VENDOR_ID 0x6D64
25+
#define PRODUCT_ID 0x2809
26+
#define DEVICE_VER 0x0001
27+
#define MANUFACTURER Matthew Dias
28+
#define PRODUCT txuu
29+
30+
/* key matrix size */
31+
#define MATRIX_ROWS 5
32+
#define MATRIX_COLS 16
33+
34+
/* m3n3van PCB default pin-out */
35+
#define MATRIX_ROW_PINS { B1, B0, F7, F4, F1 }
36+
#define MATRIX_COL_PINS { F0, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
37+
#define UNUSED_PINS { }
38+
39+
/* COL2ROW or ROW2COL */
40+
#define DIODE_DIRECTION COL2ROW
41+
42+
/* Set 0 if debouncing isn't needed */
43+
#define DEBOUNCE 5
44+
45+
/*
46+
* Feature disable options
47+
* These options are also useful to firmware size reduction.
48+
*/
49+
50+
/* disable debug print */
51+
//#define NO_DEBUG
52+
53+
/* disable print */
54+
//#define NO_PRINT
55+
56+
/* disable action features */
57+
//#define NO_ACTION_LAYER
58+
//#define NO_ACTION_TAPPING
59+
//#define NO_ACTION_ONESHOT
60+
61+
/* disable these deprecated features by default */
62+
#define NO_ACTION_MACRO
63+
#define NO_ACTION_FUNCTION

‎keyboards/txuu/info.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"keyboard_name": "Txuu",
3+
"maintainer": "matthewdias",
4+
"width": 16,
5+
"height": 5,
6+
"layouts": {
7+
"LAYOUT": {
8+
"layout": [
9+
{"label":"0,0", "x":0, "y":0},
10+
{"label":"0,1", "x":1, "y":0},
11+
{"label":"0,2", "x":2, "y":0},
12+
{"label":"0,3", "x":3, "y":0},
13+
{"label":"0,4", "x":4, "y":0},
14+
{"label":"0,5", "x":5, "y":0},
15+
{"label":"0,6", "x":6, "y":0},
16+
{"label":"0,7", "x":7, "y":0},
17+
{"label":"0,8", "x":8, "y":0},
18+
{"label":"0,9", "x":9, "y":0},
19+
{"label":"0,10", "x":10, "y":0},
20+
{"label":"0,11", "x":11, "y":0},
21+
{"label":"0,12", "x":12, "y":0},
22+
{"label":"0,13", "x":13, "y":0},
23+
{"label":"0,14", "x":14, "y":0},
24+
{"label":"0,15", "x":15, "y":0},
25+
{"label":"1,0", "x":0, "y":1, "w":1.5},
26+
{"label":"1,1", "x":1.5, "y":1},
27+
{"label":"1,2", "x":2.5, "y":1},
28+
{"label":"1,3", "x":3.5, "y":1},
29+
{"label":"1,4", "x":4.5, "y":1},
30+
{"label":"1,5", "x":5.5, "y":1},
31+
{"label":"1,6", "x":6.5, "y":1},
32+
{"label":"1,7", "x":7.5, "y":1},
33+
{"label":"1,8", "x":8.5, "y":1},
34+
{"label":"1,9", "x":9.5, "y":1},
35+
{"label":"1,10", "x":10.5, "y":1},
36+
{"label":"1,11", "x":11.5, "y":1},
37+
{"label":"1,12", "x":12.5, "y":1},
38+
{"label":"1,14", "x":13.5, "y":1, "w":1.5},
39+
{"label":"1,15", "x":15, "y":1},
40+
{"label":"2,0", "x":0, "y":2, "w":1.75},
41+
{"label":"2,1", "x":1.75, "y":2},
42+
{"label":"2,2", "x":2.75, "y":2},
43+
{"label":"2,3", "x":3.75, "y":2},
44+
{"label":"2,4", "x":4.75, "y":2},
45+
{"label":"2,5", "x":5.75, "y":2},
46+
{"label":"2,6", "x":6.75, "y":2},
47+
{"label":"2,7", "x":7.75, "y":2},
48+
{"label":"2,8", "x":8.75, "y":2},
49+
{"label":"2,9", "x":9.75, "y":2},
50+
{"label":"2,10", "x":10.75, "y":2},
51+
{"label":"2,11", "x":11.75, "y":2},
52+
{"label":"2,13", "x":12.75, "y":2, "w":2.25},
53+
{"label":"2,15", "x":15, "y":2},
54+
{"label":"3,0", "x":0, "y":3, "w":2.25},
55+
{"label":"3,2", "x":2.25, "y":3},
56+
{"label":"3,3", "x":3.25, "y":3},
57+
{"label":"3,4", "x":4.25, "y":3},
58+
{"label":"3,5", "x":5.25, "y":3},
59+
{"label":"3,6", "x":6.25, "y":3},
60+
{"label":"3,7", "x":7.25, "y":3},
61+
{"label":"3,8", "x":8.25, "y":3},
62+
{"label":"3,9", "x":9.25, "y":3},
63+
{"label":"3,10", "x":10.25, "y":3},
64+
{"label":"3,11", "x":11.25, "y":3},
65+
{"label":"3,12", "x":12.25, "y":3, "w":1.75},
66+
{"label":"3,14", "x":14, "y":3},
67+
{"label":"3,15", "x":15, "y":3},
68+
{"label":"4,0", "x":0, "y":4, "w":1.25},
69+
{"label":"4,1", "x":1.25, "y":4, "w":1.25},
70+
{"label":"4,3", "x":2.5, "y":4, "w":1.25},
71+
{"label":"4,6", "x":3.75, "y":4, "w":6.25},
72+
{"label":"4,10", "x":10, "y":4, "w":1.25},
73+
{"label":"4,11", "x":11.25, "y":4, "w":1.25},
74+
{"label":"4,13", "x":13, "y":4},
75+
{"label":"4,14", "x":14, "y":4},
76+
{"label":"4,15", "x":15, "y":4}
77+
]
78+
}
79+
}
80+
}

‎keyboards/txuu/keymaps/default/keymap.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
Copyright 2021 Matthew Dias <[email protected]>
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#include QMK_KEYBOARD_H
19+
20+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21+
[0] = LAYOUT(
22+
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_BSPC, KC_BSPC, KC_HOME,
23+
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_PGUP,
24+
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_ENT, KC_PGDN,
25+
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
26+
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
27+
),
28+
29+
[1] = LAYOUT(
30+
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_DEL, KC_DEL, KC_TRNS,
31+
KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
32+
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
33+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
34+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
35+
)
36+
};

‎keyboards/txuu/keymaps/via/keymap.c

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
Copyright 2021 Matthew Dias <[email protected]>
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#include QMK_KEYBOARD_H
19+
20+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21+
[0] = LAYOUT(
22+
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_BSPC, KC_BSPC, KC_HOME,
23+
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_PGUP,
24+
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_ENT, KC_PGDN,
25+
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
26+
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
27+
),
28+
29+
[1] = LAYOUT(
30+
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_DEL, KC_DEL, KC_TRNS,
31+
KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
32+
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
33+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
34+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
35+
),
36+
37+
[2] = LAYOUT(
38+
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,
39+
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,
40+
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,
41+
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,
42+
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
43+
)
44+
};

‎keyboards/txuu/keymaps/via/rules.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VIA_ENABLE = yes

‎keyboards/txuu/readme.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# txuu
2+
3+
A 65% PCB
4+
5+
- Keyboard Maintainer: matthewdias
6+
- Hardware Supported: txuu PCB, Unified Daughterboard
7+
8+
To reset the keyboard into bootloader mode, press the reset switch on the underside.
9+
10+
Make example for this keyboard (after setting up your build environment):
11+
12+
make txuu:default
13+
14+
Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
15+
16+
make txuu:default:flash
17+
18+
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).

‎keyboards/txuu/rules.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# MCU name
2+
MCU = atmega32u4
3+
4+
# Bootloader selection
5+
BOOTLOADER = atmel-dfu
6+
7+
# Build Options
8+
# change yes to no to disable
9+
#
10+
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11+
MOUSEKEY_ENABLE = yes # Mouse keys
12+
EXTRAKEY_ENABLE = yes # Audio control and System control
13+
CONSOLE_ENABLE = no # Console for debug
14+
COMMAND_ENABLE = no # Commands for debug and configuration
15+
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16+
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17+
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18+
NKRO_ENABLE = yes # USB Nkey Rollover
19+
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20+
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21+
BLUETOOTH_ENABLE = no # Enable Bluetooth
22+
AUDIO_ENABLE = no # Audio output

‎keyboards/txuu/txuu.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
Copyright 2021 Matthew Dias <[email protected]>
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#include "txuu.h"

‎keyboards/txuu/txuu.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
Copyright 2021 Matthew Dias <[email protected]>
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
#pragma once
19+
20+
#include "quantum.h"
21+
22+
#define XXX KC_NO
23+
24+
#define LAYOUT( \
25+
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
26+
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
27+
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
28+
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
29+
K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
30+
) \
31+
{ \
32+
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
33+
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
34+
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, K2F }, \
35+
{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, K3F }, \
36+
{ K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F } \
37+
}

0 commit comments

Comments
 (0)