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

Merge master into develop #191

Merged
merged 10 commits into from
Apr 19, 2022
Merged

Conversation

tore-espressif
Copy link
Collaborator

@tore-espressif tore-espressif commented Apr 11, 2022

Closes #146

@tore-espressif tore-espressif marked this pull request as draft April 11, 2022 07:16
@tore-espressif
Copy link
Collaborator Author

@C47D This PR resolves conflicts between master and develop. It can be successfully build (check GH actions)

I'll have to test in on HW before merging, though

@tore-espressif
Copy link
Collaborator Author

Update: tested and working with ESP32S2 + ST7789 + LVGL v8.

I understand that the other drivers were not updated to LVGL v8 yet.

@tore-espressif tore-espressif marked this pull request as ready for review April 11, 2022 14:16
@C47D
Copy link
Collaborator

C47D commented Apr 13, 2022

Hi @tore-espressif, as far as I remember that particular driver is the only one that works with both LVGL v7 and v8.

Thanks for taking the time to solve this issue, I know is not very fun to do :)

@tore-espressif
Copy link
Collaborator Author

Well, I caused the whole problem, it's shame that it took me so long.

If this gets merged into develop, do you want to merge develop to master ASAP? As far as I understand it, there will be inconsistencies between drivers.

(Related discussion #188)

@C47D
Copy link
Collaborator

C47D commented Apr 13, 2022

Hi, don't worry. We could merge develop into master and firstly fix compilation errors. Then update drivers gradually. What do you think?

@tore-espressif
Copy link
Collaborator Author

Fair enough 👍

@C47D
Copy link
Collaborator

C47D commented Apr 14, 2022

Feel free to merge this.

@tore-espressif tore-espressif merged commit bd8a7e3 into lvgl:develop Apr 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants