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.

Sign up for GitHub

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

Jump to bottom

[Keyboard] Add rp2040_ce option to lotus58 #23185

Merged
merged 31 commits into from
Mar 3, 2024
Merged

[Keyboard] Add rp2040_ce option to lotus58 #23185

merged 31 commits into from
Mar 3, 2024

Conversation

TweetyDaBird
Copy link
Contributor

@TweetyDaBird TweetyDaBird commented Feb 29, 2024 •
edited
Loading

Description

Corrected name and added rp2040_ce option for compiling

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

TweetyDaBird and others added 10 commits November 8, 2023 08:38
@TweetyDaBird
Update keymap
7dc11a5 
Corrected OLED orientation, added autoshift status on OLED.
@TweetyDaBird
Update keymap
2aef3fb 
Corrected OLED orientation, added autoshift status on OLED.
@TweetyDaBird
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
135c856 
…into Lotus

# Conflicts:
#	keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
@TweetyDaBird
Added make target to bottom folder
b8b0501 
With default folder
@TweetyDaBird @lesshonor
Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
44adc3c 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
@TweetyDaBird
Reformatted files
a8026cc
@TweetyDaBird
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
a27206e 
…into Lotus

# Conflicts:
#	keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
@TweetyDaBird @lesshonor
Update keymap.c
281ec3d 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
@TweetyDaBird
Merge branch 'qmk:master' into Lotus
af9b59e
@TweetyDaBird
Updated name
5134f98
@TweetyDaBird TweetyDaBird marked this pull request as draft February 29, 2024 19:02
@TweetyDaBird
Added rp2040ce
5ef0d67
@TweetyDaBird
Update info.json
d81a8aa
@TweetyDaBird
Update info.json
021cfe2
@TweetyDaBird
Added rp2040ce
3ed7eee
@TweetyDaBird
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
5a7e81e 
…into Lotus

# Conflicts:
#	keyboards/tweetydabird/lotus58/rp2040_ce/config.h
#	keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
@TweetyDaBird
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
a8202c3 
…into Lotus

# Conflicts:
#	keyboards/tweetydabird/lotus58/rp2040_ce/config.h
#	keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
@TweetyDaBird
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
dbeff5a 
…into Lotus
@TweetyDaBird TweetyDaBird marked this pull request as ready for review March 1, 2024 13:26
@waffle87 waffle87 changed the base branch from master to develop March 1, 2024 16:08
waffle87
waffle87 requested changes Mar 1, 2024
View reviewed changes
keyboards/tweetydabird/lotus58/elite_c/info.json Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/nanoboot/info.json Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/promicro/info.json Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/rp2040_ce/config.h Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/rp2040_ce/info.json Show resolved Hide resolved
keyboards/tweetydabird/lotus58/rp2040_ce/info.json Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/rp2040_ce/info.json Outdated Show resolved Hide resolved
@waffle87 waffle87 changed the title Lotus [Keyboard] Add rp2040_ce option to lotus58 Mar 1, 2024
TweetyDaBird and others added 2 commits March 1, 2024 17:52
@TweetyDaBird
Fixed stray char
5c05dc4
@TweetyDaBird @waffle87
Apply suggestions from code review
f99d152 
Co-authored-by: jack <0x6a73@protonmail.com>
@TweetyDaBird
Copy link
Contributor Author

Interesting that lint fails on other peoples code...

@waffle87 waffle87 requested a review from a team March 1, 2024 16:57
@waffle87
Copy link
Member

waffle87 commented Mar 1, 2024

Interesting that lint fails on other peoples code...

Lint check is currently broken. Nothing you need to worry about.

drashna
drashna requested changes Mar 2, 2024
View reviewed changes
keyboards/tweetydabird/lotus58/elite_c/info.json Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/keymaps/default/rules.mk Outdated Show resolved Hide resolved
keyboards/tweetydabird/lotus58/promicro/info.json Outdated Show resolved Hide resolved
TweetyDaBird and others added 3 commits March 2, 2024 09:53
@TweetyDaBird @drashna
Update info.json
e2bdc25 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@TweetyDaBird @drashna
Update info.json
21fa8f8 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@TweetyDaBird
Moved LTO
672eabc
@github-actions github-actions bot removed the keymap label Mar 2, 2024
@waffle87 waffle87 merged commit fcf9066 into qmk:develop Mar 3, 2024
2 of 3 checks passed
dunk2k pushed a commit to dunk2k/qmk_firmware that referenced this pull request Mar 11, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @dunk2k
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
54d74d4 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Apr 4, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @mechlovin
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
408b21f 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Apr 4, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @mechlovin
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
573a8e6 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Apr 15, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @mechlovin
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
d890f28 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
whoisjordangarcia pushed a commit to whoisjordangarcia/qmk_firmware that referenced this pull request Jun 8, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @whoisjordangarcia
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
1fef9bd 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
nuess0r pushed a commit to nuess0r/qmk_firmware that referenced this pull request Sep 8, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @nuess0r
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
1944393 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Ardakilic pushed a commit to Ardakilic/qmk_firmware that referenced this pull request Sep 10, 2024
@TweetyDaBird @lesshonor
@waffle87 @drashna @Ardakilic
[Keyboard] Add rp2040_ce option to lotus58 (qmk#23185)
ca30d0a 
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lesshonor lesshonor lesshonor left review comments

@drashna drashna drashna approved these changes

@waffle87 waffle87 waffle87 approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TweetyDaBird @waffle87 @drashna @lesshonor