Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jul 23, 2021
2 parents 816accd + cda1792 commit 4ff4c05
Show file tree
Hide file tree
Showing 10 changed files with 329 additions and 5 deletions.
15 changes: 10 additions & 5 deletions keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
*/
#include QMK_KEYBOARD_H
#include "animation_frames.h"
#include <stdio.h>


enum layer_names {
_BASE,
Expand Down Expand Up @@ -97,7 +95,6 @@ uint32_t anim_timer = 0;
uint32_t anim_sleep = 0;
uint8_t current_idle_frame = 0;

char wpm_str[10];
bool tap_anim = false;
bool tap_anim_toggle = false;

Expand Down Expand Up @@ -161,8 +158,16 @@ static void render_anim(void) {
void oled_task_user(void) {
render_anim();
oled_set_cursor(0, 14);
sprintf(wpm_str, ">%04d", get_current_wpm());
oled_write_ln(wpm_str, false);

uint8_t n = get_current_wpm();
char wpm_counter[6];
wpm_counter[5] = '\0';
wpm_counter[4] = '0' + n % 10;
wpm_counter[3] = '0' + (n /= 10) % 10;
wpm_counter[2] = '0' + n / 10 ;
wpm_counter[1] = '0';
wpm_counter[0] = '>';
oled_write_ln(wpm_counter, false);
}
#endif

Expand Down
63 changes: 63 additions & 0 deletions keyboards/txuu/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
Copyright 2021 Matthew Dias <[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 0x6D64
#define PRODUCT_ID 0x2809
#define DEVICE_VER 0x0001
#define MANUFACTURER Matthew Dias
#define PRODUCT txuu

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16

/* m3n3van PCB default pin-out */
#define MATRIX_ROW_PINS { B1, B0, F7, F4, F1 }
#define MATRIX_COL_PINS { F0, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
#define UNUSED_PINS { }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

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

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
80 changes: 80 additions & 0 deletions keyboards/txuu/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"keyboard_name": "Txuu",
"maintainer": "matthewdias",
"width": 16,
"height": 5,
"layouts": {
"LAYOUT": {
"layout": [
{"label":"0,0", "x":0, "y":0},
{"label":"0,1", "x":1, "y":0},
{"label":"0,2", "x":2, "y":0},
{"label":"0,3", "x":3, "y":0},
{"label":"0,4", "x":4, "y":0},
{"label":"0,5", "x":5, "y":0},
{"label":"0,6", "x":6, "y":0},
{"label":"0,7", "x":7, "y":0},
{"label":"0,8", "x":8, "y":0},
{"label":"0,9", "x":9, "y":0},
{"label":"0,10", "x":10, "y":0},
{"label":"0,11", "x":11, "y":0},
{"label":"0,12", "x":12, "y":0},
{"label":"0,13", "x":13, "y":0},
{"label":"0,14", "x":14, "y":0},
{"label":"0,15", "x":15, "y":0},
{"label":"1,0", "x":0, "y":1, "w":1.5},
{"label":"1,1", "x":1.5, "y":1},
{"label":"1,2", "x":2.5, "y":1},
{"label":"1,3", "x":3.5, "y":1},
{"label":"1,4", "x":4.5, "y":1},
{"label":"1,5", "x":5.5, "y":1},
{"label":"1,6", "x":6.5, "y":1},
{"label":"1,7", "x":7.5, "y":1},
{"label":"1,8", "x":8.5, "y":1},
{"label":"1,9", "x":9.5, "y":1},
{"label":"1,10", "x":10.5, "y":1},
{"label":"1,11", "x":11.5, "y":1},
{"label":"1,12", "x":12.5, "y":1},
{"label":"1,14", "x":13.5, "y":1, "w":1.5},
{"label":"1,15", "x":15, "y":1},
{"label":"2,0", "x":0, "y":2, "w":1.75},
{"label":"2,1", "x":1.75, "y":2},
{"label":"2,2", "x":2.75, "y":2},
{"label":"2,3", "x":3.75, "y":2},
{"label":"2,4", "x":4.75, "y":2},
{"label":"2,5", "x":5.75, "y":2},
{"label":"2,6", "x":6.75, "y":2},
{"label":"2,7", "x":7.75, "y":2},
{"label":"2,8", "x":8.75, "y":2},
{"label":"2,9", "x":9.75, "y":2},
{"label":"2,10", "x":10.75, "y":2},
{"label":"2,11", "x":11.75, "y":2},
{"label":"2,13", "x":12.75, "y":2, "w":2.25},
{"label":"2,15", "x":15, "y":2},
{"label":"3,0", "x":0, "y":3, "w":2.25},
{"label":"3,2", "x":2.25, "y":3},
{"label":"3,3", "x":3.25, "y":3},
{"label":"3,4", "x":4.25, "y":3},
{"label":"3,5", "x":5.25, "y":3},
{"label":"3,6", "x":6.25, "y":3},
{"label":"3,7", "x":7.25, "y":3},
{"label":"3,8", "x":8.25, "y":3},
{"label":"3,9", "x":9.25, "y":3},
{"label":"3,10", "x":10.25, "y":3},
{"label":"3,11", "x":11.25, "y":3},
{"label":"3,12", "x":12.25, "y":3, "w":1.75},
{"label":"3,14", "x":14, "y":3},
{"label":"3,15", "x":15, "y":3},
{"label":"4,0", "x":0, "y":4, "w":1.25},
{"label":"4,1", "x":1.25, "y":4, "w":1.25},
{"label":"4,3", "x":2.5, "y":4, "w":1.25},
{"label":"4,6", "x":3.75, "y":4, "w":6.25},
{"label":"4,10", "x":10, "y":4, "w":1.25},
{"label":"4,11", "x":11.25, "y":4, "w":1.25},
{"label":"4,13", "x":13, "y":4},
{"label":"4,14", "x":14, "y":4},
{"label":"4,15", "x":15, "y":4}
]
}
}
}
36 changes: 36 additions & 0 deletions keyboards/txuu/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Copyright 2021 Matthew Dias <[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 QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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,
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,
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,
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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT(
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,
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,
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,
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,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
44 changes: 44 additions & 0 deletions keyboards/txuu/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
Copyright 2021 Matthew Dias <[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 QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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,
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,
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,
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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT(
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,
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,
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,
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,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),

[2] = LAYOUT(
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, 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, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
1 change: 1 addition & 0 deletions keyboards/txuu/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
18 changes: 18 additions & 0 deletions keyboards/txuu/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# txuu

A 65% PCB

- Keyboard Maintainer: matthewdias
- Hardware Supported: txuu PCB, Unified Daughterboard

To reset the keyboard into bootloader mode, press the reset switch on the underside.

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

make txuu:default

Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):

make txuu:default:flash

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

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = lite # 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
18 changes: 18 additions & 0 deletions keyboards/txuu/txuu.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
Copyright 2021 Matthew Dias <[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 "txuu.h"
37 changes: 37 additions & 0 deletions keyboards/txuu/txuu.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
Copyright 2021 Matthew Dias <[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 XXX KC_NO

#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, K2F }, \
{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, K3F }, \
{ K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F } \
}

0 comments on commit 4ff4c05

Please sign in to comment.