Repository navigation
Sync master (0.2.34) into develop - #371
Merged
Merged
Conversation
…the first draw after reset (m5stack#355)
…eft bus busy Port of the develop change (m5stack#368) to the master layout: the TwoWire::end() guard becomes LGFX_TWOWIRE_HAS_END (git version first, esp_arduino_version.h when core_version.h is missing; m5stack#366) for release() and the pin search, and beginTransaction() runs i2c_stop() when the bus is still busy after the 128 us wait (m5stack#362). The unused member setPins() that develop removed is left as it is.
Port of the develop change (m5stack#354) to the master layout. The Core2 panel's rst_control() toggled reg 0x96 bit1, the LCD reset (GPIO4) on the AXP192 but the BLDO1 (backlight) voltage on the AXP2101, so every panel init on Core2 v1.1 nudged the backlight voltage and never reset the LCD. The panel now carries its reset register: reg 0x90 bit1 (ALDO2 enable, the bit lcd_reset() already uses) on the AXP2101, reg 0x96 bit1 on the AXP192 as before.
Release 0.2.34
# Conflicts: # src/M5GFX.cpp # src/lgfx/v1/platforms/esp32/common.inl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges the 0.2.34 release (master) back into develop. Conflicts were resolved on the develop side; the only net change against develop is the version bump (4 files). Please merge with "Create a merge commit" (not squash / rebase) so that master stays an ancestor of develop.