-
-
Notifications
You must be signed in to change notification settings - Fork 39.8k
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 #20386
Lotus58 glow #20386
Conversation
atmel-dfu to atmeldfu
keyboards/tweetydabird/lotus58/atmeldfu/keymaps/default/info.json
Outdated
Show resolved
Hide resolved
keyboards/tweetydabird/lotus58/nanoboot/keymaps/default/info.json
Outdated
Show resolved
Hide resolved
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keymap folder per revision seems a bit unnecessary given its the same PCB in all cases.
keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
keyboards/tweetydabird/lotus58/atmeldfu/rules.mk
keyboards/tweetydabird/lotus58/caterina/rules.mk
keyboards/tweetydabird/lotus58/nanoboot/rules.mk
Using some existing terminology could also help with consistency;
- caterina -> promicro
- atmeldfu -> elite_c
As a decent proportion of user will have no idea when to use caterina
vs atmeldfu
.
keyboards/tweetydabird/lotus58/nanoboot/keymaps/default/info.json
Outdated
Show resolved
Hide resolved
Well, since it is in fact categorized by boot loader, and the list of controllers it applies to was included in the readme. But sure I can rename them. Edit: to clarify, since Atmega32u4 are routinely running out of memory for advanced features on split keyboards especially, I try to steer builders to use nanoBoot as the bootloader, and for whatever reason, making commented out lines in a single firmware ended up causing confusion. Separate folders/versions seems to solve/reduce that. |
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
I believe all requested changes (manual edits) should be fixed and tested now. Let me know if there is more that needs fixing. Again, in all respect, no rush, just confirming that I have tested things. |
This suggestion has not been completed. |
Ah, right. Then I misunderstood and/or didn't read carefully enough. Now, I'll have to think on that. This sort of creates an issue going to Vial. Again trying to have a discussion, not arguing/being a PITA more than necessary. I agree that this isn't your issue to solve, I'm just trying to find the middle ground where it's acceptable here, and doesn't totally shoot me in the foot there, creating more work as a whole. Feel free to just ignore me if you don't want to have the discussion. Moving the key-maps to a central folder doesn't work in Vial as the key-maps there have to be dependent on the boot-loader (lack of space) and the standard for the Vial key-map is a single folder with the name Vial. Do you have any good suggestions for a workaround? Can the boot-loader assignment move to key-map level? It actually can can't it? (Although I'm not sure if that the correct thing to do). |
The only thing that is of concern here if its acceptable to QMK. Optimising, even if its only in part, for Vial is zero on the scale. However it should be noted that having a common folder for keymaps does not stop at a later date the introduction of
As long as "something" doesnt also exist within You can also use have conditional blocks within the compilation units, with |
I fully understand the position. However, had I just swallowed the first suggestion and not questioned, it would probably resulted in another PR with an update fairly soon, and then another, and another... Making us both batty... The reason I asked however is this:
That should have been obvious to me, having used the '#ifdef OLED' etc... It wasn't for some reason. So, from the bottom of my heart, thank you for making me feel damned stupid... That was going beyond... It might perhaps take me a while to iron it out to my satisfaction (and yours), but I think you just gave me the key... |
Yeah. I don't do good with GitHub time limits and such. ADHD. Either things happen fast, and I say focused, or I loose focus and hyper focus on something else, and end up procrastinating. Was sort of why I managed to annoy Joel before(justified from his side Btw). I was more trying to keep myself on task than anything else. And git isn't my strong suit to start with. Is there a way to re-open a PR from my side? I would have preferred that. |
Well, a work days worth of testing. It work as is, and armed with the above tip, I feel I can take this and make Vial work without shooting myself in the foot once it's in the main repo. I'm happy with it. Let me know if there is anything else that needs fixed. |
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ive fixed up things after the bad info you were given, as well as a few minor tidy ups. All good to go from my front now.
* upstream/master: (73 commits) [Keyboard] Add Kalakos Bahrnob65 (qmk#20424) Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460) [Keyboard] Add zoom75 wired (qmk#20396) [Keyboard] Add dymium65 (qmk#20257) Lotus58 glow (qmk#20386) ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445) Add hardware information momokai keyboards (qmk#20434) 4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414) [Keymap] Add paulomp90 lily58 keymap (qmk#20327) [Keymap] Add personal keymap for Lily58 (qmk#18735) [Keyboard] Fix h87 g2 VID conflict (qmk#20388) [Keymap] PHSC138 Keymap for Atom47 (qmk#18768) [Keyboard] add kb2040 flavor of gherkin (qmk#18360) [Keyboard] ymdk/id75 (qmk#19967) fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420) 4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400) 4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399) Reject info.json at keymap level (qmk#20408) Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407) [Keyboard] Update angle65 VID/PID (qmk#20401) ...
Thanks! And a lot of thanks for the pointers! |
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
* master: NK Plus (qmk#20392) [Docs] Fix suggested code pattern when a specific mod-mask is required. (qmk#20512) [Docs] Remove combo count from array (qmk#20511) Add QuadrumLabs Delta (qmk#20409) Adds Docs option for ArduinoIDE's example `ArduinoISP` (qmk#20486) GMMK 2 volume up/down Fn keys are backwards in default mapping (qmk#20476) Fix typo in `feature_wpm.md` title (qmk#20464) [Keyboard] Add Kalakos Bahrnob65 (qmk#20424) Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460) [Keyboard] Add zoom75 wired (qmk#20396) [Keyboard] Add dymium65 (qmk#20257) Lotus58 glow (qmk#20386) ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
Description
Types of Changes
Issues Fixed or Closed by This PR
Checklist