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] Sync atomic write error order with spec #34936

Merged
merged 151 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 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
12aa64f
Clear associated atomic writes when fabric is removed
hasty Aug 6, 2024
520eb2f
Add tests for fabric removal and lockout of clients outside of atomic…
hasty Aug 6, 2024
62f75c4
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
hasty Aug 6, 2024
c09f01e
Python linter
hasty Aug 6, 2024
f9141fb
Restyled patch
hasty Aug 6, 2024
9fc8882
Merge branch 'master' into granbery/preset_atomic_write_fabric_index
hasty Aug 6, 2024
3d5abb5
Merge branch 'granbery/preset_atomic_write_fabric_index' of github.co…
hasty Aug 6, 2024
4c26dd4
Clear timer when fabric is removed
hasty Aug 6, 2024
2a84acb
Check for open atomic write before resetting
hasty Aug 6, 2024
98e8e2c
Merge branch 'master' into granbery/preset_atomic_write_fabric_index
hasty Aug 6, 2024
bdc747e
Revert auto delegate declaration on lines where there's no collision
hasty Aug 6, 2024
2f9a711
Allow Thermostat delegate to provide timeout for atomic requests
hasty Aug 6, 2024
1b7c152
Merge branch 'master' into granbery/preset_atomic_write_timeout
hasty Aug 6, 2024
0a5d2b8
Relocate thermostat example code to thermostat-common
hasty Aug 6, 2024
cc7f6e5
Remove thermostat-manager code, replace with thermostat delegate
hasty Aug 6, 2024
2a15976
Sync atomic write error order with spec
hasty Aug 8, 2024
c683088
Merge branch 'master' into granbery/preset_atomic
hasty Aug 12, 2024
1ea2a9a
Restyle patch
hasty Aug 12, 2024
b105a27
Drop memset of atomic write sessions
hasty Aug 12, 2024
5f2db17
Add PreCommit stage to allow rollback of multiple attributes when onl…
hasty Aug 13, 2024
04bdb52
Separate OnTimerExpired method, vs ResetWrite
hasty Aug 13, 2024
b40ad4e
Method documentation
hasty Aug 13, 2024
6eb3031
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
hasty Aug 13, 2024
c19c321
Apply suggestions from code review
hasty Aug 13, 2024
802c60c
Remove unused InWrite check
hasty Aug 13, 2024
344e28c
Drop imcode alias
hasty Aug 13, 2024
b4fc09e
Switch AtomicWriteState to enum class
hasty Aug 14, 2024
e9fa63d
DRY up atomic write manager
hasty Aug 14, 2024
c522171
Apply suggestions from code review
hasty Aug 14, 2024
23b8ec2
Drop duplicate doc comments
hasty Aug 14, 2024
345efa3
Rename GetAtomicWriteScopedNodeId to GetAtomicWriteOriginatorScopedNo…
hasty Aug 14, 2024
84ddee2
Updates based on comments
hasty Aug 14, 2024
08190ae
Merge branch 'granbery/preset_atomic' of github.com:hasty/connectedho…
hasty Aug 14, 2024
7cec405
Add MatterReportingAttributeChangeCallback calls for updated attributes
hasty Aug 14, 2024
69a41e9
Merge branch 'master' into granbery/preset_atomic
hasty Aug 16, 2024
2ecf2db
Relocate thermostat example code to thermostat-common, and remove the…
hasty Aug 21, 2024
62a9b4d
Merge atomic write code back into thermostat-server
hasty Aug 21, 2024
186630f
Merge branch 'granbery/preset_atomic_status' into granbery/preset_atomic
hasty Aug 21, 2024
dad5709
Merge remote-tracking branch 'upstream/master' into granbery/preset_a…
hasty Aug 21, 2024
a2f3500
Apply suggestions from code review
hasty Aug 22, 2024
9663f30
Fix build after suggestions
hasty Aug 22, 2024
98051bc
Actually track attribute IDs associated with atomic write
hasty Aug 22, 2024
f6ccf2e
Only commit presets if all attribute precommits were successful
hasty Aug 22, 2024
e1b7033
Fix scope on err
hasty Aug 22, 2024
1b89c4a
Add documentation to methods
hasty Aug 22, 2024
bd82243
Remove duplicate preset check.
hasty Aug 22, 2024
78c0f22
Move various functions into anonymous namespaces, or Thermostat names…
hasty Aug 22, 2024
0c395c1
Drop impossible non-atomic attribute status after rollback
hasty Aug 22, 2024
127a00b
Namespace workaround for compilers on other platforms
hasty Aug 22, 2024
179ceba
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
hasty Aug 22, 2024
0cb88a6
Apply suggestions from code review
bzbarsky-apple Aug 23, 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
4 changes: 2 additions & 2 deletions examples/all-clusters-app/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ source_set("chip-all-clusters-common") {
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseTargetsStore.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/energy-evse-mode.cpp",
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/ElectricalPowerMeasurementDelegate.cpp",
"${chip_root}/examples/thermostat/linux/thermostat-delegate-impl.cpp",
"${chip_root}/examples/thermostat/thermostat-common/src/thermostat-delegate-impl.cpp",
"AllClustersCommandDelegate.cpp",
"AllClustersCommandDelegate.h",
"AppOptions.cpp",
Expand All @@ -102,7 +102,7 @@ source_set("chip-all-clusters-common") {
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/include",
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/include",
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/include",
"${chip_root}/examples/thermostat/linux/include",
"${chip_root}/examples/thermostat/thermostat-common/include",
]

if (chip_enable_pw_rpc) {
Expand Down
8 changes: 5 additions & 3 deletions examples/thermostat/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ import("//build_overrides/chip.gni")

executable("thermostat-app") {
sources = [
"${chip_root}/examples/thermostat/thermostat-common/src/thermostat-delegate-impl.cpp",
"include/low-power/LowPowerManager.cpp",
"include/low-power/LowPowerManager.h",
"main.cpp",
"thermostat-delegate-impl.cpp",
"thermostat-manager.cpp",
]

deps = [
Expand All @@ -30,7 +29,10 @@ executable("thermostat-app") {
"${chip_root}/src/lib",
]

include_dirs = [ "include" ]
include_dirs = [
"include",
"${chip_root}/examples/thermostat/thermostat-common/include",
]

cflags = [ "-Wconversion" ]

Expand Down
73 changes: 0 additions & 73 deletions examples/thermostat/linux/include/thermostat-manager.h

This file was deleted.

16 changes: 1 addition & 15 deletions examples/thermostat/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include <app/CommandHandler.h>
#include <app/clusters/identify-server/identify-server.h>

#include "thermostat-manager.h"

using namespace chip;
using namespace chip::app;
// using namespace chip::app::Clusters;
Expand Down Expand Up @@ -76,19 +74,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;
}
Loading
Loading