CoretechR / OMOTE

Open Source Remote Using ESP32 and LVGL
https://hackaday.io/project/191752
GNU General Public License v3.0
1.02k stars 114 forks source link

Modular approach - first version for main branch #60

Closed KlausMu closed 4 months ago

KlausMu commented 4 months ago

As last change I increased lvgl heap from 32K to 48K. This works well even with WiFi and BLE enabled. Plan for the next steps:

CoretechR commented 4 months ago

Awesome, Thank you so much, @KlausMu ! It noticed that the automated build tool failed because guiRegistry.cpp refers to guiregistry.h without a capital R. VS Code did not seem to care. I'd like to fix this but I also don't want to "overwrite" your commit message. What would be the best way to do this? Maybe git amend?

KlausMu commented 4 months ago

Oh, ok, sorry, Windows .... I think the easist fix is that you simply change the file and commit it (only this file will get the new commit message), and then I will pull it into my branch for my further work. There will be a lot of new commit messages in the future ...

BTW: In the main branch now you cannot see the history of all my 20+ commits. You can only see one single commit from the PR. Maybe in future you don't want to use the default "no fast forward". With "fast forward" you can get my commit history. https://www.atlassian.com/git/tutorials/using-branches/git-merge

KlausMu commented 4 months ago

Oh, and in README.md I added a heading at top "Changes in this fork". Maybe you want to turn this back ... Everything else was unchanged. This shouldn't be merged into main

CoretechR commented 4 months ago

Now the build passed. Sorry about the history, I will try to use fast forward in the future. Github has its own nomenclature and suggests "Squash and Merge" as the default option, so I have always just used that.

KlausMu commented 4 months ago

Yes, if you are not using it everyday, sometimes it is confusing. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges