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

added Waveshare BWR Mode for the 7.5in Display #4394

Merged
merged 2 commits into from
Nov 25, 2024

Conversation

JonasB2497
Copy link
Contributor

Description:

Added a new display model which enables the BWR rendering mode for the 7.5in v3 display from waveshare.

Related issue (if applicable): fixes

Pull request in esphome with YAML changes (if applicable): esphome/esphome#7687

Checklist:

  • I am merging into next because this is new documentation that has a matching pull-request in esphome as linked above.
    or

  • I am merging into current because this is a fix, change and/or adjustment in the current documentation and is not for a new component or feature.

  • Link added in /index.rst when creating new documents for new components or cookbook.

Copy link

netlify bot commented Oct 28, 2024

Deploy Preview for esphome ready!

Name Link
🔨 Latest commit 5deaba3
🔍 Latest deploy log https://app.netlify.com/sites/esphome/deploys/6744fa12a24e4e0008bda64c
😎 Deploy Preview https://deploy-preview-4394--esphome.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Member

@jesserockz jesserockz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase your branch so this PR includes only your changes

@esphome
Copy link

esphome bot commented Nov 6, 2024

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@esphome esphome bot marked this pull request as draft November 6, 2024 02:42
@JonasB2497
Copy link
Contributor Author

I tried to rebase my branch but kind of hit a roadblock. It seems like I have accidentally based my work of of the current branch which I think should have been next instead (that's why there are so many changes). I have my changes separated in a different branch now based on next (waveshare_bwr_next) but can't quite figure out the right commands to rebase the branch in this PR.
Do you happen to know the commands I need or can modify this PR to point to my other branch? Or should I just open a new PR and close this one?

@trip5
Copy link

trip5 commented Nov 9, 2024

Hi Jonas. From Github you should be able to just sync your branch to esphome-docs:current... if you get conflict errors, pull the files out that you updated to hold as a backup then rebase it and check if your files are intact. They should be.

PS I've got a few of these BWR screens. Is it finally in ESPHome Official?

@JonasB2497 JonasB2497 force-pushed the waveshare-bwr branch 2 times, most recently from 72d4182 to cb90402 Compare November 9, 2024 11:24
@JonasB2497
Copy link
Contributor Author

@trip5 syncing deleted my changes but I got it working now by pointing this PR branch to the clean branch I created with git reset --hard and then doing a force push. Rebasing to the newest changes then worked in the github UI again.
I have created the necessary changes and created a PR (see the link above) but it is not merged yet.

@jesserockz rebased on the next branch now. Hope this as desired although the checks are failing on files I have not changed

@JonasB2497 JonasB2497 marked this pull request as ready for review November 9, 2024 11:38
@esphome esphome bot requested a review from jesserockz November 9, 2024 11:38
@jesserockz jesserockz merged commit 2ac9535 into esphome:next Nov 25, 2024
2 of 3 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Nov 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants