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 from master repo #12

Merged
merged 70 commits into from
Nov 19, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f2eb080
Add support for 4 IS31FL3731 devices (#10860)
XBowsTech Nov 5, 2020
5f2c434
E85 backlight & LED indicator updates (#10678)
kaylanm Nov 6, 2020
d7c90d8
add dp60 indicator mode (#8801)
yulei Nov 6, 2020
b5ebdf1
[Keymap] bcat keymaps and userspace (#10705)
bcat Nov 6, 2020
7ce5402
Updates to Talljoe's Keymaps (#10115)
Talljoe Nov 7, 2020
4d33d72
New command: qmk lint (#10761)
skullydazed Nov 7, 2020
bd1c048
Add qmk info -l to show the layouts too (#10882)
skullydazed Nov 7, 2020
db829c9
Add big spacebar defaults to Underscore33 (#10731)
tominabox1 Nov 8, 2020
ff7f703
[Keyboard] Fix unused variables in mschwingen modelm (#10811)
drashna Nov 8, 2020
9cd3ffa
add missing physical layout options and VIA support for Sesame (#10471)
kb-elmo Nov 8, 2020
1ff5ee2
Indicator LEDs as config (#10816)
zvecr Nov 8, 2020
95bbd79
[Keyboard] Keebwerk MEGA Initial commit (#10777)
yiancar Nov 9, 2020
cb80b59
Adding few Korean translated files (#5895)
SeungheonOh Nov 9, 2020
84ca67f
[Keymap] idobo:egstad (#10783)
egstad Nov 9, 2020
16fe4b8
Update massdrop/alt and arm_atsam/led_matrix to fix #10813 (#10818)
Nov 9, 2020
f38a3b7
[Keymap] little foot (#7305)
yanfali Nov 9, 2020
ed8d1d1
Add VIA Keymap for Worldspawn Gothic70. (#10617)
stein3 Nov 10, 2020
489bee0
[Docs] redirect from /tutorial to /newbs (#10718)
Duckle29 Nov 10, 2020
2ef68a8
Added color wheel that have QMK HSV values. (#8997)
elijahblake81 Nov 10, 2020
53f1166
[Keyboard] kingly_keys/ave (#10042)
The-Royal Nov 10, 2020
a9f65b7
userspace and keymap changes for rupa (#10489)
Nov 10, 2020
8af767c
[Keyboard] Crazy Keyboard 68 (#10693)
z-ww447 Nov 10, 2020
7595f53
refactor SPLIT_KEYBOARD, OLED_DRIVER_ENABLE (#10405)
yfuku Nov 10, 2020
aa90cf1
XD68: add 65_ansi_split_bs layout (#10835)
owestend Nov 10, 2020
abf1902
[Keyboard] RGBKB Pan (#9587)
Legonut Nov 10, 2020
aae3b35
CI: Add docs build and deploy workflow (#7448)
zvecr Nov 10, 2020
683ba8b
Improve the QMK Lint workflow (#10909)
skullydazed Nov 10, 2020
a422309
Bring up Qvex Lynepad (#10826)
mcrosson Nov 11, 2020
0dee334
handwired/onekey/blackpill_f401: Fix I2C pin config mismatch (#10322)
sigprof Nov 12, 2020
d7c1b89
[Keyboard] Southpaw66 by rpiguy9907 (#10782)
gooberpsycho Nov 14, 2020
a7afaa3
[Keyboard] Time 80 TKL by Fox Lab (#10851)
lukelex Nov 14, 2020
45e16fd
[Keyboard] h660s by hineybush (#10221)
hineybush Nov 15, 2020
91b4401
ZTBoards Updated keymap and updated info.json (#10926)
phlopsuh Nov 15, 2020
5edce6b
[Keyboard] Add Lily58 via keymap (#10178)
kata0510 Nov 15, 2020
bb9fbd6
[Keymap] Add nfriend's ErgoDox EZ keymap (#10545)
nfriend Nov 15, 2020
81a17f4
[Keyboard] add Symmetric70 keyboard prototype (#10780)
mtei Nov 15, 2020
e423627
[Keyboard] added Pill60 to handwired/pill60 (#10798)
IktaS Nov 15, 2020
cfc9a35
[Keyboard] Add "Uno" (#10579)
jvbroek Nov 16, 2020
94e94ff
Recommend use of LED Indicator config (#10895)
zvecr Nov 16, 2020
b337ba7
CLI: Udev related fixes and improvements (#10736)
Erovia Nov 16, 2020
aaea5e2
[Keyboard] YMDK NP21: correct numpad layout matrix (#10874)
cole-h Nov 16, 2020
e6a13e0
[Keymap] clean up helix:five_rows keymap (#10866)
mtei Nov 16, 2020
2ffac90
Fix typo causing `redefined error` in keymap_french_osx (#10962)
gbotin Nov 16, 2020
3e0789c
BDN9: Fix encoder direction, add 3rd encoder for Rev. 1.3 support (#1…
nooges Nov 17, 2020
f339413
[Keyboard] Add Beatervan keyboard (#10939)
ojthetiny Nov 17, 2020
69bb9b7
Fox Lab Time80: add Configurator layout data (#10950)
noroadsleft Nov 17, 2020
88c09aa
[Keyboard] Add Titan 60 (#10886)
mechmerlin Nov 17, 2020
503b762
Refactor the crkbd/via keymap and fix OLED bugs (#10354)
foostan Nov 17, 2020
a896777
[Keymap] Add user keymaps to qmk master (#10870)
bghull Nov 17, 2020
cf3b683
[Keyboard] bm16s - Added Via Support (#10863)
Relocks Nov 17, 2020
1078278
[Keymap] Update for jisplit89 (#10859)
Salicylic-acid3 Nov 17, 2020
3c156e1
[Keymap] ANAVI Macro Pad 8 fix kodi and default (#10727)
leon-anavi Nov 17, 2020
adfd34c
Refactor to use led config - Part 2 (#10906)
zvecr Nov 17, 2020
ddcb179
Refactor to use led config - Part 1 (#10905)
zvecr Nov 17, 2020
58f2e04
Add VIA Keymap for boardsource/microdox (#10932)
waffle87 Nov 17, 2020
ad5cbe5
Added new keyboard - nack (#10940)
farfalleflickan Nov 18, 2020
1512e07
Add support for keyboard 'DimplePlus' (#10881)
jackytrabbit Nov 18, 2020
e1e13c5
Add support for LAYOUT_alice to sneakbox pcb (#10914)
stanrc85 Nov 18, 2020
f00402a
Refactor to use led config - Part 3 (#10966)
zvecr Nov 18, 2020
e4aadf2
[Keyboard] Add wilba.tech WT65-G (#10877)
wilba Nov 18, 2020
ad9674c
[Keyboard] Add wilba.tech WT80-G (#10878)
wilba Nov 18, 2020
3270cbe
[Keymap]Add and Update keymap for reviung34 (#10915)
gtips Nov 18, 2020
0f8b0d9
VIA Support: E6V2 BMC editions (#10969)
mechmerlin Nov 18, 2020
66d52d8
Update the melody96:zunger keymap (#10888)
yonatanzunger Nov 18, 2020
7bdc41b
Changed personal keymap punk75:dsanchezseco (#10928)
dsanchezseco Nov 18, 2020
078586b
Update one_shot_keys.md (#10917)
j-zero Nov 18, 2020
3aef2be
Add basic OLED keymap for nullbitsco/nibble (#10912)
Nov 18, 2020
88a783a
[Keyboard] PloopyCo update and fixes (#10936)
drashna Nov 18, 2020
6dc2d59
[Keymap] add massdrop/alt:pregame (#8953)
elijahblake81 Nov 18, 2020
e7497b3
Add references for is_keyboard_left() (#10850)
drashna Nov 19, 2020
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
Prev Previous commit
Next Next commit
[Keyboard] Add Lily58 via keymap (qmk#10178)
* Add Lily58 VIA keymap

* Update keyboards/lily58/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/lily58/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/lily58/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/lily58/keymaps/via/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* update via keymap

* fix keymap.c

* add licence to keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
  • Loading branch information
3 people committed Nov 15, 2020
commit 5edce6ba26b474ca53f0bf10bfdb4d8f50de43aa
42 changes: 42 additions & 0 deletions keyboards/lily58/keymaps/via/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert

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

//#define USE_MATRIX_I2C

/* Select hand configuration */

#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS

#define USE_SERIAL_PD2

#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100

// Underglow
/*
#undef RGBLED_NUM
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_SLEEP
*/
229 changes: 229 additions & 0 deletions keyboards/lily58/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
/* Copyright 2020 Naoki Katahira
*
* 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
#include <stdio.h>

//extern uint8_t is_master;

enum layer_number {
_QWERTY = 0,
_LOWER,
_RAISE,
_ADJUST,
};

#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* QWERTY
* ,-----------------------------------------. ,-----------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ~ |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | - |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift|
* `-----------------------------------------/ / \ \-----------------------------------------'
* |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/

[_QWERTY] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
KC_LCTRL, 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_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
LOWER, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_BSPC, KC_RGUI, RAISE
),
/* LOWER
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | 1 | 2 | 3 | 4 | 5 |-------. ,-------| 6 | 7 | 8 | 9 | 0 | |
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | ` | + | { | } | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/
[_LOWER] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_GRAVE, KC_PLUS, KC_LCBR, KC_RCBR, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
/* RAISE
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |-------. ,-------| | Left | Down | Up |Right | |
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* | | | | | | |-------| |-------| + | = | [ | ] | \ | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/

[_RAISE] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX,
_______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),

/* ADJUST
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |-------. ,-------| | | | | | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* |LOWER | LGUI | Alt | /Space / \Enter \ |BackSP| RGUI |RAISE |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_ADJUST] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

#ifdef OLED_DRIVER_ENABLE

oled_rotation_t oled_init_user(oled_rotation_t rotation) {
if (!is_keyboard_master())
return OLED_ROTATION_180; // flips the display 180 degrees if offhand
return rotation;
}

layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
return state;
}

static void render_logo(void) {
static const char PROGMEM logo[] = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
};

oled_write_P(logo, false);
}
char keylog_str[24] = {};
char keylogs_str[21] = {};
int keylogs_str_idx = 0;

const char code_to_name[60] = {
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
'#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};

void set_keylog(uint16_t keycode, keyrecord_t *record) {
char name = ' ';
if (keycode < 60) {
name = code_to_name[keycode];
}

// update keylog
snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
record->event.key.row, record->event.key.col,
keycode, name);

// update keylogs
if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
keylogs_str_idx = 0;
for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
keylogs_str[i] = ' ';
}
}

keylogs_str[keylogs_str_idx] = name;
keylogs_str_idx++;
}

const char *read_keylog(void) {
return keylog_str;
}

const char *read_keylogs(void) {
return keylogs_str;
}
//new

void oled_task_user(void) {
if (is_keyboard_master()) {
// Host Keyboard Layer Status
oled_write_P(PSTR("Layer: "), false);

switch (get_highest_layer(layer_state)) {
case _QWERTY:
oled_write_ln_P(PSTR("Default"), false);
break;
case _RAISE:
oled_write_ln_P(PSTR("Raise"), false);
break;
case _LOWER:
oled_write_ln_P(PSTR("Lower"), false);
break;
case _ADJUST:
oled_write_ln_P(PSTR("Adjust"), false);
break;
default:
oled_write_ln_P(PSTR("Undefined"), false);
}

oled_write_ln(read_keylog(), false);
oled_write_ln(read_keylogs(), false);

} else {
render_logo();
}
}
#endif // OLED_DRIVER_ENABLE


bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
#ifdef OLED_DRIVER_ENABLE
set_keylog(keycode, record);
#endif
// set_timelog();
}
return true;
}
2 changes: 2 additions & 0 deletions keyboards/lily58/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
OLED_DRIVER_ENABLE = yes