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

[HVAC] Use atomic writes with Presets #34570

Merged
merged 100 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
46d9098
Add support for Presets attributes and commands to the Thermostat clu…
nivi-apple Jul 26, 2024
5d2c740
Restyled by whitespace
restyled-commits Jul 26, 2024
f14e43e
Restyled by clang-format
restyled-commits Jul 26, 2024
dfe9f7c
Restyled by gn.
restyled-commits Jul 26, 2024
3dad3f3
Fix build error for Linux configure build of all-clusters-app
nivi-apple Jul 26, 2024
8e6db6e
Fix Darwin CI issues
nivi-apple Jul 26, 2024
362ca12
Restyled by clang-format
restyled-commits Jul 26, 2024
cb96615
More fixes
nivi-apple Jul 26, 2024
07e78e0
Restyled by clang-format
restyled-commits Jul 26, 2024
9c511bf
BUILD.gn fixes for CI
nivi-apple Jul 26, 2024
f027069
Apply suggestions from code review
nivi-apple Jul 26, 2024
a2bb5d6
Address review comments.
nivi-apple Jul 27, 2024
0147c71
Restyled by clang-format
restyled-commits Jul 27, 2024
029e9a4
Regenerate Thermostat XML from spec
hasty Jul 28, 2024
48ac309
Move atomic enum to global-enums.xml, actually
hasty Jul 26, 2024
5216415
Regenerate XML and convert thermostat-server to atomic writes
hasty Jul 28, 2024
72d114f
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 29, 2024
38d14fc
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 29, 2024
8511469
Pull in ACCapacityFormat typo un-fix
hasty Jul 29, 2024
dabf994
Update Test_TC_TSTAT_1_1 to know about AtomicResponse command.
bzbarsky-apple Jul 29, 2024
0212f7c
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 29, 2024
90a20c1
Restyled patch
hasty Jul 29, 2024
a567de4
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 29, 2024
1c49a80
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 29, 2024
aef165e
Fix weird merge with upstream
hasty Jul 29, 2024
9efed86
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 29, 2024
4c457a9
Fix emberAfIsTypeSigned not understanding temperature type
hasty Jul 29, 2024
1257477
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 29, 2024
c34a9cb
Merge fixes from atomic write branch
hasty Jul 30, 2024
4665050
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
6d2fda4
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
7acd5d4
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
8dbabb1
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
704c544
Relocate thermostat-manager sample code to all-clusters-common
hasty Jul 30, 2024
9d89cfe
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
7a4f4fd
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
6de046a
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
d67f988
Fix g++ build error on linux
hasty Jul 30, 2024
449379b
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
4c8e0a0
Fix C formatter for long int, cast whole expression
hasty Jul 30, 2024
c76e768
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
3f40391
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
5ce2df1
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
cf780e3
Sync cast fix with master
hasty Jul 30, 2024
af25396
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
c80f42d
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
b4f50f6
Add thermostat-common dependency to thermostat app under linux
hasty Jul 30, 2024
51d8aaa
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
5abc22d
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
637db40
Remove MatterPostAttributeChangeCallback from thermostat-manager, as …
hasty Jul 30, 2024
fadce3b
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
c6e07d0
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 30, 2024
4b03da7
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
0c1b853
Convert Atomic enums and structs to global
hasty Jul 30, 2024
c41d02c
Restyled patch
hasty Jul 30, 2024
924ad8f
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 30, 2024
7d8df6e
Merge branch 'master' into add_presets_to_Sdk
hasty Jul 31, 2024
31ebe9d
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Jul 31, 2024
2740112
Apply suggestions from code review
hasty Jul 31, 2024
dabc3a0
Regen with alchemy 0.6.1
hasty Aug 1, 2024
f08c0cf
Updates based on comments
hasty Aug 1, 2024
77c0dca
Add TC_MCORE_FS_1_3.py test implementation (#34650)
tehampson Jul 31, 2024
608d034
Fix most TC-SWTCH-2.4 remaining issues (#34677)
tcarmelveilleux Jul 31, 2024
dc312d7
Initial test script for Fabric Sync TC_MCORE_FS_1_2 (#34675)
cletnick Jul 31, 2024
ad792f1
Test automation for FabricSync ICD BridgedDeviceBasicInfoCluster (#34…
rochaferraz Jul 31, 2024
60d0429
ServiceArea test scripts (#34548)
plauric Jul 31, 2024
78dab72
Remove manual tests for Thermostat presets (#34679)
nivi-apple Jul 31, 2024
d7cadf9
Dump details about leaked ExchangeContexts before aborting (#34617)
ksperling-apple Jul 31, 2024
153c398
[TI] CC13x4_26x4 build fixes (#34682)
abiradarti Aug 1, 2024
b2e22c7
[ICD] Add missing polling function to NoWifi connectivity manager (#3…
mkardous-silabs Aug 1, 2024
12d0123
[OPSTATE] Add Q test script for CountdownTime (#34632)
rbultman Aug 1, 2024
9351279
YAML update to BRBINFO, ProductId (#34513)
rochaferraz Aug 1, 2024
08cb38b
Fix simplified Linux tv-casting-app gn build error. (#34692)
shaoltan-amazon Aug 1, 2024
ee27016
adding parallel execution to restyle-diff (#34663)
Alami-Amine Aug 1, 2024
aebaedb
Add some bits to exercise global structs/enums to Unit Testing cluste…
bzbarsky-apple Aug 1, 2024
1a7352f
[Silabs] Port platform specific Multi-Chip OTA work (#34440)
mykrupp Aug 1, 2024
eb59fc3
Add python tests for Thermostat presets feature (#34693)
nivi-apple Aug 1, 2024
5c6312b
removing unneccessary git fetch (#34698)
Alami-Amine Aug 1, 2024
687b1ac
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Aug 1, 2024
6cb787b
Merge branch 'master' into add_presets_to_Sdk
hasty Aug 1, 2024
b815bbd
Restyle patch
hasty Aug 1, 2024
cf97803
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Aug 1, 2024
d424a77
Regen to fix ordering of global structs
hasty Aug 1, 2024
b5410d3
Apply suggestions from code review
hasty Aug 1, 2024
353c9c1
Return correct AtomicResponse when committing or rolling back
hasty Aug 1, 2024
c58ab73
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
hasty Aug 1, 2024
f0b8e7d
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Aug 1, 2024
be7ca99
Patch tests for atomic write of presets
hasty Aug 2, 2024
23f3063
Fix tests to work with the new setup.
bzbarsky-apple Aug 2, 2024
ed59a01
Merge pull request #1 from bzbarsky-apple/pr-34570-fixup
hasty Aug 2, 2024
627e3f6
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
hasty Aug 4, 2024
0966a01
Merge branch 'master' into add_presets_to_Sdk
hasty Aug 4, 2024
c37228c
Fix PICS values for atomic requests
hasty Aug 4, 2024
ba877a8
Remove PresetsSchedulesEditable and QueuedPreset from various places
hasty Aug 4, 2024
1106e1f
Restyled patch
hasty Aug 4, 2024
18d202a
Restyled patch, again
hasty Aug 4, 2024
18325f4
Remove PICS value for PresetsSchedulesEditable
hasty Aug 4, 2024
11eda5a
clang-tidy fixes
hasty Aug 5, 2024
0478b52
clang-tidy fixes
hasty Aug 5, 2024
9a4d415
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip…
hasty Aug 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Relocate thermostat-manager sample code to all-clusters-common
  • Loading branch information
hasty committed Jul 30, 2024
commit 704c5447f57a6eca6a924d80ffd8b011dcafe19e
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
* limitations under the License.
*/

#include "include/thermostat-delegate-impl.h"
#include <thermostat-delegate-impl.h>

#include "thermostat-delegate-impl.h"
#include <app-common/zap-generated/attributes/Accessors.h>
#include <lib/support/Span.h>
#include <platform/internal/CHIPDeviceLayerInternal.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* Includes
*********************************************************/

#include "include/thermostat-manager.h"
#include "include/thermostat-delegate-impl.h"
#include <thermostat-delegate-impl.h>
#include <thermostat-manager.h>

#include <app/clusters/bindings/BindingManager.h>
#include <app/clusters/thermostat-server/thermostat-server.h>
Expand Down Expand Up @@ -506,9 +506,11 @@ void MatterPostAttributeChangeCallback(const ConcreteAttributePath & attributePa

void emberAfThermostatClusterInitCallback(EndpointId endpoint)
{
ChipLogProgress(Zcl, "Starting Thermostat Manager");
ThermostatManager().Init();
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved

// Register the delegate for the Thermostat
auto & delegate = ThermostatDelegate::GetInstance();

// Set the default delegate for endpoint kThermostatEndpoint.
VerifyOrDie(endpoint == kThermostatEndpoint);
SetDefaultDelegate(endpoint, &delegate);
Expand Down
2 changes: 2 additions & 0 deletions examples/all-clusters-app/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ source_set("chip-all-clusters-common") {
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/thermostat-delegate-impl.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/thermostat-manager.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/water-heater-mode.cpp",
"${chip_root}/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
Expand Down
2 changes: 2 additions & 0 deletions examples/all-clusters-app/tizen/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ source_set("chip-all-clusters-common") {
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/thermostat-delegate-impl.cpp",
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/thermostat-manager.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
Expand Down
5 changes: 0 additions & 5 deletions examples/thermostat/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,13 @@ executable("thermostat-app") {
"include/low-power/LowPowerManager.cpp",
"include/low-power/LowPowerManager.h",
"main.cpp",
"thermostat-delegate-impl.cpp",
"thermostat-manager.cpp",
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
]

deps = [
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/examples/thermostat/thermostat-common",
"${chip_root}/src/lib",
]

include_dirs = [ "include" ]

cflags = [ "-Wconversion" ]

output_dir = root_out_dir
Expand Down
14 changes: 1 addition & 13 deletions examples/thermostat/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,7 @@ void ApplicationShutdown() {}

int main(int argc, char * argv[])
{
if (ChipLinuxAppInit(argc, argv) != 0)
{
return -1;
}
ChipLogProgress(Zcl, "Starting Thermostat Manager");
CHIP_ERROR err = ThermostatManager().Init();

if (err != CHIP_NO_ERROR)
{
ChipLogError(AppServer, "Failed to initialize thermostat manager: %" CHIP_ERROR_FORMAT, err.Format());
chip::DeviceLayer::PlatformMgr().Shutdown();
return -1;
}
VerifyOrDie(ChipLinuxAppInit(argc, argv) == 0);
ChipLinuxAppMainLoop();
return 0;
}