Thermostat - Relocate setpoint logic to separate files#42326
Open
hasty wants to merge 74 commits into
Open
Conversation
…ter tests to change it
…r_driven_thermostat
hasty
changed the title
hasty
changed the title
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request successfully refactors the Thermostat cluster by moving setpoint-related logic into new dedicated files, ThermostatClusterSetpoints.cpp and ThermostatClusterSetpoints.h. This improves modularity and prepares for a code-driven cluster implementation. The changes also include updating the default value for minSetpointDeadBand across various examples and tests, which is a good consistency improvement. My review includes suggestions to further improve the refactoring by using the new GetSetpointLimits helper function in a couple of places where limit attributes are still being fetched manually, aligning with the rule to extract common logic into helper functions. This will make the code cleaner and more consistent.
|
PR #42326: Size comparison from efdf99d to 99f09f4 Full report (32 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, psoc6, qpg, realtek, stm32, telink)
|
…driven_thermostat # Conflicts: # examples/all-clusters-app/linux/main-common.cpp
|
PR #42326: Size comparison from efdf99d to 18fd2e4 Full report (35 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
|
PR #42326: Size comparison from 9a96230 to 8a7bc0a Full report (35 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
Contributor
|
Any news? |
hasty
force-pushed
the
granbery/cluster_driven_thermostat_setpoints
branch
from
bc1c1b7 to
e9b7549
Compare
hasty
force-pushed
the
granbery/cluster_driven_thermostat_setpoints
branch
from
e9b7549 to
f5cbd69
Compare
|
PR #42326: Size comparison from a914062 to f5cbd69 Full report (3 builds for realtek, stm32)
|
hasty
force-pushed
the
granbery/cluster_driven_thermostat_setpoints
branch
3 times, most recently
from
41a0d50 to
18932e9
Compare
|
PR #42326: Size comparison from a914062 to 18932e9 Full report (28 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, psoc6, qpg, realtek, stm32, telink)
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #42326 +/- ##
==========================================
- Coverage 56.61% 56.56% -0.05%
==========================================
Files 1642 1651 +9
Lines 113137 113228 +91
Branches 13243 13237 -6
==========================================
+ Hits 64048 64049 +1
- Misses 49089 49179 +90 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
hasty
force-pushed
the
granbery/cluster_driven_thermostat_setpoints
branch
from
18932e9 to
0d736be
Compare
hasty
requested review from
ReneJosefsen,
andy31415,
cecille,
fessehaeve,
nivi-apple and
yufengwangca
|
PR #42326: Size comparison from ca3e67c to b419229 Full report (35 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, psoc6, qpg, realtek, stm32, telink)
|
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the thermostat server cluster by introducing a modular, object-oriented setpoint management architecture (including Setpoint, SetpointLimits, and Setpoints classes) to replace legacy procedural validation logic, alongside updating Python test suites to use a simulated thermostat state. The review feedback highlights several critical and high-severity issues: a potential crash in OptionalSetpoint::Encode when calling .Value() on an uninitialized optional, unsafe downcasting in isEqual that should be replaced with a safe base-class operator==, redundant temperature casts in Setpoints::Valid that risk signed integer overflow, and redundant conditional checks in SetpointRaiseLower that can be simplified.
ReneJosefsen
reviewed
Jun 8, 2026
Comment on lines
+90
to
+91
| if (mTemperature.HasValue()) | ||
| return mTemperature.Value(); |
Contributor
There was a problem hiding this comment.
Not sure if we have a requirement for this, but might be worth adding the brackets just to be consistent?
Contributor
There was a problem hiding this comment.
Suggested change
| if (mTemperature.HasValue()) | |
| return mTemperature.Value(); | |
| if (mTemperature.HasValue()) | |
| { | |
| return mTemperature.Value(); | |
| } |
Contributor
There was a problem hiding this comment.
It does not look like it got sorted?
Contributor
Author
There was a problem hiding this comment.
Fixed in a different place, but now fixed in both.
for more information, see https://pre-commit.ci
hasty
changed the title
Contributor
Author
|
/gemini review |
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the thermostat cluster server's setpoint handling by introducing a structured Setpoints class and associated helper classes to manage validation, limits, and deadband enforcement. It also updates the corresponding Python tests to utilize a simulator matching this new logic. The review feedback identifies several critical issues that must be addressed: bugs in Setpoints::Valid() and Setpoints::FixUserLimits() that break compatibility with devices not supporting optional setpoint attributes, a compilation error in ThermostatCluster.cpp caused by referencing the non-existent chip::Encoding::Get8 function, and a code smell in Setpoint.h involving a reference member in a copy-assigned class that should be refactored to a pointer.
for more information, see https://pre-commit.ci
|
PR #42326: Size comparison from f4d8ecb to d65e4cd Full report (30 builds for cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, psoc6, qpg, realtek, stm32, telink)
|
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
This PR moves the setpoint functionality of the Thermostat cluster into a separate file, in preparation for migrating to a code-driven-cluster implementation of Thermostat.
Related issues
This is meant to be merged after #41739 and #41772.
Testing
Ran test suite.