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

Lotus58 Glow adding keyboard #18554

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
726992e
lsb 4 initial
TweetyDaBird Aug 8, 2022
a974ad4
Merge branch 'qmk:master' into TweetyDaBird
TweetyDaBird Aug 31, 2022
c2055bb
Merge branch 'qmk:master' into TweetyDaBird
TweetyDaBird Sep 1, 2022
188f0f1
Update Lotus
TweetyDaBird Sep 1, 2022
de3bcf2
Merge remote-tracking branch 'upstream/master' into TweetyDaBird
TweetyDaBird Sep 1, 2022
0fe0b7a
Merge branch 'TweetyDaBird' of https://github.com/TweetyDaBird/qmk_fi…
TweetyDaBird Sep 1, 2022
529b95e
tweaks to lotus
TweetyDaBird Sep 1, 2022
1f31aa7
Merge branch 'qmk:master' into TweetyDaBird
TweetyDaBird Sep 13, 2022
ea14e52
fixing default
TweetyDaBird Sep 16, 2022
6f18e82
Update keymap.c
TweetyDaBird Sep 16, 2022
2c57570
Update keymap.c
TweetyDaBird Sep 16, 2022
c3ab859
Update keymap.c
TweetyDaBird Sep 16, 2022
7a97b17
Update keymap.c
TweetyDaBird Sep 16, 2022
6e9c7dc
Update keymap.c
TweetyDaBird Sep 16, 2022
71e59b5
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Sep 23, 2022
c8d83b0
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Sep 28, 2022
c13ee7b
Merge remote-tracking branch 'upstream/master' into Lotus58Glow
TweetyDaBird Sep 30, 2022
af3191f
Migrated to .json
TweetyDaBird Sep 30, 2022
169b756
Update readme.md
TweetyDaBird Sep 30, 2022
07b52ec
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Sep 30, 2022
41cecd5
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Sep 30, 2022
5370da3
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Sep 30, 2022
d1439bd
Update keyboards/tweetydabird/lotus58/config.h
TweetyDaBird Sep 30, 2022
926bf40
Update keyboards/tweetydabird/lbs6/info.json
TweetyDaBird Sep 30, 2022
d079e0e
Update data/schemas/keyboard.jsonschema
TweetyDaBird Sep 30, 2022
6e23b95
Update config.h
TweetyDaBird Sep 30, 2022
e292549
Update keyboards/tweetydabird/lotus58/readme.md
TweetyDaBird Sep 30, 2022
1d5f8be
Requested changes
TweetyDaBird Oct 2, 2022
331727e
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Oct 2, 2022
3c3ea7e
Refactored for RGB
TweetyDaBird Oct 3, 2022
b4cb12a
Merge remote-tracking branch 'upstream/master' into Lotus58Glow
TweetyDaBird Oct 3, 2022
65ab2d2
Update keyboards/tweetydabird/lotus58/readme.md
TweetyDaBird Oct 7, 2022
8c6a61d
Update keyboards/tweetydabird/lotus58/rgb_full/readme.md
TweetyDaBird Oct 7, 2022
61c8bb6
Update keyboards/tweetydabird/lotus58/rgb_none/readme.md
TweetyDaBird Oct 7, 2022
b4cbc3a
Update keyboards/tweetydabird/lotus58/rgb_matrix/readme.md
TweetyDaBird Oct 7, 2022
d3c183c
Moved code from keymap
TweetyDaBird Oct 7, 2022
2264c6d
Merge branch 'Lotus58Glow' of https://github.com/TweetyDaBird/qmk_fir…
TweetyDaBird Oct 7, 2022
fe83a42
Removed RGB matrix
TweetyDaBird Oct 7, 2022
a6eb288
Update readme.md
TweetyDaBird Oct 29, 2022
bf41a51
Update readme.md
TweetyDaBird Oct 29, 2022
d13913b
Update readme.md
TweetyDaBird Oct 29, 2022
6725e79
Update readme.md
TweetyDaBird Nov 2, 2022
0d13bc2
Update readme.md
TweetyDaBird Nov 2, 2022
442e0cb
Update lotus58.c
TweetyDaBird Nov 3, 2022
6cdd3e4
Merge remote-tracking branch 'upstream/master' into Lotus58Glow
TweetyDaBird Nov 12, 2022
d6769ca
Fixed encoder mapping
TweetyDaBird Nov 25, 2022
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
2 changes: 1 addition & 1 deletion data/schemas/keyboard.jsonschema
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"$schema": "https://json-schema.org/draft/2020-12/schema#",
"$id": "qmk.keyboard.v1",
"title": "Keyboard Information",
Expand Down
2 changes: 1 addition & 1 deletion keyboards/tweetydabird/lbs6/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},

"layouts": {
"LAYOUT": {
"LAYOUT_all": {
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"layout": [
{ "label": "Play", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 },

Expand Down
39 changes: 39 additions & 0 deletions keyboards/tweetydabird/lotus58/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
Copyright 2021 TweetyDaBird

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"

/*
#define SPLIT_USB_DETECT
#define SPLIT_USB_TIMEOUT 2000
#define SPLIT_USB_TIMEOUT_POLL 10
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
*/

// Bootmagic Lite key configuration
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 0
#define BOOTMAGIC_LITE_ROW_RIGHT 5
#define BOOTMAGIC_LITE_COLUMN_RIGHT 0

// Not yet supported in json
#define SPLIT_HAND_PIN B5
#define SERIAL_USE_MULTI_TRANSACTION
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved

#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_LED_STATE_ENABLE
#define SPLIT_OLED_ENABLE
184 changes: 184 additions & 0 deletions keyboards/tweetydabird/lotus58/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
{
"keyboard_name": "Lotus 58 Glow",
"manufacturer": "Tweetys Wild Thinking",
"url": "https://lectronz.com/stores/tweetys-wild-thinking",
"maintainer": "TweetyDaBird",

"development_board": "promicro",
"bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.",

"debounce": 5,

"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,
"rgblight": true,
"encoder": true,
"oled": true,
"audio": false,
"split": true,
"magic": false,
"grave_esc": false,
"space_cadet": false
"tap_dance": false,
"auto_shift": true
},

"build": {
"lto": true
},

"usb": {
"vid": "0xFEED",
"pid": "0x23B0",
"device_version": "1.2.3",
"force_nkro": true
},

"split": {
"enabled": true,
"main": "pin",
"soft_serial_pin": "D2",

"usb_detect": {
"enabled": true,
"polling_interval": 2000,
"timeout": 25
},

"transport": {
"protocol": "serial",
"sync_matrix_state": true,
"sync_modifiers": true
},
},

"encoder": {
"rotary": [
{ "pin_a": "F5", "pin_b": "F4", "resolution": 2 }
{ "pin_a": "F4", "pin_b": "F5", "resolution": 2 }
]
},

"rgblight": {
"led_count": 58,
"pin": "D3",
"split": true,
"split_count": [ 29, 29 ],
"hue_steps": 8,
"saturation_steps": 17,
"brightness_steps": 17,
"max_brightness": 175,
"animations": {
"breathing": true,
"rainbow_mood": true,
"static_gradient": true
}
},

"qmk": {
"tap_keycode_delay": 10
},

"tapping": {
"term": 175,
"toggle": 2
},

"matrix_size": {
"cols": 6,
"rows": 10
},
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved

"diode_direction": "COL2ROW",
"matrix_pins": {
"rows": ["D4", "C6", "D7", "E6", "B4"],
"cols": ["B1", "B2", "B3", "B6", "F7", "F6"]
},

"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},

"layouts": {
"LAYOUT_all": {
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"layout": [
{"matrix":[0, 0], "x":0, "y":0.75, "label":"Esc"},
{"matrix":[0, 1], "x":1, "y":0.5, "label":"1"},
{"matrix":[0, 2], "x":2, "y":0.25, "label":"2"},
{"matrix":[0, 3], "x":3, "y":0, "label":"3"},
{"matrix":[0, 4], "x":4, "y":0.25, "label":"4"},
{"matrix":[0, 5], "x":5, "y":0.5, "label":"5"},

{"matrix":[4, 0], "x":6.25, "y":0.75, "label":"Left ENC"},
{"matrix":[9, 0], "x":7.75, "y":0.75, "label":"Right ENC"},

{"matrix":[5, 5], "x":9, "y":0.5, "label":"6"},
{"matrix":[5, 4], "x":10, "y":0.25, "label":"7"},
{"matrix":[5, 3], "x":11, "y":0, "label":"8"},
{"matrix":[5, 2], "x":12, "y":0.25, "label":"9"},
{"matrix":[5, 1], "x":13, "y":0.5, "label":"0"},
{"matrix":[5, 0], "x":14, "y":0.75, "label":"-"},

{"matrix":[1, 0], "x":0, "y":1.75, "label":"Tab"},
{"matrix":[1, 1], "x":1, "y":1.5, "label":"Q"},
{"matrix":[1, 2], "x":2, "y":1.25, "label":"W"},
{"matrix":[1, 3], "x":3, "y":1, "label":"E"},
{"matrix":[1, 4], "x":4, "y":1.25, "label":"R"},
{"matrix":[1, 5], "x":5, "y":1.5, "label":"T"},

{"matrix":[6, 5], "x":9, "y":1.5, "label":"Y"},
{"matrix":[6, 4], "x":10, "y":1.25, "label":"U"},
{"matrix":[6, 3], "x":11, "y":1, "label":"I"},
{"matrix":[6, 2], "x":12, "y":1.25, "label":"O"},
{"matrix":[6, 1], "x":13, "y":1.5, "label":"P"},
{"matrix":[6, 0], "x":14, "y":1.75, "label":"{"},

{"matrix":[2, 0], "x":0, "y":2.75, "label":"Caps Lock"},
{"matrix":[2, 1], "x":1, "y":2.5, "label":"A"},
{"matrix":[2, 2], "x":2, "y":2.25, "label":"S"},
{"matrix":[2, 3], "x":3, "y":2, "label":"D"},
{"matrix":[2, 4], "x":4, "y":2.25, "label":"F"},
{"matrix":[2, 5], "x":5, "y":2.5, "label":"G"},

{"matrix":[7, 5], "x":9, "y":2.5, "label":"H"},
{"matrix":[7, 4], "x":10, "y":2.25, "label":"J"},
{"matrix":[7, 3], "x":11, "y":2, "label":"K"},
{"matrix":[7, 2], "x":12, "y":2.25, "label":"L"},
{"matrix":[7, 1], "x":13, "y":2.5, "label":":"},
{"matrix":[7, 0], "x":14, "y":2.75, "label":"\""},

{"matrix":[3, 0], "x":0, "y":3.75, "label":"L_Ctrl"},
{"matrix":[3, 1], "x":1, "y":3.5, "label":"Z"},
{"matrix":[3, 2], "x":2, "y":3.25, "label":"X"},
{"matrix":[3, 3], "x":3, "y":3, "label":"C"},
{"matrix":[3, 4], "x":4, "y":3.25, "label":"V"},
{"matrix":[3, 5], "x":5, "y":3.5, "label":"B"},

{"matrix":[4, 5], "x":6, "y":3, "label":"Down"},
{"matrix":[9, 5], "x":8, "y":3, "label":"Up"},

{"matrix":[8, 5], "x":9, "y":3.5, "label":"N"},
{"matrix":[8, 4], "x":10, "y":3.25, "label":"M"},
{"matrix":[8, 3], "x":11, "y":3, "label":","},
{"matrix":[8, 2], "x":12, "y":3.25, "label":"."},
{"matrix":[8, 1], "x":13, "y":3.5, "label":"?"},
{"matrix":[8, 0], "x":14, "y":3.75, "label":"R_Ctrl"},

{"matrix":[4, 1], "x":2.5, "y":4.25, "label":"Win"},
{"matrix":[4, 2], "x":3.5, "y":4.25, "label":"Lower"},
{"matrix":[4, 3], "x":4.5, "y":4.5, "label":"Alt"},
{"matrix":[4, 4], "x":6, "y":4.25, "h":1.25, "label":"Space"},

{"matrix":[9, 4], "x":8, "y":4.25, "h":1.25, "label":"Enter"},
{"matrix":[9, 3], "x":9.5, "y":4.5, "label":"AltGr"},
{"matrix":[9, 2], "x":10.5, "y":4.25, "label":"Raise"},
{"matrix":[9, 1], "x":11.5, "y":4.25, "label":"BckSp"},
]
}
}
}
Loading