Repository navigation
Record upstream/V2R1 as merged (history only, no content change) - #35
Merged
Merged
Conversation
Expose the running ESPHome version and native configuration hash
Expose median-filtered soil voltage for calibration diagnostics
Keep measured gauge numbers while clamping only needle positions
Recover the missing KiCad symbol library from both schematic caches
Run the unit tests and validate the standalone ESPHome configuration on every PR. CODEOWNERS keeps hardware, documentation and repository governance paths under maintainer review. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Protect low batteries with persistent hysteresis and long sleep
Keep recovered KiCad symbol libraries LF on Windows
Make public examples independent of the fork and validate both transports
Bring bounded display recovery and safe rendering to the standalone example
…very Drop the globals duplicated by the #31 merge. Let the parity test accept the multi-device extensions (fault hook, counter, logs, MQTT status) and the per-profile sleep_after_display. Bound the flow tests by each profile's on_display_fault delay. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017fn1KdJJTY7LedVqZ7SxcA
Add retained MQTT Maintenance and Storage modes
Generate generic label bands from explicit input scales
docs: refresh project entry points and first-install guides
PR #34 was squash-merged, so its content is in V2R1 but the upstream commits are not ancestors. This merge uses the ours strategy: no content change. Refs: infra-3rr.78 Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017fn1KdJJTY7LedVqZ7SxcA
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
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.
Summary
#34 was squash-merged: its content is in V2R1, but
upstream/V2R1is not an ancestor, so git still reports the fork 37 commits behind and the next sync would conflict again.This PR adds one merge commit with the
oursstrategy. The tree is identical to V2R1 (git diff origin/V2R1 HEADis empty). Bead:infra-3rr.78.Evidence
git diff --stat origin/V2R1 HEAD: empty.git merge-base --is-ancestor upstream/V2R1 HEAD: true.Merge Danger
Door: two-way. Blast Radius: none, no content change.
Merge with a merge commit (not squash and not rebase). Any other method drops the upstream parent and defeats the purpose.
🤖 Generated with Claude Code
https://claude.ai/code/session_017fn1KdJJTY7LedVqZ7SxcA