added Morph clock type #303
No reviewers
Labels
No labels
bug
conflicts
documentation
DO NOT MERGE
duplicate
enhancement
good first issue
hardware
help wanted
invalid
question
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
greg/info-orbs!303
Loading…
Reference in a new issue
No description provided.
Delete branch "nconner-06/dev_morph"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Added Morph clock type to Clock widget
I finally found time to split the Morph clock type out of my big PR (Features for ClockWidget and WeatherWidget #237) into a smaller package
I haven't gotten a chance to test this, which I would want to do before approving it. But in the mean time please update it and resolve the conflict.
@ -56,6 +56,10 @@#define DEFAULT_CLOCK ClockType::NORMALI think we should maintain the order of normal then, nixie, then morph. If we keep adding clock types, which I think would be a good thing, we may need to add a more advanced architecture more like widgets where users can choose which to enable
@ -56,6 +56,10 @@#define DEFAULT_CLOCK ClockType::NORMALIt doesn't make a lot of difference to me, so switch nixie and morph in the .h file
View command line instructions
Manual merge helper
Use this merge commit message when completing the merge manually.
Checkout
From your project repository, check out a new branch and test the changes.Merge
Merge the changes and update on Forgejo.Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.