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 current 9.2.x to main #10178

Merged
merged 22 commits into from
Mar 26, 2025
Merged

Merge current 9.2.x to main #10178

merged 22 commits into from
Mar 26, 2025

Conversation

dhalbert
Copy link
Collaborator

Catch up main to current 9.2.x changes.

Neradoc and others added 20 commits March 19, 2025 16:07
remove rmf9x from frozen - heltec v3 uses sx1262 Lora-Chip
Add Waveshare ESP32S3 touch LCD 2 inch display board
Fix multiple documentation issues.
waveshare_esp32_s3_geek: fix SPI busses and board_init()
Create a pull request template to add a few reminders
9.2.x For raspberrypi, increase MDNS_MAX_SERVICES to 25.
usb_msc_flash.c: restore initialization of `ejected` array
…l client is connected

the original issue is fixed in tinyusb
Restore ability to read usb_cdc buffer when serial client is disconnected
@dhalbert dhalbert requested review from jepler and eightycc March 24, 2025 23:34
eightycc
eightycc previously approved these changes Mar 25, 2025
Copy link
Collaborator

@eightycc eightycc left a comment

Choose a reason for hiding this comment

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

Looks fine. Good to know how the branches are kept synchronized.

@dhalbert
Copy link
Collaborator Author

dhalbert commented Mar 25, 2025

Looks fine. Good to know how the branches are kept synchronized.

Doing the merge from adafruit/9.2.x to adafruit/main causes a double run of the CI. I wasn't sure of this and next time I will merge from dhalbert/9.2.x, I think.

Eventually we should figure out why it runs twice. I think I looked at this once and it wasn't so easy to fix, but I may be wrong.

Copy link
Collaborator

@eightycc eightycc left a comment

Choose a reason for hiding this comment

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

Looks fine!

@dhalbert dhalbert merged commit 9ba4104 into main Mar 26, 2025
531 checks passed
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.

5 participants