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

Merge (my) Graham's keyboard configs and Telophase board into master #3244

Merged
merged 62 commits into from Aug 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
21d2c35
add my config
loadedsith Sep 22, 2017
6d4355e
fix backlight, clean up that code
loadedsith Sep 22, 2017
34511b4
group background code, restore static var
loadedsith Sep 22, 2017
6c00741
qwerty is supposed to be in the middle
loadedsith Sep 22, 2017
4704366
wrap layer change backlight in ifdef
loadedsith Sep 22, 2017
bb58d53
Merge branch 'master' into grahampheath
loadedsith Sep 22, 2017
a516956
backlight levels and some more 'emojis'.
loadedsith Sep 26, 2017
e1ef957
Merge branch 'master' into grahampheath
loadedsith Sep 26, 2017
7340ad1
Merge branch 'master' into grahampheath
loadedsith Sep 27, 2017
66fe7ff
Restructure to make it possible to press cmd ent on the right side of…
loadedsith Sep 28, 2017
004c332
Expose the period through the number layer. Add Hyper keys to mouse l…
loadedsith Sep 29, 2017
9026d94
reduce mouse speed
loadedsith Oct 13, 2017
7662ff1
Merge branch 'master' into grahampheath
loadedsith Oct 13, 2017
84e5b42
add a : -P key
loadedsith Oct 16, 2017
d6e82ed
Merge branch 'master' into grahampheath
loadedsith Oct 16, 2017
ab1578e
Merge branch 'master' into grahampheath
loadedsith Jan 17, 2018
bfcc033
Thumbs up and down, remove some keys that are duplicated via function…
loadedsith Jan 17, 2018
62b799e
fix build issues
loadedsith Jan 17, 2018
66566b0
add various emoji
loadedsith Jan 28, 2018
1174137
Merge branch 'master' into grahampheath
loadedsith Jan 28, 2018
1053970
duplicate default Meira keymaps
loadedsith Jan 28, 2018
1085bfe
Miera updates
loadedsith Jan 28, 2018
86eaa8e
add documented but unmapped emoji
loadedsith Jan 29, 2018
4b74ce3
Sound for the Meira, was stumped by a file size! Thanks drashna!
loadedsith Feb 20, 2018
2ebba08
add docs
loadedsith Feb 20, 2018
a3cd859
docs
loadedsith Feb 20, 2018
8f812f6
Merge branch 'master' into grahampheath
loadedsith Feb 20, 2018
3782149
revert lib changes...
loadedsith Feb 20, 2018
c3791a9
clean up
loadedsith Feb 20, 2018
a33e852
clean up
loadedsith Feb 20, 2018
14f8614
remove make file
loadedsith Feb 20, 2018
4fbd9f8
Fixes missing key
loadedsith Feb 21, 2018
1ec34cc
clean up
loadedsith Mar 1, 2018
e5b5447
Merge branch 'master' into grahampheath
loadedsith Mar 1, 2018
a930b9e
add my lets split
loadedsith Apr 18, 2018
1ca709b
Merge branch 'master' into grahampheath
loadedsith Apr 18, 2018
fd58ce2
add more emoji
loadedsith Jun 26, 2018
fb76624
Merge branch 'master' into grahampheath
loadedsith Jun 26, 2018
0735b0a
add the telophase board (unofficially, I guess...)
loadedsith Jun 26, 2018
09a0d2b
Merge branch 'master' into grahampheath
loadedsith Jun 27, 2018
2f51814
add missing files
loadedsith Jun 27, 2018
df8ee82
add/reset files
loadedsith Jun 27, 2018
53c5db5
Merge branch 'master' into grahampheath
loadedsith Jul 20, 2018
982ff30
Review feedback implementation: Not needed. Add #define FLIP_HALF to …
loadedsith Jul 20, 2018
a0f14a3
Review feedback implementation: All of these includes should be repla…
loadedsith Jul 20, 2018
5dd4a3f
Review feedback implementation: [FAILING] You may want to use LAYOUT_…
loadedsith Jul 20, 2018
264a883
clean up
loadedsith Jul 25, 2018
50a1532
add a key for command tilde (osx loves it)
loadedsith Jul 25, 2018
88a8860
at least its building again
loadedsith Jul 25, 2018
3def594
remove adjusts and migrate layer switching to MO(_LAYER)
loadedsith Jul 25, 2018
3d99429
update the telophase readme
loadedsith Jul 25, 2018
74345d1
update the telophase readme
loadedsith Jul 25, 2018
37f29dc
grahampheaths -> grahampheath
loadedsith Jul 25, 2018
45367b6
ONEHAND_ENABLE -> SWAP_HANDS_ENABLE
loadedsith Jul 25, 2018
5e8e602
convert lets split to use ortho_4x12
loadedsith Jul 26, 2018
a55287d
Move lets split keyboard layout into community/ortho_4x12
loadedsith Jul 26, 2018
d0563c5
make telophase use LAYOUT()
loadedsith Jul 26, 2018
b5ae91c
I did it?!
loadedsith Jul 26, 2018
61d33a8
Add clap and grin
loadedsith Aug 10, 2018
5105a66
Merge branch 'master' into grahampheath
loadedsith Aug 10, 2018
5bfdb27
swap tabs and back and forward
loadedsith Aug 13, 2018
4e0b1f0
whitespace
loadedsith Aug 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions keyboards/meira/keymaps/grahampheath/keymap.c
Expand Up @@ -61,10 +61,10 @@ enum custom_keycodes {
bool TOG_STATUS = false;
int RGB_current_mode;

#define KC_X0 MT(MOD_LCTL, KC_ESC) // Hold for Left Ctrl, Tap for ESC
#define KC_X0 MT(MOD_LCTL, KC_ESC) // Hold for Left Ctrl, Tap for GraveESC
#define KC_X1 MT(MOD_RSFT, KC_ENT) // Hold for Right Shift, Tap for Enter
#define KC_X2 MT(MOD_RSFT, LGUI(KC_ENT)) // Send Command Enter
#define KC_X3 MT(KC_LGUI, KC_SPC) // Hold for Left GUI, Tap for Space
#define KC_X3 MT(MOD_LGUI, KC_SPC) // Hold for Left GUI, Tap for Space
#define KC_EMOJ TT(_EMOJI) // Hold for Emoji Layer, or tap 5 times.
#define KC_QS LGUI(KC_SPC) // Send Command + Space (for QuickSilver).
#define KC_TABR LGUI(KC_RCBR) // Send Command + } (for tab changing).
Expand All @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* |Emoji |Adjust| Ctrl | Alt |Lower | Cmd |Space |Raise | Left | Down | Up |Right |
* |Emoji | Ctrl | Alt |Lower | Cmd |Space+|Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
[_QWERTY] = KEYMAP( \
Expand Down Expand Up @@ -130,15 +130,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Emoji Layer
*
* ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
* │HYPR0│ │ ;-) │ │ │ :-P │ │ │:'-( │FLIP │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
* │HYPR1│ 👆 │SHRUG│ │ :-( │ │ <3 │ :-) │ │LLAP │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
* │HYPR2│ │ │ | :-\ │ │ │ :-D │ SHIT│ │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
* │ │ │ │ │Brig-│ Sleep │Brig+│ 👈 │ 👎 | 👍 │ 👉 │
* └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
* ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
* │HYPR0│ │ ;-) │ │ │ :-P │ │ │:'-( │FLIP │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
* │HYPR1│ 👆 │SHRUG│ │ :-( │ │ <3 │ :-) │ │LLAP │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
* │HYPR2│ │ │ | :-\ │ │ │ :-D │ SHIT│ │ │ │
* ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
* │ │ │ │ │Brig-│ Sleep │Brig+│ 👈 │ 👎 | 👍 │ 👉 │
* └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
*/
[_EMOJI] = KEYMAP ( \
HYPR_0, _______, WINK, _______, _______, TOUNGE, _______, _______, CRY, FLIP, _______, _______, \
Expand All @@ -151,20 +151,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Lower
* ,-----------------------------------------------------------------------------------.
* | | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | ~ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
* | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | Tab- | Vol- | Vol+ | Tab+ |
* | | | | | | | | Tab- | | | Tab+ |
* `-----------------------------------------------------------------------------------'
*/
[_LOWER] = KEYMAP( \
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
_______, _______, _______, _______, _______, KC_QS, KC_QS, _______, KC_TABL, THMBDN, THMBUP, KC_TABR \
_______, _______, _______, _______, _______, KC_QS, KC_QS, _______, KC_TABL, _______, _______, KC_TABR \
),

/* Raise
Expand Down Expand Up @@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = KEYMAP( \
_______, RESET, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, _______, _______, _______, KC_DEL, \
_______, RESET, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_DEL, \
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
Expand Down
2 changes: 1 addition & 1 deletion keyboards/planck/keymaps/grahampheath/readme.md
@@ -1,4 +1,4 @@
# Graham's Planck

## Sounds
I've added a [8ohm 0.5W speaker](http://a.co/6MIKZSy), its a bit large, but it fits in approximately the same space as the ProMicro. I soldered to the pcb hole labeled PC6 on my Rev 3 Planck PCB, and GND on the near by chip. [Pic of an identical mod](https://i1.sndcdn.com/artworks-000128070066-myh0ls-t500x500.jpg) (not mine).
I've added a [8ohm 0.5W speaker](http://a.co/6MIKZSy), its a bit large, but it fits in approximately the same space as the ProMicro. I soldered to the pcb hole labeled PC6 on my Rev 3 Planck PCB, and GND on the near by chip. [Pic of an identical mod][https://i1.sndcdn.com/artworks-000128070066-myh0ls-t500x500.jpg] (not mine).
87 changes: 87 additions & 0 deletions keyboards/telophase/config.h
@@ -0,0 +1,87 @@
/*
Copyright 2012 Jun Wako <wakojun@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 CONFIG_H
#define CONFIG_H

#include "config_common.h"

/* USB Device descriptor parameter */

#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER unknown
#define PRODUCT Telophase
#define DESCRIPTION q.m.k. keyboard firmware for Telophase

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST

/* number of backlight levels */
//#define BACKLIGHT_LEVELS 3

#define ONESHOT_TIMEOUT 500


/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)

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

#define PREVENT_STUCK_MODIFIERS

/* 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
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

//UART settings for communication with the RF microcontroller
#define SERIAL_UART_BAUD 1000000
#define SERIAL_UART_DATA UDR1
#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1)
#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
#define SERIAL_UART_INIT() do { \
/* baud rate */ \
UBRR1L = SERIAL_UART_UBRR; \
/* baud rate */ \
UBRR1H = SERIAL_UART_UBRR >> 8; \
/* enable TX and RX */ \
UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
/* 8-bit data */ \
UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
} while(0)

#endif
104 changes: 104 additions & 0 deletions keyboards/telophase/keymaps/default/keymap.c
@@ -0,0 +1,104 @@
// this is the style you want to emulate.
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,

#include "telophase.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace the includes with #include QMK_KEYBOARD_H.


// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum telophase_layers
{
_QWERTY,
_LOWER,
_RAISE,
_ADJUST,
};

enum telophase_keycodes
{
LOWER = SAFE_RANGE,
RAISE,
ADJUST
};

#define LONGPRESS_DELAY 150
#define LAYER_TOGGLE_DELAY 300

// Fillers to make layering more clear
#define _______ KC_TRNS
#define XXXXXXX KC_NO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = { /*QWERTY*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use the layout formatting here:

	[0] = LAYOUT_ortho_4x12(
		KC_ESC,    KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
		KC_TAB,    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,      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
		KC_LCTL,   KC_LGUI,   KC_LALT, ADJUST,  LOWER,   KC_SPC,    KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
  ),

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try as I might, I could not make this work. It think it has to do with the fact that this board is wireless?

Quote the Telophase readme:

This keyboard uses a completely different 'matrix scan' system to other keyboards, it relies on an external nRF51822 microcontroller maintaining a matrix of keystates received from the keyboard halves.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be honest, the LAYOUT formatting shouldn't affect that. It just re-formats what you have into a more human readable format. But this MUST be supported by the keyboard (and the "h" file, specifically).

For instance: https://github.com/qmk/qmk_firmware/blob/master/keyboards/mitosis/mitosis.h#L52

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what my original blocker was here, after your advice I feel I was able to achieve this.

{KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC },
{KC_TAB, 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, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
{KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT }
},


[_LOWER] = { /*Lower*/
{KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL },
{KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE },
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______ },
{_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY }
},



[_RAISE] = { /*Raise*/
{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL },
{KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS },
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______ },
{_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY }

},


[_ADJUST] = { /*Adjust*/
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }

},
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case LOWER:

This comment was marked as off-topic.

if (record->event.pressed) {
layer_on(_LOWER);
} else {
layer_off(_LOWER);
}
return false;
break;

case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
} else {
layer_off(_RAISE);
}
return false;
break;

case ADJUST:
if (record->event.pressed) {
layer_on(_ADJUST);
} else {
layer_off(_ADJUST);
}
return false;
break;

}
return true;
}

void matrix_scan_user(void) {
return;
};