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

Lotus 58 Glow - blok #20626

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7276bb7
Added Keyboard Lotus58Glow
TweetyDaBird Mar 28, 2023
ed31c5c
renamed folder
TweetyDaBird Mar 29, 2023
26148a7
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Mar 30, 2023
3207e95
Cleanup
TweetyDaBird Apr 9, 2023
b82a25d
Merge branch 'qmk:master' into Lotus58Glow
TweetyDaBird Apr 9, 2023
a902172
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Apr 10, 2023
2d21362
Update keyboards/tweetydabird/lotus58/lotus58.c
TweetyDaBird Apr 10, 2023
3483506
Update keyboards/tweetydabird/lotus58/lotus58.c
TweetyDaBird Apr 10, 2023
d1fe51a
removed whitespace
TweetyDaBird Apr 10, 2023
cb8455f
Update keyboards/tweetydabird/lotus58/config.h
TweetyDaBird Apr 11, 2023
6fdb9ad
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Apr 11, 2023
73c0b2b
Renamed folders, removed keymap info.json, bootmagic
TweetyDaBird Apr 11, 2023
0a90ac0
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Apr 11, 2023
a2a4544
Update keyboards/tweetydabird/lotus58/info.json
TweetyDaBird Apr 11, 2023
a00f3a0
Single keymap folder
TweetyDaBird Apr 13, 2023
48146c6
Merge branch 'Lotus58Glow' of https://github.com/TweetyDaBird/qmk_fir…
TweetyDaBird Apr 13, 2023
18af9fc
Added support for blok
TweetyDaBird Apr 15, 2023
dc81122
Added CytaStorm keymap
TweetyDaBird Apr 15, 2023
1a84108
Merge remote-tracking branch 'upstream/master' into Cytastorm-additions
TweetyDaBird Apr 29, 2023
179789a
removed keymap cytastorm
TweetyDaBird Apr 29, 2023
dabf2a1
added headers
TweetyDaBird Apr 29, 2023
fefb253
Merge pull request #4 from TweetyDaBird/Cytastorm-additions
TweetyDaBird Apr 29, 2023
7df260c
Update readme.md
TweetyDaBird Apr 29, 2023
63a4321
Merge pull request #5 from TweetyDaBird/master
TweetyDaBird Apr 29, 2023
2146443
Update keyboards/tweetydabird/lotus58/blok/config.c
TweetyDaBird Apr 29, 2023
d832d11
Update keyboards/tweetydabird/lotus58/blok/rules.mk
TweetyDaBird Apr 29, 2023
256ebd5
Update keyboards/tweetydabird/lotus58/blok/config.c
TweetyDaBird Apr 29, 2023
aae0609
Update keyboards/tweetydabird/lotus58/blok/config.c
TweetyDaBird Apr 29, 2023
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
7 changes: 7 additions & 0 deletions keyboards/tweetydabird/lotus58/blok/config.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2023 Markus Knutsson (@TweetyDaBird)
// SPDX-License-Identifier: GPL-2.0-or-later

#define I2C_DRIVER I2CD0
//using raw pin values, blok converter doesn't catch this
#define I2C0_SDA_PIN 17U
#define I2C0_SCL_PIN 16U
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions keyboards/tweetydabird/lotus58/blok/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2023 Markus Knutsson (@TweetyDaBird)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next <halconf.h>
#define HAL_USE_I2C TRUE
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions keyboards/tweetydabird/lotus58/blok/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONVERT_TO = blok
4 changes: 2 additions & 2 deletions keyboards/tweetydabird/lotus58/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* Hardware Design: [GitHub](https://github.com/TweetyDaBird/Lotus58)


#### This keyboard firmware contains three different versions, all for the same PCB/hardware, but depending on your choice of controller/bootloader.

#### This keyboard firmware contains different versions, all for the same PCB/hardware, but depending on your choice of controller (and bootloader).

* blok - This uses the blok rp2040 Pro Micro replacement
* promicro - This uses the default Caterina bootloader.
* elite_c - This uses the Atmel-DFU bootloader.
* nanoBoot - A tiny 512 byte bootloader giving far more usable memory for features (can be used on both Elite C and Pro Micro).
Expand Down